Viktor Fomin
|
0490c8c3f0
|
Update yarn.lock files
|
2020-11-10 18:08:51 +03:00 |
|
Viktor Fomin
|
9cbe89d4b5
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-10 11:02:29 +03:00 |
|
Viktor Fomin
|
834e8e6516
|
Update yarn.lock files
|
2020-11-10 10:46:26 +03:00 |
|
Viktor Fomin
|
067ee4fc5a
|
Web: Files: delete first header preloader
|
2020-11-10 10:40:17 +03:00 |
|
Vladislav Makhov
|
9cc469a51c
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-10 08:39:33 +03:00 |
|
Viktor Fomin
|
515bd0d05f
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-09 23:02:18 +03:00 |
|
Viktor Fomin
|
a7dee56194
|
Update yarn.lock files
|
2020-11-09 23:01:57 +03:00 |
|
|
|
4dd9c6f554
|
Update yarn.lock files
|
2020-11-09 22:35:39 +03:00 |
|
|
|
d012aa6071
|
Merge branch 'develop' into feature/filter-loader
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-11-09 22:15:04 +03:00 |
|
Ilya Oleshko
|
82a2520150
|
Web: Files : Body : Fixed preload tab for new documents
|
2020-11-09 18:29:06 +03:00 |
|
|
|
3c38343063
|
Fix download.
fix thirdparty
|
2020-11-09 17:46:49 +03:00 |
|
Viktor Fomin
|
6e8685d8d6
|
Update yarn.lock files
|
2020-11-09 16:54:13 +03:00 |
|
Vladislav Makhov
|
982fbdd593
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-09 16:44:18 +03:00 |
|
Viktor Fomin
|
b3f4bd3f64
|
Update yarn.lock files
|
2020-11-09 15:16:44 +03:00 |
|
Viktor Fomin
|
7211978a38
|
Web: Files: fix first loader
|
2020-11-09 15:10:51 +03:00 |
|
|
|
3b2bebddf2
|
TenantManager: fix currentTenant
|
2020-11-09 14:51:21 +03:00 |
|
Viktor Fomin
|
b0d202f7c9
|
Update yarn.lock files
|
2020-11-09 13:17:06 +03:00 |
|
Viktor Fomin
|
3c84424d8f
|
Web: Files: delete logo
|
2020-11-09 13:07:27 +03:00 |
|
Viktor Fomin
|
c2e74d3756
|
Update yarn.lock files
|
2020-11-06 18:43:16 +03:00 |
|
|
|
37fa37f473
|
Files: fix autofac
|
2020-11-06 17:54:48 +03:00 |
|
Viktor Fomin
|
1a4ced2195
|
Web: Files: fix color
|
2020-11-06 16:17:40 +03:00 |
|
|
|
2250baf7b7
|
Thirdparty: fix
|
2020-11-06 15:10:27 +03:00 |
|
Vladislav Makhov
|
265ed05414
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-05 19:19:50 +03:00 |
|
|
|
e9b5992600
|
Fix PrivacyRoomController
|
2020-11-05 18:42:23 +03:00 |
|
Viktor Fomin
|
151dc898f5
|
Update yarn.lock files
|
2020-11-05 12:28:39 +03:00 |
|
Viktor Fomin
|
081fe180bb
|
Web: Files: rename headers components
|
2020-11-05 11:15:46 +03:00 |
|
Viktor Fomin
|
1fc0d91182
|
Web: Files: fix header loader
|
2020-11-04 12:23:35 +03:00 |
|
Viktor Fomin
|
91c254c638
|
Web: Common: fix main button loader
|
2020-11-03 18:36:19 +03:00 |
|
Vladislav Makhov
|
22a494a5ad
|
yarn.lock update
|
2020-11-03 17:39:49 +03:00 |
|
Vladislav Makhov
|
1e483de4ba
|
Merge branch 'develop' into feature/third-party-settings
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/locales/en/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/locales/ru/translation.json
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/settings/actions.js
# web/ASC.Web.Client/src/store/settings/reducer.js
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-03 15:29:09 +03:00 |
|
|
|
78b2dc4631
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2020-11-03 11:47:16 +03:00 |
|
|
|
f39d6e83b8
|
Files: refactoring
|
2020-11-03 11:47:05 +03:00 |
|
|
|
60e66c1abe
|
Web: Fixed PWA App icon url on iOS
|
2020-11-02 21:42:53 +03:00 |
|
|
|
7e828b5643
|
Autofac: fix
|
2020-11-02 19:27:08 +03:00 |
|
|
|
42b7b93832
|
Merge branch 'develop' into feature/article-resize
|
2020-11-02 11:44:08 +03:00 |
|
|
|
2ae201ebbd
|
Files: privacy
|
2020-11-02 11:29:01 +03:00 |
|
|
|
6baeee6ddd
|
Files: fix startediting
|
2020-10-31 18:14:37 +03:00 |
|
Ilya Oleshko
|
7726e17170
|
Merge branch 'develop' into feature/article-resize
|
2020-10-30 15:32:25 +03:00 |
|
Ilya Oleshko
|
a823763af7
|
Web: Files : Body : RowContent : Fixed badges actions and styles
|
2020-10-30 15:20:06 +03:00 |
|
Ilya Oleshko
|
b1b402768b
|
Web: Files : Body : Added context to RowContainer
|
2020-10-30 14:25:04 +03:00 |
|
Ilya Oleshko
|
3b9679957e
|
Web: Files : Header : Added context to Header
|
2020-10-30 14:22:30 +03:00 |
|
Ilya Oleshko
|
c28b1d0121
|
Web: Components : RowContent : Renamed width property, fixed usage
|
2020-10-30 14:19:59 +03:00 |
|
|
|
f5ae1c4b0e
|
Web: Files: fixed setIsLoading
|
2020-10-30 14:13:54 +03:00 |
|
|
|
496d908f6d
|
Notify: fix
|
2020-10-30 10:23:35 +03:00 |
|
|
|
bc725f29df
|
Web: Common: added re-resizable package, added new acticle
|
2020-10-29 17:33:05 +03:00 |
|
|
|
a163c439d3
|
Merge branch 'develop' into feature/fixed-dragging
|
2020-10-29 13:23:37 +03:00 |
|
|
|
77e9f78d55
|
Web: Files: fixed dragging
|
2020-10-29 12:35:53 +03:00 |
|
|
|
70d3e51520
|
Web: Files: added drag cursor
|
2020-10-29 12:35:17 +03:00 |
|
Vladislav Makhov
|
f14eaabf50
|
Remove unused code
|
2020-10-28 14:18:02 +03:00 |
|
Vladislav Makhov
|
89a102ee17
|
Refactor move operations with actions.
|
2020-10-28 14:03:58 +03:00 |
|
