IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,850 Commits 38 Branches 22 Tags 359 MiB
e89c8a6f76
Commit Graph

11850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pavelbannov
e89c8a6f76 Files: fixed getfolderID 2021-04-25 12:58:26 +03:00
AlexeySafronov
d2588270cf Merge branch 'master' into develop 2021-04-23 20:16:42 +03:00
Alexey Safronov
c18d416d0e
Merge pull request #233 from ONLYOFFICE/hotfix/v0.1.7 
Hotfix/v0.1.7
 2021-04-23 20:13:43 +03:00
AlexeySafronov
4bdf5e4e55 Web: Fix fallback language apply on new language setup 2021-04-23 19:51:10 +03:00
AlexeySafronov
00b46fbfad Web: Files: Fix Copy/Move to "Shared with Me" sub-folder with full access rights 2021-04-23 19:03:25 +03:00
Alexey Safronov
e7807086f5
Merge pull request #232 from ONLYOFFICE/feature/products 
Feature/products
 2021-04-23 18:01:53 +03:00
AlexeySafronov
838435bab5 Merge branch 'hotfix/v0.1.7' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.7 2021-04-23 18:00:17 +03:00
AlexeySafronov
cd699e37e2 Files: Fix opening of version 2021-04-23 18:00:05 +03:00
Ilya Oleshko
8159ae7b69 Web: Components: Row: Added new context-menu usage inside row 2021-04-23 17:58:06 +03:00
gopienkonikita
8c3212bc9f Merge branch 'hotfix/v0.1.7' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.7 2021-04-23 17:48:24 +03:00
gopienkonikita
9f91ff6f5c Web: Files: fixed display of third-party folders in the tree menu 2021-04-23 17:48:15 +03:00
pavelbannov
fc297faa52 Merge branch 'develop' into feature/products 2021-04-23 17:35:11 +03:00
pavelbannov
20c0795204 Mail: resources 2021-04-23 17:31:15 +03:00
Ilya Oleshko
9f072c313b Web: Files: Store: Fixed actions for Favorites and Recent folders 2021-04-23 17:09:52 +03:00
gopienkonikita
96e662f723 Web: Files: fixed displaying thirdpaty items 2021-04-23 17:06:50 +03:00
Ilya Oleshko
15414c84f2 Web: Files: Store: Fixed displaying "Add account" for third-party accounts if setting disabled 2021-04-23 16:44:59 +03:00
gopienkonikita
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
gopienkonikita
953b907f32 Web: Files: added rename notifications 2021-04-23 16:15:46 +03:00
Ilya Oleshko
33d7e89552 Web: Files: Store: Fixed displaying "view" action inside recycle bin 2021-04-23 16:15:44 +03:00
Ilya Oleshko
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
pavelbannov
75b62bf81b Calendar: translations 2021-04-23 16:01:14 +03:00
AlexeySafronov
76d619d7d6 Web: Files: Fix ConnectedClouds openLocation 2021-04-23 15:18:49 +03:00
pavelbannov
cff1b93172 ResManager: added cshtml 2021-04-23 15:16:32 +03:00
AlexeySafronov
02bcb50e67 Web: Files: Fix ConnectedClouds context-options work 2021-04-23 15:02:57 +03:00
Alexey Safronov
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
AlexeySafronov
17ead73174 Web: Files: Fix EmptyTrashDialog texts 2021-04-23 12:30:01 +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
AlexeySafronov
c4e934f83f Web: Files: Fix DeleteDialog texts and styles 2021-04-22 16:03:35 +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
AlexeySafronov
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
AlexeySafronov
3782ea4bc3 Applied last changes in Mail/Calendar ComingSoon pages 2021-04-21 22:03:49 +03:00
AlexeySafronov
1516fe0249 Merge branch 'develop' into feature/products 2021-04-21 21:49:39 +03:00
AlexeySafronov
6a4fed2d2c Init Calendar Server back-end 2021-04-21 21:47:27 +03:00
AlexeySafronov
d57433c9dc Added MailServer.bat 2021-04-21 21:46:59 +03:00
AlexeySafronov
090154ae59 Server: Mail: Fix applying launchSettings.json 2021-04-21 21:46:33 +03:00
AlexeySafronov
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
Alexey Safronov
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