Commit Graph

8237 Commits

Author SHA1 Message Date
SuhorukovAnton
a9b3fcd45b nginx-config: update 2020-10-30 13:04:29 +03:00
SuhorukovAnton
c1701500fa connect-controlPanel: fix backup 2020-10-30 13:03:19 +03:00
9d6e1f58ea Notify: fix 2020-10-30 12:49:37 +03:00
b594986270 Notify: fix password change 2020-10-30 12:19:14 +03:00
ea21d49ddc Web: Common: fixed main container height 2020-10-30 12:08:34 +03:00
496d908f6d Notify: fix 2020-10-30 10:23:35 +03:00
5e90151e71 Notify: fix 2020-10-29 22:15:36 +03:00
0c1560a448 ResManager: fix 2020-10-29 22:15:14 +03:00
ad23a67282 Notify: fix 2020-10-29 19:52:32 +03:00
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
TatianaLopaeva
aca906db56 Web:Common: Refactoring 2020-10-29 13:23:21 +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
TatianaLopaeva
d7a8226671 Merge branch 'develop' into feature/fix-hide/show-header
# Conflicts:
#	web/ASC.Web.Common/src/components/Main/index.js
2020-10-28 19:02:51 +03:00
TatianaLopaeva
59d430bbb1 Web: Common: Added Layout to Files 2020-10-28 17:08:53 +03:00
TatianaLopaeva
2c991fcfd7 Web:Common Deleted unnecessary import 2020-10-28 16:36:16 +03:00
TatianaLopaeva
c553d8990b Web: Common: Added context for passing ref to section-body 2020-10-28 16:34:56 +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
TatianaLopaeva
ee82a0d064 Web: Common: Added styles and function scrolledTheVerticalAxis 2020-10-27 11:16:59 +03:00
TatianaLopaeva
9c95aa4362 Web: Common: Refactoring 2020-10-27 11:13:42 +03:00
SuhorukovAnton
3fc5188607 nginx-config: update onlyoffice.conf 2020-10-27 10:55:47 +03:00
TatianaLopaeva
1c09c48152 Merge branch 'develop' into feature/fix-hide/show-header 2020-10-27 10:52:12 +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