Commit Graph

33347 Commits

Author SHA1 Message Date
146fc43d8a add "AddDbTenant" and foreignkeys 2023-04-25 00:27:54 +03:00
4a1e1a88e7 add dbTenant in models and rename "tenant" to "tenantid" 2023-04-25 00:17:29 +03:00
236ce135ba update migration 2023-04-24 23:03:59 +03:00
6575fc14cc
Merge pull request #1366 from ONLYOFFICE/bugfix/comment-edit-style
Fixed small comment width in version panel
2023-04-24 18:30:03 +04:00
cd95baa914 Merge branch 'develop' into bugfix/comment-edit-style 2023-04-24 18:26:42 +04:00
980d7282eb
Merge pull request #1363 from ONLYOFFICE/bugfix/invite-panel-scroll
Bugfix/invite panel scroll
2023-04-24 18:20:40 +04:00
f3ca1adb73 Merge branch 'develop' into bugfix/invite-panel-scroll 2023-04-24 18:15:28 +04:00
db976e019e Web: Fix routing to login (logout issues) 2023-04-24 14:25:14 +04:00
a7dc928f27 Web: Fix removeEventListener usage 2023-04-24 13:56:03 +04:00
e2984385b7 Web: Added missing imports 2023-04-24 13:53:36 +04:00
34254ceb09 Merge branch 'master' into develop 2023-04-24 12:52:54 +04:00
a6023af5f1
Merge pull request #1379 from ONLYOFFICE/release/v1.0.0
Release/v1.0.0
2023-04-24 11:36:57 +03:00
43126ee7c5 fix 2023-04-24 01:16:06 -07:00
f5d3372af2 Merge branch 'release/v1.0.0' into develop 2023-04-24 11:33:58 +04:00
a0adeba2e4 fix audit report 2023-04-22 15:54:34 +03:00
NikitaVashchuk
9712466c98 png images for notifications 2023-04-22 16:21:35 +05:00
d25e10bf2c added translations 2023-04-21 23:34:13 +03:00
43a62dca44 added translations 2023-04-21 22:31:19 +03:00
NikitaVashchuk
242e147563 returned images via url for notifications 2023-04-22 00:17:20 +05:00
d34663eb9f fixed quota description 2023-04-21 21:03:40 +03:00
9f9806a013 fixed greenbutton text 2023-04-21 18:45:09 +03:00
99c8a67a2e Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0 2023-04-21 18:37:28 +03:00
c5963b45d5 Web:Client:Fixed clearing the Language field when selecting a language on the tablet and pressing the Cancel button. 2023-04-21 18:36:45 +03:00
d1d2d2f87c fixed admin activation message 2023-04-21 18:04:04 +03:00
7127d6a885
Merge pull request #1378 from ONLYOFFICE/bugfix/rooms-routes
Bugfix/rooms routes
2023-04-21 19:00:41 +04:00
Timofey Boyko
510d6724f5 Web:Client:Routes: rename roomId to room 2023-04-21 17:38:10 +03:00
Timofey Boyko
b83637d95e Web:Client:Routes: return deleted rooms routes 2023-04-21 17:36:40 +03:00
69e5f40bc8 added translations 2023-04-21 17:21:38 +03:00
c025f11ecf added translations 2023-04-21 16:43:31 +03:00
2110c09c11 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-21 15:20:58 +03:00
f0a6679ba8 added translations 2023-04-21 15:19:59 +03:00
9f0391fefc Update translations (bg, de, fi, pt) 2023-04-21 14:31:21 +03:00
Viktor Fomin
4cda75877c Client: Confirm: ChangeOwner: add text after change 2023-04-21 13:59:52 +03:00
46505c4c5f Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-21 14:34:57 +04:00
a97351f4ae Editor: Fix favicon on oform/docxf and other files without documentType 2023-04-21 14:34:43 +04:00
6384035e0f fix Bug 62218 2023-04-21 13:28:38 +03:00
sk81.biz@gmail.com
721676f662 Del dev config json files 2023-04-21 13:11:22 +03:00
edae98c73d fix Bug 62216 2023-04-21 12:27:41 +03:00
ff08a86942 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-21 12:22:04 +03:00
5afd8e6950 Fixed Bug 62196 - Rooms.Archive. File conversion available in archive room. 2023-04-21 12:21:14 +03:00
2f178d42f9 added translations 2023-04-21 11:35:29 +03:00
6ac647a7c7
Merge pull request #1371 from ONLYOFFICE/feature/routing-optimization
Feature/routing optimization
2023-04-20 19:41:16 +04:00
Timofey Boyko
6efeb9da76 Web:Client:Store: delete useless store 2023-04-20 18:38:07 +03:00
Timofey Boyko
f65760e6ef Web:Client: rename client, confirm and portal settings router to routes 2023-04-20 18:37:15 +03:00
Timofey Boyko
ec44094956 Merge branch 'feature/routing-optimization' of https://github.com/ONLYOFFICE/DocSpace into feature/routing-optimization 2023-04-20 18:33:56 +03:00
Timofey Boyko
a6f4000d6e Web:Client: split router to client, portal settings and confirm routes 2023-04-20 18:33:35 +03:00
65737a6031 Update yarn.lock 2023-04-20 19:32:10 +04:00
1d15a0345f added translations 2023-04-20 18:21:37 +03:00
Timofey Boyko
8f1f0bd543 Web: move navigate and location from SettingsStore to window.DocSpace 2023-04-20 17:53:49 +03:00
1106663ca8 Merge branch 'release/v1.0.0' of https://github.com/ONLYOFFICE/DocSpace into release/v1.0.0 2023-04-20 17:47:47 +03:00