586 Commits

Author SHA1 Message Date
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
88b36049d2 refactor(csharp): change formats retrieval method on frontend 2024-03-18 18:02:29 +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
ca274bc465 feat(csharp): handling auto-conversion error(-9) 2024-03-13 15:39:07 +05:00
5b6a2ba318 refactor(csharp): remove console.log 2024-03-13 13:44:47 +05:00
81f5bdd528 feat(csharp): implement delete all files method 2024-03-07 15:42:23 +05:00
423233e93f update submodule 2024-03-05 16:42:41 +03:00
3eac4912e1 Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop 2024-02-14 22:19:11 +03:00
283139450c Form template rename as PDF form 2024-02-14 16:45:07 +03:00
9721187083 Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop 2024-02-09 12:21:37 +03:00
bce5e3760a do not convert to oform 2024-02-09 12:21:24 +03:00
b3d3b81274 copyright 2024 2024-02-01 12:39:36 +03:00
dab4841c1d inserting svg 2024-02-01 12:35:46 +03:00
a7cf7ae378 Merge branch 'release/1.8.0' into develop
# Conflicts:
#	CHANGELOG.md
2024-01-30 18:12:51 +03:00
0bcd7088e6 1.8.0 2024-01-30 18:11:47 +03:00
3a2f30bfcd Merge branch 'release/v8.0.0' into develop
# 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-01-19 12:27:44 +03:00
7423edd7d9 ar skin language 2024-01-18 17:06:52 +03:00
a2c8499622 update formats (add missed records) 2024-01-10 16:54:20 +03:00
1b0e8df99f Merge remote-tracking branch 'remotes/origin/develop' into feature/users-different-goback
# Conflicts:
#	CHANGELOG.md
2024-01-09 11:01:08 +03:00
9e2aae1658 csharp: add goback Users.cs 2023-12-29 12:23:39 +07:00
8ba1d5e8d7 update formats (add missed records) 2023-12-26 12:32:27 +03:00
92206ed637 csharp: remove historyClose and restore 2023-12-19 15:31:28 +07:00
7c18d08bc6 csharp: add onRequestUsers and onRequestSendNotify in DocEditor.aspx 2023-12-15 19:57:55 +07:00
a9063af6e1 fix sr-Latn-RS 2023-12-06 12:56:12 +03:00
e65f6f27be Merge remote-tracking branch 'remotes/origin/develop' into feature/version-on-front
# Conflicts:
#	CHANGELOG.md
2023-12-05 13:21:41 +03:00
97f95fb850 csharp: add version Default.aspx 2023-12-04 16:17:37 +07:00
7d8a1a8b6d sr-Latn-CS skin language 2023-12-01 18:07:41 +03:00
580f8f3e89 csharp: convert after uploading only tagged formats 2023-11-27 10:45:29 +03:00
5ac60bace6 Merge pull request #492 from ONLYOFFICE/feature/submit-form
Feature/submit form
2023-11-22 11:49:19 +03:00
c1d1af6fae Merge pull request #487 from ONLYOFFICE/feature/csharp-matrix-formats
Feature/csharp matrix formats
2023-11-21 15:14:21 +03:00
c2466ddebe csharp: added format caching 2023-11-21 15:12:10 +03:00
7ecbc6d458 csharp: replace the previous implementation of formats 2023-11-21 15:12:05 +03:00
bf72a43605 Merge remote-tracking branch 'remotes/origin/develop' into feature/submit-form
# Conflicts:
#	web/documentserver-example/csharp-mvc/Helpers/Users.cs
#	web/documentserver-example/csharp/Users.cs
#	web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java
#	web/documentserver-example/java/src/main/java/helpers/Users.java
#	web/documentserver-example/php/src/helpers/ExampleUsers.php
#	web/documentserver-example/python/src/utils/users.py
#	web/documentserver-example/ruby/app/models/users.rb
2023-11-21 12:30:39 +03:00
5581cc1ad2 csharp: saving formsdata 2023-11-13 15:17:44 +03:00
99c046e498 csharp: link in referenceData
# Conflicts:
#	CHANGELOG.md
2023-11-10 13:52:58 +03:00
28c8410e7d csharp: add format module 2023-11-09 09:51:43 +03:00
c91fbf6320 csharp: add document-formats submodule 2023-11-08 15:24:14 +03:00
030985bbeb csharp: moved the submodule to the assets/document-templates subfolder 2023-11-08 15:02:58 +03:00
c86c6bf17e Merge branch 'develop' into feature/user-image 2023-11-07 11:25:40 +07:00
62e2f7426c csharp: user avatar 2023-11-06 11:41:09 +07:00
e1d8418055 Merge branch 'develop' into feature/region-protect 2023-11-01 11:12:26 +07:00
1620e8277d Merge remote-tracking branch 'remotes/origin/develop' into feature/referenceData-open
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/python/src/views/actions.py
2023-10-31 14:25:00 +03:00