Vladislav Makhov
|
2108c2fba9
|
Rename third-party-services.js to ThirdPartyServicesSettings.js, fix imports
|
2020-11-05 18:20:15 +03:00 |
|
Vladislav Makhov
|
baa90d1a84
|
remove console warnings
|
2020-11-05 18:17:10 +03:00 |
|
Vladislav Makhov
|
c483acfde3
|
this.state decompose
|
2020-11-05 18:14:59 +03:00 |
|
Vladislav Makhov
|
49acf0168c
|
Moved declarations out from render
|
2020-11-05 18:11:32 +03:00 |
|
Vladislav Makhov
|
cc252ecac2
|
Add window.cloudCryptoCommand
|
2020-11-05 17:54:55 +03:00 |
|
|
|
e22de56363
|
Merge branch 'develop' into feature/third-party-settings
|
2020-11-05 17:45:54 +03:00 |
|
Artem Tarasov
|
30adb42aaa
|
Web: Files: added new icons for folder 24x24
|
2020-11-05 17:22:45 +03:00 |
|
Artem Tarasov
|
c2ea1cc19e
|
Web: Files: settings: fixed gap between toggle button
|
2020-11-05 16:58:29 +03:00 |
|
Artem Tarasov
|
1fce8d0c03
|
Web: Components: toggle-button: fixed size icon
|
2020-11-05 16:56:15 +03:00 |
|
Vladislav Makhov
|
94b42d7637
|
Merge branch 'develop' into feature/desktop-view
|
2020-11-05 14:14:01 +03:00 |
|
Vladislav Makhov
|
9a3bc3b655
|
Add desktop commands
|
2020-11-05 14:13:06 +03:00 |
|
Artem Tarasov
|
38c7faec04
|
Merge branch 'develop' into hotfix/documents-bugfix
|
2020-11-05 11:57:55 +03:00 |
|
Artem Tarasov
|
91019b19bd
|
web: common: bump version
|
2020-11-05 11:50:08 +03:00 |
|
Artem Tarasov
|
29b6e1d213
|
web: components: bump version
|
2020-11-05 11:50:01 +03:00 |
|
Artem Tarasov
|
c44990418e
|
Web: Components: fix bugs related to adding prop size="min"
|
2020-11-05 11:49:00 +03:00 |
|
Artem Tarasov
|
ace2111197
|
Web: People: applied prop size for Avatar Component
|
2020-11-05 11:40:19 +03:00 |
|
Artem Tarasov
|
b077f450b5
|
Web: Client: applied prop size for Avatar Component
|
2020-11-05 11:39:56 +03:00 |
|
Artem Tarasov
|
481abf40f8
|
Web: Common: applied prop size for Avatar Component
|
2020-11-05 11:39:09 +03:00 |
|
Artem Tarasov
|
c310545a83
|
Web: Components: applied props size="min"
|
2020-11-05 11:35:44 +03:00 |
|
Artem Tarasov
|
39d00f3dc4
|
Web: Components: Avatar: add props size='min'
|
2020-11-05 11:34:14 +03:00 |
|
Artem Tarasov
|
df9a1658e9
|
Web: People: refactoring
|
2020-11-05 09:44:20 +03:00 |
|
Artem Tarasov
|
6a4cabcedf
|
Web: Components/Files/People: fix styles
|
2020-11-05 09:22:14 +03:00 |
|
|
|
5a959892ae
|
Merge pull request #114 from ONLYOFFICE/feature/connect-controlPanel
Feature/connect control panel
|
2020-11-03 21:14:44 +03:00 |
|
|
|
8cfbf8cc7f
|
Api: fix attachments
|
2020-11-03 18:16:23 +03:00 |
|
Vladislav Makhov
|
550d08dc51
|
Fix modal
|
2020-11-03 17:48:05 +03:00 |
|
Vladislav Makhov
|
22a494a5ad
|
yarn.lock update
|
2020-11-03 17:39:49 +03:00 |
|
Artem Tarasov
|
c09df3bec8
|
Web: Components: tree-menu: fixed draggable
|
2020-11-03 17:35:56 +03:00 |
|
Vladislav Makhov
|
bbc708192d
|
yarn.lock update
|
2020-11-03 17:29:50 +03:00 |
|
|
|
04003a0fa4
|
Web: Common: update lock file
|
2020-11-03 17:26:47 +03:00 |
|
|
|
7da4a806ff
|
Web: Components: added new icons
|
2020-11-03 17:26:21 +03:00 |
|
Artem Tarasov
|
75939cffad
|
Web: Files/Components: fixed group-menu-button in Header
|
2020-11-03 16:58:02 +03:00 |
|
|
|
790d2fc934
|
Restore: fix
|
2020-11-03 16:02:54 +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 |
|
Artem Tarasov
|
e880ba8ba9
|
Web: Files: fixed position of contextButton in row
|
2020-11-03 15:14:13 +03:00 |
|
Artem Tarasov
|
8507650485
|
Web: Common: PageLayout: fixed selection items
|
2020-11-03 12:23:46 +03:00 |
|
|
|
8eeb2b3375
|
Nginx: fix files/thirdparty/capabilities
|
2020-11-03 12:23:17 +03:00 |
|
|
|
450184f51c
|
Merge branch 'develop' into feature/connect-controlPanel
|
2020-11-03 11:48:52 +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 |
|
Vladislav Makhov
|
6e5c425d6b
|
Add method
|
2020-11-03 11:07:00 +03:00 |
|
Vladislav Makhov
|
63b706714b
|
Merge branch 'develop' into feature/desktop-view
|
2020-11-03 10:07:21 +03:00 |
|
Artem Tarasov
|
920bd224cf
|
Web: Components: tree-node: fixed selection
|
2020-11-03 10:01:01 +03:00 |
|
Vladislav Makhov
|
2afb10a135
|
Refactoring
|
2020-11-03 09:52:05 +03:00 |
|
|
|
60e66c1abe
|
Web: Fixed PWA App icon url on iOS
|
2020-11-02 21:42:53 +03:00 |
|
Artem Tarasov
|
2c6b10a58b
|
Web: Files: Settings: fixed selection in the TreeSettings when switching from files
|
2020-11-02 21:17:28 +03:00 |
|
Artem Tarasov
|
bfcc46a546
|
Web: Files: Settings: fixed render MainButton
|
2020-11-02 20:56:58 +03:00 |
|
Artem Tarasov
|
fa1c8c8e37
|
Web: Files: selectors: added selector for icon of dragged file
|
2020-11-02 20:31:17 +03:00 |
|
|
|
7e828b5643
|
Autofac: fix
|
2020-11-02 19:27:08 +03:00 |
|
Artem Tarasov
|
f3231bd842
|
Web: Files: tooltip: refactoring tooltip when dragging'
|
2020-11-02 14:49:40 +03:00 |
|
|
|
c9a32c05dc
|
Merge branch 'develop' into feature/connect-controlPanel
# Conflicts:
# web/ASC.Web.Api/Controllers/PortalController.cs
|
2020-11-02 13:56:52 +03:00 |
|
