Commit Graph

26546 Commits

Author SHA1 Message Date
c938a98d00 fix ValidateDomain 2022-10-17 17:48:41 +03:00
b81d6e44b3 Merge branch 'feature/apisystem' of github.com:ONLYOFFICE/DocSpace into feature/apisystem 2022-10-17 13:05:22 +03:00
5cbae9e177 Merge branch 'develop' into feature/apisystem 2022-10-17 13:04:49 +03:00
19ad5b0ef2 fix api system 2022-10-17 12:15:44 +03:00
a77b213f75 fix jwt 2022-10-17 11:39:59 +03:00
18bb2281d2
Merge pull request #907 from ONLYOFFICE/feature/portal-access-rights
Feature/portal access rights
2022-10-17 11:52:46 +05:00
TimofeyBoyko
b3395efe50 Merge branch 'develop' into feature/portal-access-rights 2022-10-17 11:45:25 +05:00
e0f1c0529d Added stop, start, restart sh-files 2022-10-15 07:34:40 +03:00
1d0dddf196 Added mapping appsettings.dev.json from substitutions 2022-10-15 07:32:52 +03:00
669a5116d5
Merge pull request #876 from ONLYOFFICE/feature/rooms-counter-new
Feature/rooms counter new
2022-10-14 19:23:38 +04:00
f06ee58bc7
Merge pull request #902 from ONLYOFFICE/feature/invite-panel
Feature/invite panel
2022-10-14 18:18:28 +03:00
5c5f841e8e ApiSystem: fix 2022-10-14 17:55:43 +03:00
e2ccab3c97 ApiSystem: fix 2022-10-14 17:52:00 +03:00
d577f7bc35 Web: Client: InvitePanel: Temporarily hidden "Share via" button for external link 2022-10-14 17:47:18 +03:00
88e78f6695 Merge branch 'develop' into feature/invite-panel 2022-10-14 17:18:56 +03:00
32558c4756
Merge pull request #910 from ONLYOFFICE/bugfix/payments-page
Bugfix/payments page
2022-10-14 17:04:42 +03:00
362e89af69 Web: Client: InvitePanel: Fixed item AccessComboBox padding 2022-10-14 15:07:36 +03:00
95207cb1d9 Web: Client: InvitePanel: Added save edit on enter press 2022-10-14 14:49:16 +03:00
f9ec5869cd Web: Client: InvitePanel: Added information messages 2022-10-14 14:35:29 +03:00
77e9e97451 Web: Client: InvitePanel: Added adding element when pressing Enter for new elements. Fixed input clear after selecting item from list 2022-10-14 13:29:10 +03:00
ee689dac6d Web: Client: InvitePanel: Hide share via button if not active 2022-10-14 13:25:18 +03:00
b70b89d939 fix headers 2022-10-14 12:26:02 +03:00
7ba126f049 Merge branch 'develop' into feature/invite-panel 2022-10-14 12:15:55 +03:00
97a42aa47f
Merge pull request #914 from ONLYOFFICE/bugfix/elements-selection
Bugfix/elements selection
2022-10-14 12:11:32 +03:00
d98234885e Web: Added a place for the icon to avoid jumps. 2022-10-14 12:05:25 +03:00
7e17ec27e7 fix 2022-10-14 11:56:01 +03:00
657c737d3c Web: Added a check for the existence of an object. 2022-10-14 11:52:30 +03:00
c860447909 Web: Deleted useless code. 2022-10-14 11:33:01 +03:00
b55107dffd Web: Added information update when connecting via dialog. 2022-10-14 11:31:40 +03:00
cd25dcc8b3 Merge branch 'develop' into feature/apisystem 2022-10-14 11:27:19 +03:00
6b183f2ddb Web: Components: Added verification. 2022-10-14 10:57:57 +03:00
bccfb8ca1c Web: Fixed display of selected items. 2022-10-14 10:54:05 +03:00
452fa4d68e Merge branch 'develop' into bugfix/payments-page 2022-10-14 10:16:16 +03:00
TimofeyBoyko
e1ad515e6b Web:Client:UsersStore: fix access rights for room admin 2022-10-14 12:16:06 +05:00
ce4da40b1a
Merge pull request #913 from ONLYOFFICE/feature/docker-backend
Feature/docker backend
2022-10-14 12:03:29 +05:00
TimofeyBoyko
bc0d290eeb Merge branch 'develop' into feature/portal-access-rights 2022-10-14 11:56:19 +05:00
TimofeyBoyko
bbfd7b98ec Web:Client:ChangeUserTypeDialog: fix user list after cancel 2022-10-13 19:57:39 +05:00
fb8190b465 Added --no_ds param 2022-10-13 17:52:46 +03:00
TimofeyBoyko
6eda3b0d89 Web:Common:Constants: add new employee types 2022-10-13 19:46:38 +05:00
TimofeyBoyko
6a8ce64942 Web:Client:Accounts: fix role for row view 2022-10-13 19:43:54 +05:00
TimofeyBoyko
26d92c7da3 Web:Client:Store: refactoring selectio people store 2022-10-13 19:16:34 +05:00
TimofeyBoyko
32994832e4 Web:Client:EmptyContainer: add new translaton key for free user at shared empty page 2022-10-13 19:14:20 +05:00
TimofeyBoyko
17e6a50500 Web:Client:Article: delete useless code 2022-10-13 19:09:54 +05:00
TimofeyBoyko
84da70d63f Web:Client:Accounts: refactoring context menu for room admin 2022-10-13 19:07:44 +05:00
d5d78e7550
Merge pull request #892 from ONLYOFFICE/feature/local-restore
fix local restore
2022-10-13 16:22:59 +03:00
0ee788fb00 Fix run migration-runner 2022-10-13 16:18:14 +03:00
TimofeyBoyko
b5b96054c9 Web:Client:Accounts: fix empty displayName 2022-10-13 18:13:19 +05:00
b6c363e103 Added ROOT_DIR 2022-10-13 16:02:25 +03:00
TimofeyBoyko
b8d16a3751 Web:Client:ChangeUserStatusDialog: delete useless code 2022-10-13 17:39:14 +05:00
TimofeyBoyko
d371388e07 Web:Client:Accounts: fix users for disabled 2022-10-13 17:38:57 +05:00