Commit Graph

27731 Commits

Author SHA1 Message Date
Elyor Djalilov
a4a5a847cf Merge branch 'feature/active-sessions' of github.com:ONLYOFFICE/DocSpace into feature/active-sessions 2022-10-31 18:27:13 +05:00
Elyor Djalilov
12824c1f03 Web:Client:ActiveSessions: bugfix 2022-10-31 18:27:07 +05:00
52b23cbf8b healthcheck: added to ApiSystem/ClearEvents services. refactoring 2022-10-31 16:13:45 +03:00
Viktor Fomin
7dc46f7fb0 Merge branch 'develop' into feature/whitelabel 2022-10-31 16:31:59 +05:00
mushka
8fe7efe036 cleaned up infoPanelBody inject 2022-10-31 14:09:28 +03:00
mushka
98cad7fd1f fixed after-merge conflicts 2022-10-31 13:57:17 +03:00
mushka
5ef235bf8c Merge branch 'develop' into feature/info-panel-update 2022-10-31 13:55:44 +03:00
TimofeyBoyko
86af8a8921 Web:Client: add new translation key 2022-10-31 15:29:43 +05:00
TimofeyBoyko
0ed78f0d6c Web:Client: fix delete all from archive 2022-10-31 15:29:19 +05:00
86234d32fd
Merge pull request #964 from ONLYOFFICE/bugfix/fixed-integration-route
Web: Setting: fixed integration route
2022-10-31 13:18:33 +03:00
0e7bb6447c Web: Setting: fixed integration route 2022-10-31 13:15:20 +03:00
052249b4ef Files: fixed when room access was 0 2022-10-31 13:13:35 +03:00
7a01578f0c
Merge pull request #939 from ONLYOFFICE/feature/remove-new-TenantQuotaController
remove  "new TenantQuotaController"
2022-10-31 13:03:28 +03:00
81b298cf72 fix 2022-10-31 13:03:02 +03:00
0f72136ff0 Merge branch 'develop' into bugfix/rooms 2022-10-31 11:34:50 +03:00
Viktor Fomin
9510ccbc74 Common: SettingsStore: fix logo url 2022-10-31 13:29:40 +05:00
Viktor Fomin
109cf3e74e Components: Themes: fix 2022-10-31 13:24:10 +05:00
TimofeyBoyko
a06205389a Web:Client:Article: fix catalog for free user 2022-10-31 11:57:33 +05:00
TimofeyBoyko
b12f039a84 Web:Client: move all check for access rights for Accounts into AccessRights store 2022-10-31 11:54:41 +05:00
Elyor Djalilov
c4ff1d057c Merge branch 'develop' into feature/active-sessions 2022-10-31 11:24:05 +05:00
50951fac6d Merge branch 'develop' into feature/active-sessions 2022-10-31 08:50:06 +03:00
Viktor Fomin
fa46ab25ad Client: PortalSettings: Whitelabel: add loading 2022-10-31 04:29:21 +05:00
Viktor Fomin
4e1d3111ab Client: PortalSettings: Whitelabel: fix color 2022-10-31 04:24:15 +05:00
Viktor Fomin
c8f598f9d1 Components: Themes: fix 2022-10-31 04:23:56 +05:00
Viktor Fomin
4918f8ad58 Client: PortalSettings: Whitelabel: fix for free 2022-10-29 06:41:31 +05:00
Viktor Fomin
e3615d4257 Merge branch 'develop' into feature/whitelabel 2022-10-29 01:25:26 +05:00
Viktor Fomin
43dc940760 Client: PortalSettings: Whitelabel: fix restore 2022-10-29 01:25:13 +05:00
b8314e86e1
Merge pull request #958 from ONLYOFFICE/feature/invite-accounts
Feature/invite accounts
2022-10-28 20:43:26 +03:00
f7cee67855 Create .dockerignore 2022-10-28 20:30:32 +03:00
9647236ea8 Update Dockerfile.dev
Fix docker git clone layer caching
2022-10-28 20:30:20 +03:00
641d63b0a5 Update stop.backend.docker.sh 2022-10-28 20:29:28 +03:00
Viktor Fomin
3be8a38733 Client: PortalSettings: Whitelabel: fix save text as logo 2022-10-28 19:35:38 +05:00
e197a7b506 Quota: fix 2022-10-28 17:35:22 +03:00
TimofeyBoyko
14c6770d85 Merge branch 'feature/invite-accounts' of github.com:ONLYOFFICE/DocSpace into feature/invite-accounts 2022-10-28 18:27:02 +05:00
TimofeyBoyko
6db2ace603 Web:Client:EmptyContainer: fix rooms description for free user 2022-10-28 18:26:54 +05:00
ef10f570f5 Files: fixed incorrect setting user type 2022-10-28 16:24:58 +03:00
556c0b8041 People: renamed IsDocSpaceAdmin to IsAdmin 2022-10-28 16:23:41 +03:00
TimofeyBoyko
ed33f59c96 Web:Client:Files: enable archive routes for free users 2022-10-28 18:21:49 +05:00
TimofeyBoyko
f0178d6c95 Web:Client:Article: fix catalog items for visitors 2022-10-28 18:20:48 +05:00
7978fcbdfd Files: added correct parent folder id for thirdparty room 2022-10-28 15:44:23 +03:00
8835bc9bac Files: added correct path for thirdparty rooms 2022-10-28 15:43:17 +03:00
0baa36c1c0 GetDataStore tenant string to int 2022-10-28 15:23:51 +03:00
Viktor Fomin
100ff46728 Client: PortalSettings: Whitelabel: add toast 2022-10-28 17:20:09 +05:00
Viktor Fomin
3743e3ae83 Client: PortalSettings: Whitelabel: fix 2022-10-28 17:17:42 +05:00
Viktor Fomin
7f73eb0d9d Client: PortalSettings: Whitelabel: fix store 2022-10-28 17:14:01 +05:00
Viktor Fomin
973566a34c Client: PortalSettings: Whitelabel: fix 2022-10-28 17:06:46 +05:00
88139816ab Web: Files: fixed tag jumping 2022-10-28 14:58:35 +03:00
36e47cbe2e Merge branch 'develop' into feature/invite-accounts 2022-10-28 14:54:46 +03:00
5d6d977368
Merge pull request #961 from ONLYOFFICE/bugfix/fixed-gallery-tiles
Web: Files: fixed forms gallery tiles
2022-10-28 14:27:52 +03:00
Viktor Fomin
eded0a3a50 Merge branch 'develop' into feature/whitelabel 2022-10-28 16:05:38 +05:00