391 Commits

Author SHA1 Message Date
d6309505ff 1.9.0 2024-06-07 09:43:21 +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
fa303e9bf2 switching from filling to editing 2024-04-15 16:32:44 +03:00
0414319893 nodejs: fill permission in embedded mode 2024-03-21 14:05:31 +03:00
3e6bee4cc1 fix(java-spring): empty strings as null in json deserialization. fix bug 66552 2024-02-27 15:14:16 +07:00
283139450c Form template rename as PDF form 2024-02-14 16:45:07 +03:00
b3d3b81274 copyright 2024 2024-02-01 12:39:36 +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
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
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
13c93ce2de java-spring: user avatar 2023-11-03 19:44:33 +07:00
e1d8418055 Merge branch 'develop' into feature/region-protect 2023-11-01 11:12:26 +07:00
6e6e5c472e Merge branch 'develop' into feature/routing-fix 2023-11-01 11:04:37 +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
c7409e3f35 java-spring: added JsonIgnoreProperties annotation to ignore the "windowName" field 2023-10-31 13:02:14 +03:00
f501612067 java-spring: setUsers for region protection 2023-10-30 14:15:09 +07:00
8b5a2aceb0 deleted comments that duplicate the context 2023-10-26 17:11:29 +03:00
4e3f87f692 java-spring: onRequestOpen for referenceData source file 2023-10-26 16:20:30 +03:00
7825d0ae48 java-spring: code refactoring 2023-10-26 12:57:07 +07:00
c6d3c8d684 Merge branch 'develop' into feature/routing-fix 2023-10-26 12:45:22 +07:00
0e5e2b125d java-spring: lint fix 2023-10-20 21:00:39 +07:00
1b1f276354 Merge branch 'feature/upload-name' of https://github.com/ONLYOFFICE/document-server-integration into feature/upload-name 2023-10-20 18:27:27 +07:00
3e9a98f0d8 max name length =50 and this value in constant var 2023-10-20 18:22:38 +07:00
81a75db351 java: revert comment 2023-10-20 12:29:10 +03:00
49d220d673 Merge remote-tracking branch 'remotes/origin/develop' into feature/upload-name
# Conflicts:
#	CHANGELOG.md
2023-10-20 12:11:45 +03:00
73acfe8721 Merge remote-tracking branch 'remotes/origin/release/1.7.0' into develop
# Conflicts:
#	CHANGELOG.md
2023-10-19 12:52:24 +03:00
0a8df9cb5d 1.7.0 2023-10-19 12:40:03 +03:00
c0051304d9 Merge remote-tracking branch 'remotes/origin/develop' into feature/select-word
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx.cs
#	web/documentserver-example/java-spring/src/main/resources/templates/editor.html
#	web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/php/src/views/DocEditorView.php
#	web/documentserver-example/php/templates/docEditor.tpl
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/python/templates/editor.html
#	web/documentserver-example/ruby/app/views/home/editor.html.erb
2023-10-12 11:54:43 +03:00
2fe1619389 Merge branch 'develop' into feature/upload-name 2023-10-12 14:44:29 +07:00
73ef86edc9 Merge remote-tracking branch 'remotes/origin/develop' into feature/select-cell
# Conflicts:
#	CHANGELOG.md
2023-10-12 09:52:46 +03:00
d36c70b6f5 Merge branch 'develop' into feature/select-word 2023-10-11 13:49:39 +07:00
78cc152c93 Merge branch 'develop' into feature/select-word 2023-10-11 13:42:34 +07:00
77d6ab7174 java-spring: removed mapping changes 2023-10-11 12:51:05 +07:00
583e162520 Merge branch 'develop' into feature/upload-name 2023-10-11 11:24:24 +07:00