Commit Graph

12217 Commits

Author SHA1 Message Date
70aef7aefa Merge branch 'hotfix/v0.1.7' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.7 2021-04-23 16:16:07 +03:00
953b907f32 Web: Files: added rename notifications 2021-04-23 16:15:46 +03:00
33d7e89552 Web: Files: Store: Fixed displaying "view" action inside recycle bin 2021-04-23 16:15:44 +03:00
b5d84566b9 Web: Files: Dialog: Fixed setting token data for oAuth providers for ThriParty page, fixed opening WebDav connect window 2021-04-23 16:09:29 +03:00
75b62bf81b Calendar: translations 2021-04-23 16:01:14 +03:00
Artem Tarasov
9f7bc2d3f2 Web: Files: refactoring: created withContextOptions HOC, refactoring withFileActions 2021-04-23 15:57:49 +03:00
76d619d7d6 Web: Files: Fix ConnectedClouds openLocation 2021-04-23 15:18:49 +03:00
cff1b93172 ResManager: added cshtml 2021-04-23 15:16:32 +03:00
02bcb50e67 Web: Files: Fix ConnectedClouds context-options work 2021-04-23 15:02:57 +03:00
Artem Tarasov
39780ab498 Merge branch 'develop' into refactoring/files-list 2021-04-23 14:47:40 +03:00
Artem Tarasov
e90a9201bb Web: Files: refactoring: created withBadges HOC, rename withLoader, applied changes 2021-04-23 14:10:42 +03:00
f9b2258601
Merge pull request #227 from ONLYOFFICE/feature/oauth2.0
Feature/oauth2.0
2021-04-23 13:59:36 +03:00
Alexey Kostenko
707f9bab50 Web: Common: Added proxy to OAuth login URL 2021-04-23 13:17:40 +03:00
17ead73174 Web: Files: Fix EmptyTrashDialog texts 2021-04-23 12:30:01 +03:00
fc39307489 Web: Fixed translation. 2021-04-23 10:32:43 +03:00
Artem Tarasov
e22c641c9c Web: Files: refactoring: created withLoadingCheck HOC 2021-04-22 23:56:18 +03:00
TatianaLopaeva
1f8039f1b7 Web: Added storages to the Manual page. 2021-04-22 19:26:35 +03:00
Artem Tarasov
22b15ac51a Web: Files: refactoring: created Badges component, refactoring EditingWrapperComponent, FilesTileContent, FilesRowContent 2021-04-22 17:28:49 +03:00
Artem Tarasov
0bf59a8c98 Web: Files: refactoring FilesTileContent 2021-04-22 16:48:32 +03:00
Alexey Kostenko
b1ef3639c6 Fix 2021-04-22 16:13:02 +03:00
Alexey Kostenko
2d6083c972 Web: Components: Fixed warnings 2021-04-22 16:10:26 +03:00
Alexey Kostenko
c79c248b3a Web: People: OAuth buttons have been moved from the edit profile section to the profile view section 2021-04-22 16:09:56 +03:00
c4e934f83f Web: Files: Fix DeleteDialog texts and styles 2021-04-22 16:03:35 +03:00
Artem Tarasov
6381a0c524 Web: Files: refactoring FilesRowContent, withContentActions 2021-04-22 16:00:19 +03:00
Alexey Kostenko
8519fe4d60 Web: Components: SocialButton style fix 2021-04-22 14:54:06 +03:00
Alexey Kostenko
a21d40ca87 ThirdParty: Handling error 2021-04-22 14:45:33 +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
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
TatianaLopaeva
b2102d9e61 Web: Added common settings. 2021-04-22 09:58:02 +03:00
TatianaLopaeva
e4368caa63 Web: Added Restore Date. 2021-04-22 09:56:54 +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
TatianaLopaeva
79d005809b Web: Settings: Added Automatic and Manual backup pages. 2021-04-21 14:11:10 +03:00
TatianaLopaeva
d4beb848a1 Web: Settings: Added data-management option to the settings tree and Added Backup page. 2021-04-21 11:14:43 +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