Commit Graph

28000 Commits

Author SHA1 Message Date
53fcee2b83
Merge pull request #1040 from ONLYOFFICE/bugfix/login
Bugfix/login
2022-11-17 20:25:28 +03:00
31db809bd0 Update yarn.lock 2022-11-17 20:24:11 +03:00
sk81.biz@gmail.com
724749cbf0 Modify Dockerfile.app cmd config 2022-11-17 20:22:53 +03:00
sk81.biz@gmail.com
2814473cdd Add docker-entypoint for servises login, doceditor 2022-11-17 20:06:43 +03:00
7415a19a5e Merge branch 'develop' into bugfix/login 2022-11-17 19:05:09 +03:00
5583ca0467
Merge pull request #1048 from ONLYOFFICE/hotfix/nodejs-fix-nconf
fix nconf
2022-11-17 18:13:10 +03:00
cce692a601 Delete redis.test.json 2022-11-17 17:39:44 +03:00
1903b4e779 Web: Added canEditFile function. 2022-11-17 16:59:08 +03:00
3a3d6baeef Web: Added canViewVersionHistory function. 2022-11-17 16:41:32 +03:00
6a87a8e6bd Web: Added canChangeVersionHistory function. 2022-11-17 16:05:59 +03:00
9da275952c fix nconf 2022-11-17 15:58:13 +03:00
Viktor Fomin
631845fb55 Merge branch 'develop' into bugfix/login 2022-11-17 17:40:39 +05:00
659c3bf606
Merge pull request #1047 from ONLYOFFICE/bugfix/redesign-empty-screen-into-room
Bugfix/redesign empty screen into room
2022-11-17 15:08:15 +03:00
TimofeyBoyko
f30142af13 Web:Client:EmptyScreen: fix gap between items 2022-11-17 14:57:52 +03:00
bf89726fbc fix nconf 2022-11-17 14:56:04 +03:00
TimofeyBoyko
3d8593f803 Web:Client:EmptyScreen: fix img for rooms 2022-11-17 14:41:15 +03:00
TimofeyBoyko
5694bc0678 Web:Client:EmptyScreen: fix header text 2022-11-17 14:36:01 +03:00
TimofeyBoyko
58e5ed56e9 Web:Client:EmptyContainer: fix invite users for empty container into rooms 2022-11-17 14:28:37 +03:00
TimofeyBoyko
6f75168fce Web:Client:EmptyContainer: hide filter block for emtpy folder container 2022-11-17 14:09:09 +03:00
TimofeyBoyko
9c70bc73eb Web:Client:EmptyContainer: fix display into room 2022-11-17 13:45:32 +03:00
TimofeyBoyko
a95df80f75 Web:Client:Locales: add new translation keys for empty screen 2022-11-17 13:45:05 +03:00
3d09dc49b1 Web: Added canLockFile function. 2022-11-17 09:43:13 +03:00
6fe3a695a6 Web: Added canChangeUserRole function. 2022-11-17 09:12:05 +03:00
d39666df9d fix 2022-11-16 18:27:07 +03:00
2f7fdaf00a
Merge pull request #971 from ONLYOFFICE/feature/refactoring-saveUserInfo
Feature/remove .wait and .result
2022-11-16 18:24:29 +03:00
5fb05f57c6
Merge pull request #1042 from ONLYOFFICE/bugfix/fix-drag-and-drop-tablet-styles
Web:Client:Home: fix drag and drop styles when info panel is open and…
2022-11-16 18:15:42 +03:00
782b928ef0 People: allowNotPayment 2022-11-16 18:14:47 +03:00
TimofeyBoyko
41083b8a95 Merge branch 'develop' into bugfix/fix-drag-and-drop-tablet-styles 2022-11-16 18:08:00 +03:00
TimofeyBoyko
bcf8429904 Web:Client:Home: fix row drag styles 2022-11-16 18:06:19 +03:00
Viktor Fomin
9cca8532c3 Merge branch 'develop' into bugfix/login 2022-11-16 19:58:03 +05:00
Viktor Fomin
09796e8ec4 Web: fix serve 2022-11-16 19:55:46 +05:00
83d84be867 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2022-11-16 17:41:30 +03:00
6747d4d763 Api: allownotpayment, owner check for suspend and delete methods 2022-11-16 17:40:00 +03:00
dcfde7df07 common settings for configure aws cloudwatch credentials 2022-11-16 17:18:58 +03:00
TimofeyBoyko
2ac92dd483 Merge branch 'develop' into bugfix/fix-drag-and-drop-tablet-styles 2022-11-16 17:00:56 +03:00
5fc90528a7
Merge pull request #1043 from ONLYOFFICE/bugfix/fixed-set-files
Web: Files: fixed getRooms
2022-11-16 16:57:54 +03:00
4a7d900d96 Web: Files: fixed getRooms 2022-11-16 16:55:20 +03:00
TimofeyBoyko
a0c8b27fb8 Web:Client:Home: fix drag and drop styles when info panel is open and columns is hide 2022-11-16 16:53:46 +03:00
Viktor Fomin
779e5afb29 Client: Confirm: use more login from common 2022-11-16 17:23:54 +05:00
Viktor Fomin
6c3684985f Login: use more login from common 2022-11-16 17:23:31 +05:00
Viktor Fomin
893cc3f541 Common: move more login modal 2022-11-16 17:23:15 +05:00
Viktor Fomin
eb22002d64 Login: delete useless 2022-11-16 17:22:58 +05:00
Viktor Fomin
4757013e3e Merge branch 'develop' into bugfix/login 2022-11-16 17:11:30 +05:00
61110b8aaf
Merge pull request #1041 from ONLYOFFICE/bugfix/fixed-double-request-for-room-creation
Bugfix/fixed double request for room creation
2022-11-16 14:46:51 +03:00
d509f1e31b fix FileMoveCopyOperation 2022-11-16 14:36:30 +03:00
99fc0d5c8e
Merge pull request #1039 from ONLYOFFICE/bugfix/fix-create-room-from-header
Bugfix/fix create room from header
2022-11-16 14:35:32 +03:00
ea0653939b Web: Files: fixed edit room event 2022-11-16 13:55:50 +03:00
e2581ccb8c Web: Files: disabled hotkeys when the create/edit room dialog is open 2022-11-16 13:31:34 +03:00
3d4ed8f2d7 Web: Files: fixed double api request after room creation 2022-11-16 13:15:22 +03:00
b5fa1b36bd Web: Files: removed useless log 2022-11-16 13:13:31 +03:00