|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
b1d66e16a5
|
feat(java-spring): handling auto-conversion error(-9)
|
2024-03-13 15:38:24 +05:00 |
|
|
|
c1da8e14c3
|
feat(java-spring): implement delete all files method
|
2024-03-06 14:41:29 +05:00 |
|
|
|
423233e93f
|
update submodule
|
2024-03-05 16:42:41 +03:00 |
|
|
|
690ab5471b
|
Merge remote-tracking branch 'remotes/origin/release/1.8.0' into develop
|
2024-02-28 17:40:09 +03:00 |
|
|
|
3e6bee4cc1
|
fix(java-spring): empty strings as null in json deserialization. fix bug 66552
|
2024-02-27 15:14:16 +07: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 |
|
|
|
18fd30700f
|
copyright 2024
|
2024-02-09 12:22:50 +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 |
|
|
|
319a689fe2
|
nodejs: filling pdf
|
2024-01-30 16:51:02 +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 |
|
|
|
8ba1d5e8d7
|
update formats (add missed records)
|
2023-12-26 12:32:27 +03:00 |
|
|
|
a55d7b2d9d
|
java-spring : add goback user.java
|
2023-12-22 15:08:09 +03:00 |
|
|
|
f43e7414bb
|
java-spring: add changes after pr #501
|
2023-12-18 10:09:11 +03:00 |
|
|
|
7b91694107
|
Merge branch 'develop' into feature/remove-history-close-restore
|
2023-12-15 18:16:04 +03:00 |
|
|
|
a36f270829
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/fix-editros-files
# Conflicts:
# web/documentserver-example/php/templates/docEditor.tpl
|
2023-12-15 17:54:25 +03:00 |
|
|
|
0967c1c3ac
|
java-spring: remove history methods for anonymous users (bc5393e28c)
old commit:
bc5393e28c
|
2023-12-12 10:19:25 +03:00 |
|
|
|
75ca703f8a
|
java-spring: add onRequestUsers and onRequestSendNotify in editor.html
|
2023-12-11 11:59:52 +03:00 |
|
|
|
3b9bad4a26
|
Merge branch 'develop' into feature/remove-history-close-restore
|
2023-12-07 11:34:27 +03:00 |
|
|
|
435b8013f6
|
style: updates to styling
|
2023-12-07 10:58:41 +03:00 |
|
|
|
a9063af6e1
|
fix sr-Latn-RS
|
2023-12-06 12:56:12 +03:00 |
|
|
|
ec596753c6
|
java-spring: remove historyClose and restore
|
2023-12-05 14:58:24 +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 |
|
|
|
7d8a1a8b6d
|
sr-Latn-CS skin language
|
2023-12-01 18:07:41 +03:00 |
|
|
|
449ad0759b
|
java-spring: add version index.html
|
2023-12-01 10:50:26 +03:00 |
|
|
|
ce58acbca9
|
Merge pull request #493 from ONLYOFFICE/fix/open-history-without-changes
Fix/open history without changes
|
2023-11-29 10:21:28 +03:00 |
|
|
|
ad4b2d136c
|
java-spring: fix opening history without changes
|
2023-11-24 13:41:43 +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 |
|
|
|
8ebbfa59be
|
Merge pull request #470 from ONLYOFFICE/feature/routing-fix
Feature/routing fix
|
2023-11-15 10:16:47 +03:00 |
|
|
|
ccf6fb4098
|
java-spring: saving formsdata
|
2023-11-13 14:02:49 +03:00 |
|
|
|
778121f2af
|
java-spring: link in referenceData
|
2023-11-10 13:54:55 +03:00 |
|
|
|
2ee051e9fc
|
java-spring: 'uid-' prefix was returned to User class id field
|
2023-11-08 11:38:04 +07:00 |
|
|
|
c86c6bf17e
|
Merge branch 'develop' into feature/user-image
|
2023-11-07 11:25:40 +07:00 |
|
|
|
34e60cd33f
|
Merge pull request #484 from ONLYOFFICE/feature/remove-logo-parameter
java-spring: remove logo parameter in config and Logo.java class
|
2023-11-06 14:48:49 +03:00 |
|
|
|
65b9bfec01
|
java-spring: remove logo parameter in config and Logo.java class
|
2023-11-06 09:55:45 +03:00 |
|
