Commit Graph

6986 Commits

Author SHA1 Message Date
d2588270cf Merge branch 'master' into develop 2021-04-23 20:16:42 +03:00
4bdf5e4e55 Web: Fix fallback language apply on new language setup 2021-04-23 19:51:10 +03:00
cd699e37e2 Files: Fix opening of version 2021-04-23 18:00:05 +03:00
553ac70278 Bump version v0.1.7 2021-04-22 14:13:12 +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
Alexey Kostenko
1aae2e60cf Web: Client/Login: Removed 2nd window for actions through oAuth 2021-04-21 14:48:17 +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
TatianaLopaeva
ce20ae3de2 Web: Fixed tabIndex. 2021-04-20 11:55:14 +03:00
Ilya Oleshko
7adfe3112f Merge branch 'feature/access-rights-new' of github.com:ONLYOFFICE/AppServer into feature/access-rights-new 2021-04-19 18:54:12 +03:00
Ilya Oleshko
b8910edc01 Merge branch 'develop' into feature/access-rights-new 2021-04-19 18:53:55 +03:00
bd495757cc Merge branch 'master' into develop 2021-04-19 18:52:56 +03:00
36c65c1c43 Bump version v0.1.6 2021-04-19 18:41:27 +03:00
6c8654ba77
Merge branch 'develop' into feature/team-template 2021-04-19 16:47:52 +03:00
TatianaLopaeva
224bee68b4 Web: Settings: Added tabIndex. 2021-04-19 16:46:15 +03:00
Alexey Kostenko
1627490b05 Merge branch 'develop' into feature/access-rights-new 2021-04-19 16:21:38 +03:00
Alexey Kostenko
6bb13d77c8 Web: Client: Fixed HelpButton on mobile devices 2021-04-19 16:21:02 +03:00
Alexey Kostenko
49c2496391 Web: Client: Fixed translation in PeopleSelector, small refactoring 2021-04-19 16:12:34 +03:00
461110e1a7 Web: Fix show loaders timeout for quickly responses 2021-04-19 13:36:40 +03:00
TatianaLopaeva
2a3d50cfd5 Web: Settings: Fixed position of buttons for desktop. 2021-04-19 12:30:54 +03:00
Alexey Kostenko
2749df79df Web: Client: Redirect to default page after OAuth registration 2021-04-19 10:19:27 +03:00
Alexey Kostenko
03ec607cbf Merge branch 'develop' into feature/oauth2.0 2021-04-19 08:25:42 +03:00
e586d42d3b Web: Added clickBackdrop() for close unpinned Article on Tablet and Mobile 2021-04-16 20:23:08 +03:00
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
Alexey Kostenko
49fd31c19b Web: Client: Style fix 2021-04-16 18:22:04 +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
7cb9affc77 Web: Remove tap-highlight 2021-04-16 16:27:07 +03:00
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
TatianaLopaeva
42d29cbae5 Web: Settings: Added customName and customId. 2021-04-16 15:57:34 +03:00
ebc751530b Web: Open menu by module title 2021-04-16 15:53:52 +03:00
TatianaLopaeva
06348316ec Web: Settings: Deleted useless code. 2021-04-16 15:43:08 +03:00
TatianaLopaeva
b0f29486ff Web: Deleted useless console log. 2021-04-16 15:36:06 +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
TatianaLopaeva
cd00030b24 Web: Layout: Fixed close the context menu. (Only for Mobile Devices). 2021-04-16 12:45:21 +03:00
Alexey Kostenko
067079363b Web: Client: Fixed changing portal owner 2021-04-16 12:32:28 +03:00
Alexey Kostenko
d7930f9a8b Web: Client: Redesign access rights page 2021-04-16 12:19:19 +03:00
TatianaLopaeva
2075aa6647 Web: Settings: Fix displaying of loading date. 2021-04-16 11:28:06 +03:00
TatianaLopaeva
ab1d41b2a8 Web: Fixed loading date. 2021-04-16 11:21:17 +03:00
TatianaLopaeva
297e4f42e9 Merge branch 'develop' into feature/team-template 2021-04-16 09:25:43 +03:00
TatianaLopaeva
53d449c508 Web: Deleted useless console.log. 2021-04-15 19:53:49 +03:00
TatianaLopaeva
e738cab4a2 Web: Added Error message & Added loader. 2021-04-15 19:51:59 +03:00
TatianaLopaeva
69ca5bbd90 Web: Settings: Fixed:
- the input is displayed without error if you changed the template
- if the template input is empty, then the option is changed to custom
- the problem with the correct display of the current option.
2021-04-15 17:49:16 +03:00
Alexey Kostenko
cd831d3f93 Web: Client: Refactoring 2021-04-15 16:20:41 +03:00
TatianaLopaeva
a9e9729cab Web: Settings: Fixed save button if selected Custom schema. 2021-04-15 13:27:39 +03:00
TatianaLopaeva
5b07217b83 Web: Settings: Added saving session for selected option. 2021-04-15 11:28:13 +03:00
Alexey Kostenko
a8a9c8115f Web: Client: Show the real number of administrators on the portal, small refactoring 2021-04-15 10:11:15 +03:00
2f38b2ec33 Settings: fixed custom schemaName 2021-04-14 21:08:27 +03:00