|
|
1fda76552f
|
java: saving formsdata
|
2023-11-13 13:13:09 +03: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 |
|
|
|
5a63bd47c1
|
java: changed getFileExtension return without dot
|
2023-09-13 11:27:06 +03:00 |
|
|
|
5e2f812fee
|
java: refactoring Format.java, FormatManager.java, FileType.java
|
2023-09-13 11:24:51 +03:00 |
|
|
|
0f3bb28d92
|
java: added lombok dependency
|
2023-09-13 11:17:43 +03:00 |
|
|
|
c20687e241
|
java: added submodule document-formats
|
2023-09-12 17:34:46 +03:00 |
|
|
|
45051d2c29
|
java: fixed FormatManager
|
2023-09-12 17:24:29 +03:00 |
|
|
|
940ea2797e
|
Merge branch 'develop' into feature/java-matrix-formats
# Conflicts:
# .gitmodules
|
2023-09-12 16:39:32 +03:00 |
|
|
|
33600df8a9
|
added paths to the config files
|
2023-09-11 18:57:19 +03:00 |
|
|
|
8f14876b81
|
java and java spring: updated Docker instructions
|
2023-09-06 15:55:07 +03:00 |
|
|
|
2d83d3ec87
|
Merge pull request #451 from ONLYOFFICE/feature/java-refactoring-history
Feature/java refactoring history
|
2023-09-05 14:39:14 +03:00 |
|
|
|
05904fd68a
|
java: link to Oracle
|
2023-09-05 13:57:13 +03:00 |
|
|
|
a3fa30b192
|
fixed: directUrl for historyData
|
2023-09-04 15:19:34 +03:00 |
|
|
|
24b9a35651
|
java: changed restore version without reload page
|
2023-09-04 13:11:20 +03:00 |
|
|
|
52a722cf89
|
java: added api (history, historyData) for getting history
|
2023-09-04 13:10:54 +03:00 |
|
|
|
fb16b88dd1
|
java: replace the previous implementation of formats
|
2023-08-16 15:21:33 +04:00 |
|
|
|
d259cf3ff7
|
java: add format module
|
2023-08-16 15:21:33 +04:00 |
|
|
|
e9d8b60c13
|
java: add restore endpoint
|
2023-08-11 20:39:59 +04:00 |
|
|
|
2955dc004f
|
java: update paths to the new location of templates
|
2023-08-08 14:47:51 +04:00 |
|
|
|
85981abd00
|
java: move document-templates to the assets directory
|
2023-08-08 14:47:51 +04:00 |
|
|
|
ad94016a85
|
Merge remote-tracking branch 'remotes/origin/master' into develop
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/php/functions.php
# web/documentserver-example/php/views/DocEditorView.php
|
2023-06-29 11:13:23 +05:00 |
|
|
|
50a4ddbd11
|
1.6.0
|
2023-06-29 11:00:42 +05:00 |
|
|
|
0ae8f5d396
|
java: delete original file after convert
|
2023-06-27 11:09:43 +03:00 |
|
|
|
0b4c67e552
|
Merge branch 'hotfix/headers-charset-on-upload-convert' into release/v7.4.0
|
2023-06-27 12:10:42 +05:00 |
|
|
|
4f589a7394
|
java: fixed directUrl property
|
2023-06-26 11:05:01 +03:00 |
|
|
|
183d165c00
|
java: null instead of empty lists
|
2023-06-21 12:40:35 +03:00 |
|
|
|
75b22614cf
|
refresh licenses
|
2023-06-21 12:29:59 +05:00 |
|
|
|
42ac89e5e5
|
Merge pull request #370 from ONLYOFFICE/hotfix/headers-charset-on-upload-convert
java: upload and convert fix
|
2023-06-19 11:33:09 +05:00 |
|
