|
|
06517ce41e
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
|
2020-10-29 19:30:17 +03:00 |
|
|
|
260f939d2c
|
Notify: fix
|
2020-10-29 19:10:07 +03:00 |
|
|
|
13c690e183
|
Web: Common: fixed main container height
|
2020-10-29 18:18:00 +03:00 |
|
|
|
bc725f29df
|
Web: Common: added re-resizable package, added new acticle
|
2020-10-29 17:33:05 +03:00 |
|
|
|
ebb6d92c49
|
Web: Components: added context
|
2020-10-29 17:29:22 +03:00 |
|
Ilya Oleshko
|
ab1fd0964a
|
Merge pull request #113 from ONLYOFFICE/feature/fixed-dragging
Feature/fixed dragging
|
2020-10-29 13:44:15 +03:00 |
|
|
|
a163c439d3
|
Merge branch 'develop' into feature/fixed-dragging
|
2020-10-29 13:23:37 +03:00 |
|
|
|
ca7059a3e2
|
Merge pull request #111 from ONLYOFFICE/feature/operation-panel-fix
Fix OperationsPanel move menu
|
2020-10-29 12:54:27 +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 |
|
SuhorukovAnton
|
c94b0ee340
|
connect-controlPanel: fix branding, backup and restore
|
2020-10-28 16:21:24 +03:00 |
|
Vladislav Makhov
|
f14eaabf50
|
Remove unused code
|
2020-10-28 14:18:02 +03:00 |
|
Vladislav Makhov
|
53a7d1ed45
|
Merge branch 'develop' into feature/operation-panel-fix
|
2020-10-28 14:16:11 +03:00 |
|
Vladislav Makhov
|
89a102ee17
|
Refactor move operations with actions.
|
2020-10-28 14:03:58 +03:00 |
|
|
|
2b66326873
|
Merge pull request #112 from ONLYOFFICE/feature/fix-main-container-height
Feature/fix main container height
|
2020-10-28 13:45:32 +03:00 |
|
|
|
d241c610fe
|
web: common: bump version
|
2020-10-28 13:37:32 +03:00 |
|
|
|
c53446f5bc
|
Web: Common: fixed main container height
|
2020-10-28 13:35:06 +03:00 |
|
Vladislav Makhov
|
01e25257b5
|
Delete unused code
|
2020-10-28 11:46:08 +03:00 |
|
Vladislav Makhov
|
97ed3121cc
|
Add selector to receive operation folders data
|
2020-10-28 11:42:05 +03:00 |
|
Vladislav Makhov
|
626a2a60a2
|
Fix OperationsPanel move menu
|
2020-10-28 09:33:43 +03:00 |
|
|
|
48f596ee58
|
Merge pull request #110 from ONLYOFFICE/feature/private-room
Feature/private room
|
2020-10-27 16:52:05 +03:00 |
|
Vladislav Makhov
|
3b6883595a
|
Move selector to auth
|
2020-10-27 14:47:07 +03:00 |
|
Vladislav Makhov
|
81f0342127
|
web: common: bump version
|
2020-10-27 14:46:39 +03:00 |
|
Vladislav Makhov
|
eab8d8e8e2
|
update yarn.lock
|
2020-10-27 14:28:56 +03:00 |
|
Vladislav Makhov
|
44050626b4
|
Fix console warnings
|
2020-10-27 14:21:30 +03:00 |
|
Vladislav Makhov
|
ab0b1c5ee6
|
Refactor description translation.
|
2020-10-27 14:21:05 +03:00 |
|
Vladislav Makhov
|
6249fd948d
|
web: common: bump version
|
2020-10-27 14:16:39 +03:00 |
|
|
|
b548870886
|
Web: Files: Removed useless calls of API by Privacy folder + Added isEncryptionSupport selector
|
2020-10-27 13:15:06 +03:00 |
|
SuhorukovAnton
|
3fc5188607
|
nginx-config: update onlyoffice.conf
|
2020-10-27 10:55:47 +03:00 |
|
Vladislav Makhov
|
64a72b522f
|
Update yarn.lock
|
2020-10-27 10:49:55 +03:00 |
|
Vladislav Makhov
|
198ae9d38b
|
Update prop types
|
2020-10-27 10:32:50 +03:00 |
|
Vladislav Makhov
|
a5ed82695b
|
web: components: bump version
|
2020-10-27 10:32:22 +03:00 |
|
Vladislav Makhov
|
d91e79c011
|
web: common: bump version
|
2020-10-27 10:25:59 +03:00 |
|
Vladislav Makhov
|
1a3397f183
|
web: components: bump version
|
2020-10-27 10:25:50 +03:00 |
|
Vladislav Makhov
|
32b1d5914f
|
Add private room selectors
|
2020-10-26 16:23:00 +03:00 |
|
Vladislav Makhov
|
6ba6ba2e64
|
Refactoring of private room mock
|
2020-10-26 16:22:47 +03:00 |
|
SuhorukovAnton
|
aec80ae181
|
nginx: update onlyoffice.conf
|
2020-10-26 16:14:45 +03:00 |
|
Vladislav Makhov
|
e5c5f9194d
|
Fix code after merge
|
2020-10-23 16:01:10 +03:00 |
|
Vladislav Makhov
|
7b458a72c9
|
Merge branch 'develop' into feature/private-room
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-10-23 15:49:10 +03:00 |
|
Vladislav Makhov
|
af0d47d474
|
Add translation
|
2020-10-23 15:31:45 +03:00 |
|
Vladislav Makhov
|
23c157e279
|
Update tree node with private room
|
2020-10-23 15:31:33 +03:00 |
|
Vladislav Makhov
|
5441db9b76
|
Add private room empty screen container
|
2020-10-23 15:31:10 +03:00 |
|
Vladislav Makhov
|
664b9b2a62
|
Add private room catalog icon
|
2020-10-23 15:30:04 +03:00 |
|
Ilya Oleshko
|
5911f523f8
|
Merge pull request #108 from ONLYOFFICE/feature/error-handling-fix
Feature/error handling fix
|
2020-10-23 15:18:07 +03:00 |
|
|
|
eee01c25e6
|
Web: Files: Fixed render with empty JSX
|
2020-10-23 15:01:07 +03:00 |
|
|
|
6848dcfad7
|
Web: Files: Fixed MoveTo/CopyTo operations (no loopFilesOperations action inside props)
|
2020-10-23 14:01:02 +03:00 |
|
|
|
cb849577fb
|
Update yarn.lock files
|
2020-10-23 13:45:17 +03:00 |
|
|
|
e6f1e8241d
|
web: components: bump version
|
2020-10-23 13:37:35 +03:00 |
|
|
|
c0484e1f05
|
Web: Components: Update react-dropzone
|
2020-10-23 13:37:19 +03:00 |
|
|
|
e872a0118a
|
build: Uncommented call bat
|
2020-10-23 13:36:25 +03:00 |
|
