|
|
a0ce9e0dc5
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-20 11:35:52 +03:00 |
|
|
|
3274bd0f21
|
ResManager: fix
|
2021-02-19 19:17:06 +03:00 |
|
Ilya Oleshko
|
7717784b46
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-19 16:23:23 +03:00 |
|
|
|
24d0b0e672
|
Thridparty: fixed RemoveProvider method
|
2021-02-19 12:11:04 +03:00 |
|
Ilya Oleshko
|
b53557cedc
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-18 15:56:39 +03:00 |
|
|
|
38b62a9a95
|
FederatedLogin: added EmbeddedResource callback.htm
|
2021-02-16 19:48:51 +03:00 |
|
|
|
d7ef3f631b
|
ResxManager: fix
|
2021-02-16 13:24:09 +03:00 |
|
Ilya Oleshko
|
d204c9b6de
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-16 13:22:34 +03:00 |
|
Ilya Oleshko
|
f2f2fbc07c
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-02-15 10:58:34 +03:00 |
|
Artem Tarasov
|
1ddc2c951a
|
Merge branch 'develop' into feature/empty-group
# Conflicts:
# web/ASC.Web.Common/package.json
|
2021-02-12 13:10:41 +03:00 |
|
|
|
a12cf74638
|
fixed login handler
|
2021-02-10 22:43:18 +03:00 |
|
|
|
d05f7b70ec
|
ResManager: fix
|
2021-02-09 20:53:49 +03:00 |
|
|
|
10542fe4b4
|
ResManager: fix
|
2021-02-09 17:58:35 +03:00 |
|
|
|
d823516aa3
|
fixed profile removed resource
|
2021-02-03 14:07:18 +03:00 |
|
Ilya Oleshko
|
8226d9185c
|
Merge branch 'develop' into feature/not-implemented-page
|
2021-01-29 12:38:22 +03:00 |
|
|
|
f0e227731f
|
Fixed loading products, lazy loading webitemmanager
|
2021-01-26 12:29:50 +03:00 |
|
|
|
64655a7da0
|
Api: modules. Added info method
|
2021-01-25 17:37:26 +03:00 |
|
|
|
e11a880956
|
Core: fix migrations
|
2021-01-25 15:31:28 +03:00 |
|
|
|
2848c39c57
|
Merge branch 'develop' into feature/thirdparty-integrations
|
2021-01-14 10:14:46 +03:00 |
|
|
|
b8e40ff3b2
|
OAuth: fix links
|
2021-01-13 16:30:32 +03:00 |
|
|
|
ae69a9559e
|
Files: removed temp
|
2021-01-13 12:41:29 +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 |
|
|
|
5289f92935
|
Files: temp fix
|
2021-01-12 18:01:38 +03:00 |
|
|
|
13cf5e5ad0
|
Files: tests. long operations
|
2021-01-12 16:00:05 +03:00 |
|
|
|
682ca73a91
|
Files: fix tests
|
2021-01-12 13:16:11 +03:00 |
|
|
|
7e80f26bc9
|
MessagesRepository: fix
|
2021-01-12 10:27:48 +03:00 |
|
|
|
c7c9225923
|
Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2021-01-11 12:37:31 +03:00 |
|
|
|
53c422c2b2
|
revert
|
2020-12-30 18:03:21 +03:00 |
|
|
|
fa7c2bf9f1
|
Merge branch 'develop' into feature/asc-files-tests
|
2020-12-29 18:37:28 +03:00 |
|
|
|
0ae7f84de6
|
SocketIO: fix
|
2020-12-28 16:47:59 +03:00 |
|
|
|
bfa73ec5c2
|
moved from 2e37dcd0
|
2020-12-28 16:22:08 +03:00 |
|
|
|
b88d418d41
|
Merge branch 'develop' into feature/thirdparty-integrations
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/locales/en/translation.json
# products/ASC.Files/Client/src/components/pages/Home/locales/ru/translation.json
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-12-25 15:27:44 +03:00 |
|
|
|
62cd0a6af0
|
Test: fix test migrate, drop test db
|
2020-12-25 13:48:04 +03:00 |
|
Diana
|
aa667a02ef
|
fix
|
2020-12-24 03:21:29 +03:00 |
|
Diana
|
e20b87447e
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
|
2020-12-24 03:18:47 +03:00 |
|
|
|
76d7ed6c73
|
Merge branch 'master' into develop
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/drop-down/index.js
|
2020-12-23 21:42:44 +03:00 |
|
|
|
1891813132
|
fix save tenant
|
2020-12-23 18:36:05 +03:00 |
|
|
|
d4b736103a
|
Users: fixed queries
|
2020-12-23 13:12:07 +03:00 |
|
|
|
0fae06b2bf
|
fix storage
|
2020-12-22 15:51:04 +03:00 |
|
Diana
|
9b338e0f78
|
Merge branch 'feature/asc-files-tests' of https://github.com/ONLYOFFICE/AppServer into develop
|
2020-12-22 15:37:10 +03:00 |
|
Diana
|
589c17ac95
|
fix
|
2020-12-22 02:27:10 +03:00 |
|
Diana
|
fada5e278b
|
Merge branch 'master' of https://github.com/ONLYOFFICE/AppServer into feature/asc-files-tests
|
2020-12-17 13:20:52 +03:00 |
|
|
|
29aa793329
|
Api: max data count - 1000
|
2020-12-15 14:13:14 +03:00 |
|
|
|
ce17dccb12
|
Thumb: security alert
|
2020-12-15 13:33:51 +03:00 |
|
|
|
b0dd9c1400
|
Files: optimization
|
2020-12-15 13:29:53 +03:00 |
|
