Commit Graph

12042 Commits

Author SHA1 Message Date
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
Ilya Oleshko
c02656d200 Web: Files: Dialog: Fixed setting token data for oAuth providers for ThriParty page 2021-04-22 12:50:16 +03:00
Artem Tarasov
0131520988 Web: Files: refactoring Tile, fix drag, moved EditingWraperComponent to sub-components 2021-04-22 11:42:19 +03:00
Artem Tarasov
813e17cac2 Web: Files: created withFileaActions HOC, refactoring SimpleFilesRow 2021-04-22 03:12:50 +03:00
3782ea4bc3 Applied last changes in Mail/Calendar ComingSoon pages 2021-04-21 22:03:49 +03:00
1516fe0249 Merge branch 'develop' into feature/products 2021-04-21 21:49:39 +03:00
6a4fed2d2c Init Calendar Server back-end 2021-04-21 21:47:27 +03:00
d57433c9dc Added MailServer.bat 2021-04-21 21:46:59 +03:00
090154ae59 Server: Mail: Fix applying launchSettings.json 2021-04-21 21:46:33 +03:00
63a8caeb97 Init Mail Server back-end 2021-04-21 19:00:38 +03:00
Alexey Kostenko
138fe92f9f OAuth: Refactoring 2021-04-21 16:31:18 +03:00
Alexey Kostenko
71baafe682 Reverted kafka config 2021-04-21 16:08:24 +03:00
Alexey Kostenko
6f2a726210 Web: Files: Close the window after getting the code 2021-04-21 16:02:52 +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
01b9f71d3b
Merge pull request #224 from ONLYOFFICE/feature/team-template
Feature/team template
2021-04-20 13:50:53 +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
94e5eceabb
Merge pull request #225 from ONLYOFFICE/feature/access-rights-new
Feature/access rights new
2021-04-19 19:12:46 +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
Ilya Oleshko
434ce42f5f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2021-04-19 18:53:32 +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
0b0dbb971f Web: Settings: Fix enabledJoin setup 2021-04-19 18:39:00 +03:00
ab1aaa1e59
Merge pull request #228 from ONLYOFFICE/bugfix/v0.1.6
Bugfix/v0.1.6
2021-04-19 18:34:42 +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
Ilya Oleshko
175cee8b86 Web: Empty: Fixed displaying translation keys on loading 2021-04-19 15:41:27 +03:00
Ilya Oleshko
fbf69d2bdf Web: Files: Home: Fixed displaying content if translation loading 2021-04-19 15:40:28 +03:00
3734027f4f Web: Files: fixed newItem styles 2021-04-19 14:16:42 +03:00
c48060aadb Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-19 14:08:55 +03:00
9b6e4ace8b Web: Files: fixed badge for tree menu 2021-04-19 14:08:40 +03:00
Viktor Fomin
56e61a028c Web: Client: add fake qr-code 2021-04-19 14:01:29 +03:00
Viktor Fomin
e5906324c5 Web: Client: fixed key 2021-04-19 13:49:36 +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
3037c23e55 Merge branch 'bugfix/v0.1.6' of https://github.com/ONLYOFFICE/AppServer into bugfix/v0.1.6 2021-04-19 10:26:33 +03:00
ce48583873 Web: Files: fixed row content mobile click 2021-04-19 10:26:24 +03:00
Alexey Kostenko
2749df79df Web: Client: Redirect to default page after OAuth registration 2021-04-19 10:19:27 +03:00
Alexey Kostenko
c45cfe87a1 Merge branch 'feature/oauth2.0' of github.com:ONLYOFFICE/AppServer into feature/oauth2.0 2021-04-19 09:50:05 +03:00
Alexey Kostenko
d9860256ec Web: Common/Components: FacebookButton style fix 2021-04-19 09:49:47 +03:00
Alexey Kostenko
03ec607cbf Merge branch 'develop' into feature/oauth2.0 2021-04-19 08:25:42 +03:00
Viktor Fomin
c309d54d71 update yarn.lock 2021-04-18 23:35:20 +03:00
Viktor Fomin
15153b0fd4 Web: Client: add app activation route 2021-04-18 23:35:06 +03:00
Viktor Fomin
035708010f Web: Client: add app activation page 2021-04-18 23:34:53 +03:00