Commit Graph

192 Commits

Author SHA1 Message Date
2b6d536590 Merge branch 'release/v0.1.8' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.8 2021-04-27 13:48:38 +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
c6a08a50f9 Web: Fixed language for users then not changed language at profile yet. 2021-04-27 11:39:16 +03:00
a46f8ed04a Web: Common: Fix openEdit query param 2021-04-26 19:02:40 +03:00
f3610ce7f6 Web: Common: Fix openEdit query param 2021-04-26 19:02:16 +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
707f9bab50 Web: Common: Added proxy to OAuth login URL 2021-04-23 13:17:40 +03:00
Alexey Kostenko
b1ef3639c6 Fix 2021-04-22 16:13:02 +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
0b0dbb971f Web: Settings: Fix enabledJoin setup 2021-04-19 18:39:00 +03:00
3734027f4f Web: Files: fixed newItem styles 2021-04-19 14:16:42 +03:00
9b6e4ace8b Web: Files: fixed badge for tree menu 2021-04-19 14:08:40 +03:00
Alexey Kostenko
d9860256ec Web: Common/Components: FacebookButton style fix 2021-04-19 09:49:47 +03:00
e586d42d3b Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile 2021-04-16 20:23:08 +03:00
TatianaLopaeva
ab10641b45 Web: Rename teamTemplate. 2021-04-16 17:10:37 +03:00
Alexey Kostenko
8cb74d14b4 Web: Client/Common: Added thirdParty signup api 2021-04-16 16:34:24 +03:00
7062c713ad Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-16 16:05:01 +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
Alexey Kostenko
96ec652313 Merge branch 'develop' into feature/oauth2.0 2021-04-16 14:25:37 +03:00
Vladislav Makhov
c60d653bc1 web: fix hiding unpinned article when menu item clicked 2021-04-16 13:41:36 +03:00
TatianaLopaeva
297e4f42e9 Merge branch 'develop' into feature/team-template 2021-04-16 09:25:43 +03:00
TatianaLopaeva
e738cab4a2 Web: Added Error message & Added loader. 2021-04-15 19:51:59 +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
ff370259e9 Web: Added "learn more and help url for common setting. 2021-04-13 14:47:46 +03:00
TatianaLopaeva
3487e40c51 Web: Settings: Added logic for team template, added getCustomSchema. 2021-04-13 14:34:04 +03:00
c324404767 Web: fixed firefox frame 2021-04-13 14:07:44 +03:00
c7017920e8 Web: fixed selection for mobile devices 2021-04-13 12:56:03 +03:00
5daf690ffb Web: fixed selection 2021-04-13 12:49:37 +03:00
5936640ce2 Web: fixed selection 2021-04-13 12:43:17 +03:00
8cfd5eb644 Web: Added SelectedFrame 2021-04-13 09:35:07 +03:00
Alexey Kostenko
cf7072a714 Refactoring 2021-04-12 10:57:21 +03:00
Alexey Kostenko
ec6c1df3cf Merge branch 'develop' into feature/oauth2.0 2021-04-08 11:59:08 +03:00
96d67be68c Web: Fix hashSettings setup 2021-04-08 10:24:06 +03:00
bcf350c1d9 Bump version to v0.1.1 2021-04-08 10:23:33 +03:00
c314b6e192 Web: Change bad language setup 2021-04-07 16:33:00 +03:00
559d7a9940 Web: Fixed export and import registerSW 2021-04-07 15:41:42 +03:00
4484d609a6 Web: Added registerSW for start Service-Worker + Added post SkipWaiting on update 2021-04-07 15:27:51 +03:00
TatianaLopaeva
8419167825 Merge branch 'release/v0.1.0' of github.com:ONLYOFFICE/AppServer into release/v0.1.0 2021-04-07 13:35:39 +03:00
TatianaLopaeva
cdef097fdd Web: Fixed hiding header when switching group. 2021-04-07 13:35:32 +03:00
Alexey Kostenko
aad5255cd8 Web: Common: Fixed setting user culture 2021-04-07 12:19:12 +03:00
TatianaLopaeva
6b7bc650da Web: components: Added margin-bottom for fixed height of article. 2021-04-06 17:23:32 +03:00
Artem Tarasov
e304af064b Web: People: fixed group list query 2021-04-05 16:18:41 +03:00
b9fe2c338f Added New Proxy settings 2021-04-05 15:49:02 +03:00