|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
a6c805791e
|
end of name fix
|
2023-10-11 10:49:37 +07:00 |
|
|
|
bf20f7b263
|
java-spring: trimming long name of uploading file
|
2023-10-10 13:10:08 +07:00 |
|
|
|
5f19bdcff0
|
Merge branch 'develop' into feature/select-cell
|
2023-10-10 10:47:06 +07:00 |
|
|
|
54ece9b580
|
java-spring: removed mapping changes
|
2023-10-10 10:45:03 +07:00 |
|
|
|
61398f93f1
|
java-spring: added key in referenceData
|
2023-10-09 15:00:05 +07:00 |
|
|
|
9457754666
|
java-spring: onRequestSelectDocument / setRequestedDocument add mapping fix
|
2023-10-05 11:14:31 +07:00 |
|
|
|
88a006ac49
|
java-spring: spreadsheet method and mapping fix
|
2023-10-02 17:27:25 +07:00 |
|
|
|
e49372123b
|
update icons
|
2023-09-29 14:23:44 +03:00 |
|
|
|
e280291f80
|
java-spring: onRequestSelectSpreadsheet/setRequestedSpreadsheet
|
2023-09-28 12:14:33 +07:00 |
|
|
|
01e9dcf1a8
|
fixed the sample archive names
|
2023-09-20 17:58:00 +03:00 |
|
|
|
64a63f2c35
|
java-spring: changed getFileExtension return without dot
|
2023-09-13 15:23:02 +03:00 |
|
|
|
00c7194ef4
|
java-spring: replace format properties on formats matrix
|
2023-09-13 15:22:56 +03:00 |
|
|
|
bbdd0878e9
|
java-spring: added Format.java, FormatService.java
|
2023-09-13 15:22:48 +03:00 |
|
|
|
fb8f47062c
|
java-spring: added submodule document-formats
|
2023-09-13 15:22:04 +03:00 |
|
|
|
33600df8a9
|
added paths to the config files
|
2023-09-11 18:57:19 +03:00 |
|
|
|
f4dd6d665f
|
Merge pull request #454 from ONLYOFFICE/refactoring/java-spring-dto
Refactoring/java spring dto
|
2023-09-07 10:54:10 +03:00 |
|
|
|
6bdadd6053
|
Merge remote-tracking branch 'remotes/origin/develop' into refactoring/java-spring-dto
|
2023-09-07 10:26:03 +03:00 |
|
|
|
95579f2376
|
java-spring: added dto/SaveAs.java
|
2023-09-07 10:25:30 +03:00 |
|
|
|
8c518fd109
|
java-spring: added dto/Rename.java
|
2023-09-07 10:24:53 +03:00 |
|
|
|
aa245e2aae
|
java-spring: added dto/Reference.java and dto/ReferenceData.java
|
2023-09-07 10:24:18 +03:00 |
|
|
|
6511507093
|
java-spring: added dto/Restore.java
|
2023-09-07 10:23:34 +03:00 |
|
|
|
8f14876b81
|
java and java spring: updated Docker instructions
|
2023-09-06 15:55:07 +03:00 |
|
|
|
14b014cb7f
|
Merge pull request #452 from ONLYOFFICE/feature/java-spring-refactoring-history
Feature/java spring refactoring history
|
2023-09-05 14:39:41 +03:00 |
|
|
|
05904fd68a
|
java: link to Oracle
|
2023-09-05 13:57:13 +03:00 |
|
|
|
a56b411c93
|
java-spring: changed restore version without reload page
|
2023-09-04 15:32:15 +03:00 |
|
|
|
bc5393e28c
|
java-spring: added api (history, historyData) for getting history
|
2023-09-04 15:29:23 +03:00 |
|
|
|
a3b93fee99
|
java-spring: update paths to the new location of templates
|
2023-08-15 12:42:49 +04:00 |
|
|
|
36cca57dd8
|
java-spring: move document-templates to the assets directory
|
2023-08-15 12:42:48 +04:00 |
|
|
|
63365e176e
|
java-spring: add restore endpoint
|
2023-08-03 12:34:14 +04:00 |
|
|
|
a4b6fcb512
|
java-spring: add a step to save the previous version of the file during processing save
|
2023-07-26 17:34:07 +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 |
|
|
|
342b31f7d7
|
java-spring: delete original file after convert
|
2023-06-27 11:32:28 +03:00 |
|
