d07273cee8
Web: Files: fixed display of tree menu, added new api for tree menu
2021-06-15 14:15:48 +03:00
ef59a2ac47
Web: Files: added hideConfirmConvert setting
2021-06-11 15:49:32 +03:00
b7ce4a35e7
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins
...
# Conflicts:
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
2021-06-09 00:23:12 +03:00
7026b19db0
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-31 09:23:53 +03:00
f993108d69
Web: Common: commentary changes
2021-05-30 17:26:30 +03:00
b2611343b6
Web: Common: get old backup codes
2021-05-20 01:44:03 +03:00
4e57f2a47f
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-20 00:47:45 +03:00
37267b624f
Web: Common: added method for login with code and cookie
2021-05-19 18:21:40 +03:00
Alexey Kostenko
f25eb00494
Merge branch 'develop' into feature/access-rights-admins
2021-05-19 18:05:19 +03:00
8785f6151a
Web: Common: fixed reloading login page
2021-05-19 17:17:07 +03:00
3c6f831618
Web: Common: Api: Added removeShareFiles api method
2021-05-19 16:51:43 +03:00
bb8124d1fa
Web: Common: added login with tfa code method
2021-05-17 16:32:22 +03:00
9b54835996
Web: Common: get secret key and qr
2021-05-14 15:58:50 +03:00
ef085ef7df
Web: Files: enable favorites and recent settings
2021-05-14 11:08:57 +03:00
Alexey Kostenko
62c789d68b
Merge branch 'develop' into feature/access-rights-admins
2021-05-11 10:19:31 +03:00
7a27280dc3
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-07 14:49:44 +03:00
daef594561
Web: Packages: added tfa store
2021-05-05 14:59:08 +03:00
bdc681f94a
Web: Files: Fix favorite flag setup (thirdParty issue)
2021-05-04 11:18:24 +03:00
Alexey Kostenko
17d4b0a4db
Merge branch 'develop' into feature/access-rights-admins
2021-04-29 15:11:50 +03:00
Alexey Kostenko
5f81e5a0ce
Web: Client: Added group button menu, fixed api getListAdmins, the ability to add new administrators
2021-04-29 09:40:55 +03:00
c324693034
Merge branch 'develop' into release/v0.1.8
2021-04-27 12:11:36 +03:00
Alexey Kostenko
a550197bc5
Web: Common: Fixed getAuthProviders api url
2021-04-27 12:02:51 +03:00
a46f8ed04a
Web: Common: Fix openEdit query param
2021-04-26 19:02:40 +03:00
d2588270cf
Merge branch 'master' into develop
2021-04-23 20:16:42 +03:00
cd699e37e2
Files: Fix opening of version
2021-04-23 18:00:05 +03:00
Alexey Kostenko
667a76b95f
Oauth: Refactoring
2021-04-22 13:34:42 +03:00
Alexey Kostenko
138fe92f9f
OAuth: Refactoring
2021-04-21 16:31:18 +03:00
Alexey Kostenko
691e7d5498
Merge branch 'develop' into feature/oauth2.0
2021-04-21 15:04:26 +03:00
TatianaLopaeva
0f3eb1350b
Merge branch 'develop' into feature/team-template
...
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-20 12:05:19 +03:00
Alexey Kostenko
8cb74d14b4
Web: Client/Common: Added thirdParty signup api
2021-04-16 16:34:24 +03:00
a289256846
Web: Files: added ConflictResolveDialog, refactoring files operations
2021-04-16 16:04:50 +03:00
TatianaLopaeva
052157d1fe
Web: Rename functions.
2021-04-16 15:35:02 +03:00
33f5a07c70
Web: Files: fixed search by subfolders
2021-04-15 10:27:23 +03:00
TatianaLopaeva
fc40487de0
Web: Added setCurrentShema and setCustomShema methods, added form validation.
2021-04-14 14:26:26 +03:00
TatianaLopaeva
3487e40c51
Web: Settings: Added logic for team template, added getCustomSchema.
2021-04-13 14:34:04 +03:00
Alexey Kostenko
ec6c1df3cf
Merge branch 'develop' into feature/oauth2.0
2021-04-08 11:59:08 +03:00
Artem Tarasov
e304af064b
Web: People: fixed group list query
2021-04-05 16:18:41 +03:00
Alexey Kostenko
3e4424b67b
Web: People/Common: Refactoring
2021-03-25 16:10:10 +03:00
Alexey Kostenko
1e17f4c4ae
Web: Common: Added api for oauth login
2021-03-24 16:49:42 +03:00
Alexey Kostenko
34973b123a
Web: Common: Added api for linking providers and get available linked providers
2021-03-24 14:19:46 +03:00
5dd30c9502
Web: Client: fixed owner change
2021-03-22 20:56:53 +03:00
628f9c8d5c
Web: Common: fixed getShortenedLink
2021-03-22 19:18:30 +03:00
a8a6121e59
Web: Proxy fixes
2021-03-22 17:35:33 +03:00
d568693154
Big Fix commit:
...
+ Added new Clients for CRM/Products
+ Removed old fake coming-soon pages
+ Added combineUrl and AppSettingsConfig with proxyUrl
+ Added new fields to modules info on Server
+ Fixed work with icon and image urls
+ Added CRM/Projects to nginx/onlyoffice.conf
+ Applied combineUrl in studio links
+ Added and applied "id" field in package.json of all Clients
+ Added new bat files CrmClient.bat and ProjectsClient.bat
+ Fixed ProductClassName for Files
2021-03-22 00:34:21 +03:00
126bbda1b1
Web: Files: refactoring
2021-03-20 13:17:17 +03:00
75859212ab
Web: People: Fix conversation of Filter to URL and back
2021-03-20 13:16:45 +03:00
deafba32a7
Web: Files: Fix conversation of Filter to URL and back
2021-03-20 12:51:08 +03:00
40557ccedc
Web: Files: fixed filter
2021-03-19 22:16:47 +03:00
97ec05e8ff
Web: People: fixed filter
2021-03-19 20:45:57 +03:00
e63fc30a2e
Web: People: Fixed move to direct link
2021-03-19 16:31:41 +03:00