Commit Graph

642 Commits

Author SHA1 Message Date
4c7ea51207 Merge remote-tracking branch 'remotes/origin/release/v1.10.0' into release/v8.2.0 2024-09-24 12:02:52 +03:00
581f2aaef6 he-IL skin language 2024-09-23 10:51:25 +03:00
66cf2aca8c Merge remote-tracking branch 'remotes/origin/release/v1.10.0' into bugfix-1.10.0
# Conflicts:
#	web/documentserver-example/csharp-mvc/Scripts/jscript.js
#	web/documentserver-example/csharp/script/jscript.js
#	web/documentserver-example/python/static/js/jscript.js
2024-09-20 09:57:35 +03:00
b9b4aeffac fix working with formats (893303c27f) (Fix Bug 70022) 2024-09-12 10:10:05 +03:00
e25b10d618 fix(csharp-mvc): extension without dot in conversion script. Fix Bug 70022 2024-09-12 14:03:49 +07:00
f55beaa8ac update empty files (Fix Bug 70100) 2024-09-10 18:11:50 +03:00
4be1abca19 update submodule with tiff ext 2024-09-09 09:24:36 +03:00
1e6465aef7 update templates 2024-08-26 11:06:04 +03:00
c46b4e16d5 fix remove favorite status (0e1a580a86) 2024-07-31 14:28:21 +03:00
8d7767e4a7 1.10.0 2024-07-25 09:50:41 +03:00
2f4b28343c feat(csharp-mvc): creating and editing pdf instead docxf 2024-07-16 15:10:17 +07:00
d564e78b2c Merge remote-tracking branch 'remotes/origin/develop' into feature/mobile-design 2024-06-14 13:31:31 +03:00
aa7b6aae8b fix(csharp-mvc): add missing formats js file to scripts bundle 2024-06-14 14:50:24 +05:00
0561a1068c Merge remote-tracking branch 'remotes/origin/release/v1.9.0' into develop
# Conflicts:
#	CHANGELOG.md
2024-06-07 09:46:26 +03:00
d6309505ff 1.9.0 2024-06-07 09:43:21 +03:00
95e7aff092 Merge remote-tracking branch 'remotes/origin/release/v8.1.0' into develop
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/java-spring/src/main/resources/application.properties
#	web/documentserver-example/nodejs/app.js
#	web/documentserver-example/nodejs/views/wopiIndex.ejs
2024-06-07 08:49:20 +03:00
8207aec7a5 sr-Cyrl-RS skin language
# Conflicts:
#	CHANGELOG.md
2024-06-06 17:26:17 +03:00
a5fa0096e8 en-GB skin language
# Conflicts:
#	CHANGELOG.md
2024-06-06 17:25:51 +03:00
0c886264ba fix sr-Latn-RS
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/csharp-mvc/web.appsettings.config
#	web/documentserver-example/csharp/settings.config
#	web/documentserver-example/java-spring/src/main/resources/application.properties
#	web/documentserver-example/java/src/main/resources/settings.properties
2024-06-06 17:25:23 +03:00
cfd010cc99 sr-Cyrl-RS skin language 2024-05-27 13:22:33 +03:00
083de6993c feat(csharp-mvc): implement design for mobile devices 2024-05-21 13:10:30 +05:00
354b500077 Merge branch 'develop' into feature/forgotten-page 2024-05-13 14:02:51 +05:00
107459cf19 en-GB skin language 2024-04-24 13:22:57 +03:00
e487a89203 fix(csharp-mvc): show empty table in forgotten files page if error occurs 2024-04-23 18:03:23 +05:00
aeb2394b39 feat(csharp-mvc): control access to forgotten page using config variable 2024-04-23 17:55:22 +05:00
5c804c1e1e feat(csharp-mvc): display message in error template 2024-04-23 17:54:27 +05:00
39a61835ea fix main panel overflow in forgotten page 2024-04-22 13:44:13 +05:00
df3e018e3c fix link on logo 2024-04-22 12:37:03 +05:00
0f32feb1b9 csharp-mvc: fix link on logo 2024-04-19 13:47:05 +03:00
d61ebb27ae csharp-mvc: include files to project 2024-04-19 13:46:15 +03:00
844e723387 save as for pdf 2024-04-19 12:29:47 +03:00
cd465a633e fix: responsive header image in forgotten files page 2024-04-17 16:36:28 +05:00
5fc22799e1 fix: fix table content overflow 2024-04-17 16:31:04 +05:00
59057a5905 feature(csharp-mvc): add navbar 2024-04-17 13:33:26 +05:00
b1167516d4 feature(csharp-mvc): forgotten files page 2024-04-17 13:24:01 +05:00
ccaf607cef refactor(csharp-mvc): return response in commandrequest method 2024-04-15 19:08:55 +05:00
fa303e9bf2 switching from filling to editing 2024-04-15 16:32:44 +03:00
57ca15153f Merge pull request #551 from ONLYOFFICE/feature/fetching-formats
Feature/fetching formats
2024-04-03 12:31:53 +03:00
cc3c640868 refactor: merge format and format-manager files into formats file 2024-04-01 12:21:18 +05:00
f1f834fb0c refactor: create and use new method for finding formats by extension 2024-03-26 17:57:52 +05:00
6d28e3f8d8 Merge branch 'release/v8.1.0' into develop
# Conflicts:
#	CHANGELOG.md
2024-03-21 14:23:41 +03:00
0414319893 nodejs: fill permission in embedded mode 2024-03-21 14:05:31 +03:00
0a61708f67 Merge remote-tracking branch 'remotes/origin/develop' into feature/delete-all-files
# Conflicts:
#	CHANGELOG.md
2024-03-20 10:58:41 +03:00
389198aec6 Merge pull request #544 from ONLYOFFICE/feature/auto-conversion-error
Feature/auto conversion error
2024-03-20 10:02:53 +03:00
426b15b8f1 Merge remote-tracking branch 'origin/develop' into feature/fetching-formats 2024-03-19 13:01:48 +05:00
c4980c19e7 Revert "docxf and oform since v7.0"
This reverts commit beb9885b03.

# Conflicts:
#	web/documentserver-example/php/doceditor.php
2024-03-18 18:24:47 +03:00
0bfb036be6 refactor(csharp-mvc): change formats retrieval method on frontend 2024-03-18 18:03:10 +05:00
80291baa40 goback: change state for users (408d80fff6) 2024-03-18 14:21:12 +03:00
47f4f022aa Merge remote-tracking branch 'remotes/origin/develop' into feature/delete-all-files
# Conflicts:
#	CHANGELOG.md
2024-03-15 16:48:58 +03:00
5258fd0674 feat(csharp-mvc): handling auto-conversion error(-9) 2024-03-13 15:39:42 +05:00