Commit Graph

27265 Commits

Author SHA1 Message Date
141bed97b4 Merge branch 'develop' into feature/refactoring-saveUserInfo 2022-11-02 11:16:29 +03:00
606e851a34 FileOperation inherited DistributedTaskProgress 2022-11-01 18:44:05 +03:00
560b6ce10c
Merge pull request #969 from ONLYOFFICE/bugfix/fixed-hotkeys
Web: Files: fixed hotkeys error
2022-11-01 16:29:23 +03:00
5722d73360 Web: Files: fixed hotkeys error 2022-11-01 16:23:01 +03:00
e765272e7a fixed appsettings.json 2022-11-01 15:24:17 +03:00
43f72c624a Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2022-11-01 12:54:31 +03:00
46fa46b9e3 ASC.Socket.IO: support CloudWatch transport for winston logger 2022-11-01 12:54:14 +03:00
b2444dbae0
Merge pull request #967 from ONLYOFFICE/feature/docker-build-check-version
Add check github version
2022-11-01 12:48:06 +03:00
sk81.biz@gmail.com
a255f7d1cd Add check github 2022-11-01 10:17:29 +03:00
d320c1e9e8
Merge pull request #962 from ONLYOFFICE/bugfix/fixed-tags-jump
Web: Files: fixed tag jumping
2022-10-31 22:44:36 +03:00
bd59797d50
Merge pull request #945 from ONLYOFFICE/feature/active-sessions
Feature/active sessions
2022-10-31 22:43:52 +03:00
c2917a1423 Merge branch 'develop' into feature/active-sessions 2022-10-31 22:30:24 +03:00
Elyor Djalilov
7c8b2bf4b2 Web:Client:ActiveSessions: minor changes 2022-10-31 18:40:01 +05:00
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
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
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
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
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
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
0baa36c1c0 GetDataStore tenant string to int 2022-10-28 15:23:51 +03: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
724482a21e Web: Files: fixed forms gallery tiles 2022-10-28 13:57:23 +03:00
ef113630de
Merge pull request #960 from ONLYOFFICE/bugfix/fixed-article-for-shared-folder
Bugfix/fixed article for shared folder
2022-10-28 11:57:32 +03:00
20f87ad792 Web: Files: fixed redirect to root after loading shared subfolder 2022-10-28 11:52:54 +03:00
447c872c31 Web: Client: InvitePanel: Fixed clearing input after change focus 2022-10-28 11:51:36 +03:00
7168fd32d7 Web: Files: fixed select article for third-party folders 2022-10-28 11:51:03 +03:00
ca84158211 Web: Client: Confirm: Fixed empty email if it exist at confirm url 2022-10-28 11:25:49 +03:00
8375711b5c Web: Client: InvitePanel: Fixed invitation links usage for rooms 2022-10-28 11:24:25 +03:00
28c5e1fa40 Merge branch 'feature/invite-accounts' of github.com:ONLYOFFICE/DocSpace into feature/invite-accounts 2022-10-28 11:23:14 +03:00
d7670ac18b
Merge pull request #959 from ONLYOFFICE/bugfix/fix-catalog-styles
Web:Common:Article: add vertical line and fix styles
2022-10-28 11:23:05 +03:00
TimofeyBoyko
3baf50db59 Web:Common:Article: add theme support for vertical line 2022-10-28 12:54:06 +05:00
TimofeyBoyko
5bcbbb9b90 Web:Common:Article: add vertical line and fix styles 2022-10-28 12:42:43 +05:00
86daa32280 People: fix 2022-10-28 10:34:03 +03:00
5ceebc8cba Merge branch 'feature/invite-accounts' of github.com:ONLYOFFICE/DocSpace into feature/invite-accounts 2022-10-27 22:02:12 +03:00
78bd9f0e13 Merge branch 'develop' into feature/invite-accounts 2022-10-27 19:18:07 +03:00