Commit Graph

36199 Commits

Author SHA1 Message Date
39caff8634 web: fix display PublicRoomBar on Custom room 2023-07-27 15:18:49 +04:00
ff3ea0cc92
Merge pull request #1359 from ONLYOFFICE/features/migrate-urlShortener
Features/migrate url shortener
2023-07-27 02:13:17 -07:00
79ddd53cd8 UrlShortRewriter: aaded using 2023-07-26 19:02:13 +03:00
d9347095a3 UrlShortener: removed nodejs project 2023-07-26 18:49:50 +03:00
f5767b93a7 UrlShortener: removed nodejs project 2023-07-26 18:48:00 +03:00
874061108c fix 2023-07-26 18:42:57 +03:00
0be67b2fe0 Merge branch 'develop' into features/migrate-urlShortener 2023-07-26 18:38:35 +03:00
081cc8320e removed unsused 2023-07-26 18:37:19 +03:00
8e49cdecff Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2023-07-26 18:36:41 +03:00
baebec8817 Migrations: removed unused 2023-07-26 18:36:30 +03:00
31a50762b0 Merge branch 'develop' into features/migrate-urlShortener
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2023-07-26 18:34:33 +03:00
0e0e359368
Merge pull request #1572 from ONLYOFFICE/bugfix/fix-move-copy-toast
bugfix/fix-move-copy-toast
2023-07-26 19:33:19 +04:00
f9adfc15a0 fix 2023-07-26 18:32:28 +03:00
0d375cb414
Merge pull request #1573 from ONLYOFFICE/bugfix/fix-click-new-items
Fix page crash
2023-07-26 19:31:53 +04:00
f19364c9ef
Merge pull request #1575 from ONLYOFFICE/bugfix/fix-non-unique-id
Fix non unique ids
2023-07-26 19:31:25 +04:00
e9f60e04ad Migrations: removed unused 2023-07-26 18:31:00 +03:00
f29fedbfc3
Merge pull request #1563 from ONLYOFFICE/feature/public-room
Feature/public room
2023-07-26 19:26:07 +04:00
2888955632 Merge branch 'develop' into features/migrate-urlShortener
# Conflicts:
#	migrations/mysql/UrlShortenerDbContext/20230414201716_UrlShortenerDbContext_Upgrade1.Designer.cs
#	migrations/postgre/UrlShortenerDbContext/20230414201716_UrlShortenerDbContext_Upgrade1.Designer.cs
#	web/ASC.Web.Core/UrlShortRewriter.cs
2023-07-26 18:10:27 +03:00
f967962c21 fix 2023-07-26 18:05:09 +03:00
634bd53e82 removed unsused migrations 2023-07-26 18:00:57 +03:00
a46a82180c Web: Renamed translation 2023-07-26 18:56:07 +04:00
Akmal Isomadinov
8f34f847a9 Web:PDFViewer Fixed color 2023-07-26 19:14:31 +05:00
Akmal Isomadinov
ca84979d34 Web:PDFViewer Removed useless code 2023-07-26 19:07:52 +05:00
Akmal Isomadinov
9b203134dd Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room 2023-07-26 19:06:26 +05:00
Akmal Isomadinov
c94fb18329 Web:PDFViewer Fixed error handling in the PDF-viewer and fixed the ability to download PDF files 2023-07-26 19:05:50 +05:00
242f532648 Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room 2023-07-26 16:51:39 +03:00
7c7f52e51c added ignore pdf download restriction 2023-07-26 16:51:22 +03:00
Akmal Isomadinov
dc0c5f9e09 Web:MediaViewer Fixed the ability to download files in the media viewer 2023-07-26 18:21:12 +05:00
ee2b62c7b5 UrlShortener: fix migrations 2023-07-26 15:17:07 +03:00
028b63213c Merge branch 'develop' into features/migrate-urlShortener
# Conflicts:
#	common/Tools/ASC.Migration.Creator/Program.cs
#	common/Tools/ASC.Migration.Runner/Program.cs
#	migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.Designer.cs
#	migrations/mysql/UrlShortenerDbContext/20221019144355_UrlShortenerDbContextMigrate.cs
#	migrations/mysql/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.Designer.cs
#	migrations/postgre/SaaS/CoreDbContext/20230414201715_CoreDbContext_Upgrade1.cs
#	migrations/postgre/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs
#	migrations/postgre/SaaS/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
#	migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.Designer.cs
#	migrations/postgre/UrlShortenerDbContext/20221019144356_UrlShortenerDbContextMigrate.cs
#	migrations/postgre/UrlShortenerDbContext/UrlShortenerDbContextModelSnapshot.cs
#	migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.Designer.cs
#	migrations/postgre/UrlShortenerFakeDbContext/20221019144356_UrlShortenerFakeDbContextMigrate.cs
#	migrations/postgre/UrlShortenerFakeDbContext/UrlShortenerFakeDbContextModelSnapshot.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Core/Utility/UrlShortener.cs
2023-07-26 14:30:00 +03:00
9bf024a63c Merge branch 'develop' into feature/public-room 2023-07-26 13:45:01 +04:00
e66137a6ed fix 2023-07-26 12:44:18 +03:00
76f1f9bb38 Merge branch 'develop' into feature/public-room 2023-07-26 13:34:03 +04:00
fc0744f6b3 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2023-07-26 12:27:51 +03:00
c0e44e97f3 Rebranding available only for standalone 2023-07-26 12:27:20 +03:00
d2020ff2f1 Update docspace.overcome.yml
Added port mapping for document-server container
2023-07-26 13:25:25 +04:00
2853735615 Web: Files: EditLinkPanel: fixed mobile view 2023-07-25 19:14:52 +03:00
a67f301608 Web: Files: fixed translations 2023-07-25 19:04:28 +03:00
cffbf97517 Web: Files: EditLinkPanel: fixed onCopyClick 2023-07-25 19:01:13 +03:00
1b8fb5ca59 Web: Files: EmbeddingBody: fixed CodeCopySuccess translation 2023-07-25 19:00:48 +03:00
6de49aff28 Merge branch 'feature/public-room' of github.com:ONLYOFFICE/AppServer into feature/public-room 2023-07-25 18:51:29 +03:00
960e0655bb Web: Files: fixed table after merge 2023-07-25 18:51:16 +03:00
eca1088d72 Merge branch 'feature/public-room' of github.com:ONLYOFFICE/DocSpace into feature/public-room 2023-07-25 18:36:43 +03:00
ca8c144080 Files: Settings: removed socket url for anonymous if there is no token in request 2023-07-25 18:36:31 +03:00
3d3f244cc1 Web: Files: fixed RoomSharingDialog styles 2023-07-25 18:32:22 +03:00
f4e2f76fff Web: Editor: fixed goBack 2023-07-25 18:27:43 +03:00
a1a2d5aa4a Web: Files: fixed files open 2023-07-25 17:59:25 +03:00
7917549533 Web: Files: fixed double share url 2023-07-25 17:44:56 +03:00
2e42741e4b Web: Files: fixed public-room error after added new file 2023-07-25 17:27:11 +03:00
234c8b0178 Merge branch 'develop' into feature/public-room 2023-07-25 17:52:13 +04:00