|
|
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 |
|
|
|
b9c2c2e770
|
java: add goback user.java
|
2023-12-22 15:08:35 +03:00 |
|
|
|
f1d41a4bf2
|
java: add changes after pr #501
|
2023-12-18 10:09:19 +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 |
|
|
|
7051437928
|
java: remove history methods for anonymous users (52a722cf89)
old commit:
52a722cf89
|
2023-12-12 10:25:45 +03:00 |
|
|
|
01618fee17
|
java: add onRequestUsers and onRequestSendNotify in editor.jsp
|
2023-12-11 11:54:36 +03:00 |
|
|
|
78a8b56b48
|
java: delete spaces from editor.jsp
|
2023-12-07 13:47:25 +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 |
|
|
|
6598aa585a
|
java: remove historyClose and restore
|
2023-12-05 15:25:05 +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 |
|
|
|
c8ccb3b502
|
java: add version index.jsp
|
2023-12-01 10:50:57 +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 |
|
|
|
b903bfc0cb
|
java: fix opening history without changes
|
2023-11-27 10:57:59 +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 |
|
|
|
1fda76552f
|
java: saving formsdata
|
2023-11-13 13:13:09 +03:00 |
|
|
|
6c6dd7a954
|
java: link in referenceData
|
2023-11-10 13:55:39 +03:00 |
|
|
|
c86c6bf17e
|
Merge branch 'develop' into feature/user-image
|
2023-11-07 11:25:40 +07:00 |
|
|
|
f620da3b98
|
java: empty usersInfo for anonymous
|
2023-11-06 12:02:38 +07:00 |
|
|
|
dfe61c5013
|
java: user avatar
|
2023-11-03 20:47:43 +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 |
|
|
|
b8c6f72e74
|
java: setUsers for region protection
|
2023-10-30 14:38:45 +07:00 |
|
|
|
8b5a2aceb0
|
deleted comments that duplicate the context
|
2023-10-26 17:11:29 +03:00 |
|
|
|
4387282949
|
java: onRequestOpen for referenceData source file
|
2023-10-26 16:30:48 +03: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 |
|
|
|
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 |
|
|
|
583e162520
|
Merge branch 'develop' into feature/upload-name
|
2023-10-11 11:24:24 +07:00 |
|
|
|
1871e0ae4a
|
java: trimming long name of uploading file
|
2023-10-11 10:57:44 +07:00 |
|
|
|
5f19bdcff0
|
Merge branch 'develop' into feature/select-cell
|
2023-10-10 10:47:06 +07:00 |
|
|
|
d65633427f
|
java: added key in referenceData
|
2023-10-09 15:16:19 +07:00 |
|
|
|
e49372123b
|
update icons
|
2023-09-29 14:23:44 +03:00 |
|
|
|
415a35b0b6
|
java: onRequestSelectDocument / setRequestedDocument
|
2023-09-28 13:00:25 +07:00 |
|
|
|
77546c2f76
|
java: onRequestSelectSpreadsheet/setRequestedSpreadsheet
|
2023-09-27 13:58:35 +07:00 |
|
|
|
01e9dcf1a8
|
fixed the sample archive names
|
2023-09-20 17:58:00 +03:00 |
|
