Commit Graph

10240 Commits

Author SHA1 Message Date
Vladislav Makhov
567c951dfd web: common: fix language data in private browsing mode 2021-01-14 10:58:49 +03:00
2848c39c57 Merge branch 'develop' into feature/thirdparty-integrations 2021-01-14 10:14:46 +03:00
TatianaLopaeva
b8c2120fac Web: Files: Added scrolling up when navigating between folders. 2021-01-13 20:11:37 +03:00
TatianaLopaeva
20bb304f1e Web: Files: Deleted useless conditions. 2021-01-13 19:20:27 +03:00
576f473f4e Tags: fix 2021-01-13 19:09:05 +03:00
d63ab9910a Web: Files: fixed update service folders 2021-01-13 18:43:07 +03:00
34ab7983b7 Web: Files: fixed thirdparty edit 2021-01-13 17:29:24 +03:00
Viktor Fomin
4d60745a11 Web: Files: fixed undefined customer title 2021-01-13 16:32:13 +03:00
b8e40ff3b2 OAuth: fix links 2021-01-13 16:30:32 +03:00
TatianaLopaeva
f0679f3cdf Web: Files/People: Fixed scrolling to the top when switching to a new page. 2021-01-13 16:19:20 +03:00
TatianaLopaeva
02df0294cf Web: Common: Removed inactive scrollbars in tablet view, horizontal scroll added to the end of the visible page height. 2021-01-13 15:21:06 +03:00
f3a2162537 Web: Files: added context menu to connection clouds 2021-01-13 14:17:45 +03:00
144a86fca7 Files: fix Deserialize 2021-01-13 13:49:52 +03:00
a41b774fe8 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-13 13:42:26 +03:00
c5ebea42de Web: Files: fixed getIsThirdPartySelection selector 2021-01-13 13:42:18 +03:00
ef686d78ac
Merge pull request #168 from ONLYOFFICE/features/jenkins-test
Jenkinsfile: run test
2021-01-13 13:31:46 +03:00
TatianaLopaeva
9bcb922c1a Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	products/ASC.Files/Client/src/App.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/components/pages/Home/index.js
#	web/ASC.Web.Common/src/components/Layout/index.js
#	web/ASC.Web.Common/src/components/NavMenu/index.js
#	web/ASC.Web.Common/src/components/PageLayout/index.js
#	web/ASC.Web.Common/src/components/PageLayout/sub-components/section-header.js
#	web/ASC.Web.Common/src/store/auth/actions.js
#	web/ASC.Web.Common/src/store/auth/reducer.js
#	web/ASC.Web.Common/src/store/auth/selectors.js
2021-01-13 13:27:55 +03:00
Artem Tarasov
b239b7304f Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-13 12:54:03 +03:00
Artem Tarasov
7176819acc Web: Files: thirdParty: fixed service connection and window closing after connection 2021-01-13 12:53:46 +03:00
ae69a9559e Files: removed temp 2021-01-13 12:41:29 +03:00
Vladislav Makhov
1895cf45df web: client: fix folder title in modal 2021-01-13 12:40:52 +03:00
Vladislav Makhov
73ef78f465 Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-13 11:43:55 +03:00
Vladislav Makhov
e6e6a6e2dd web: client: fix node selection 2021-01-13 11:43:42 +03:00
993dfbf53d Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-13 11:40:24 +03:00
b05a809a32 Files: fix API SetAceLink for third-party 2021-01-13 11:40:11 +03:00
Vladislav Makhov
7289f53628 web: common: bump version 2021-01-13 11:27:59 +03:00
Vladislav Makhov
754ae6713d web: common: fix link 2021-01-13 11:27:41 +03:00
857b90e371 Merge branch 'feature/thirdparty-integrations' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/thirdparty-integrations 2021-01-13 10:32:33 +03:00
52fc96fa25 Web: Files: fixed copying service folders 2021-01-13 10:31:52 +03:00
60562d69a3 Files: test fix 2021-01-13 10:21:29 +03:00
b7d3cd8650 Files: test 2021-01-12 22:42:17 +03:00
88eac5b10a Files: test 2021-01-12 21:51:39 +03:00
a65aa18c17 Files: temp fix 2021-01-12 21:35:56 +03:00
2bbf510768 Files: test. Fix cache 2021-01-12 21:11:01 +03:00
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
9f8b36da5c Files: tests. log 2021-01-12 19:00:22 +03:00
19c9001082 Files: fix test 2021-01-12 18:32:05 +03:00
122048dd49 Files: temp fix 2021-01-12 18:27:56 +03:00
5289f92935 Files: temp fix 2021-01-12 18:01:38 +03:00
e9bb7cf4b0
Merge pull request #170 from ONLYOFFICE/bugfix/recycle-bin-style-fix
web: client: fix recycle bin node style
2021-01-12 17:51:19 +03:00
Artem Tarasov
173d8195fb Merge branch 'feature/thirdparty-integrations' of github.com:ONLYOFFICE/AppServer into feature/thirdparty-integrations 2021-01-12 17:27:43 +03:00
Artem Tarasov
9e9cf3face web: components: bump version 2021-01-12 17:27:26 +03:00
Artem Tarasov
9df05a53c9 Web: Components: ModalDialog: fixed cursor type in modal 2021-01-12 17:27:03 +03:00
f21d81fe57 Files: fix long operations 2021-01-12 17:23:56 +03:00
Vladislav Makhov
7dc14d3688 web: client: fix recycle bin node style 2021-01-12 17:22:28 +03:00
d14f3d951a Web: Files: fixed thirdparty connection folder name 2021-01-12 16:48:50 +03:00
d118a9d5c8 Files: fix tests 2021-01-12 16:46:55 +03:00
5a80d1c756 Web: Files: fixed move operation for thirdparty folders 2021-01-12 16:35:55 +03:00
13cf5e5ad0 Files: tests. long operations 2021-01-12 16:00:05 +03:00
c00e37d127
Merge pull request #169 from ONLYOFFICE/bugfix/private-room-switcher
web: client: fix switcher render
2021-01-12 15:42:21 +03:00