Commit Graph

485 Commits

Author SHA1 Message Date
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
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
5865fedbe7 java: upload and convert fix 2023-06-05 10:19:58 +03:00
a60c594505 java: edited language name zh 2023-05-10 17:28:38 +05:00
4351de8ec7 java: no, si lang code 2023-03-27 13:35:37 +03:00
7b926f1e11 Merge remote-tracking branch 'remotes/origin/develop' into feature/convert-to-ooxml-on-upload 2023-03-26 17:26:50 +05:00
2b19d96646 Merge pull request #365 from ONLYOFFICE/feature/save-files-format
Feature/save files format
2023-03-26 17:21:49 +05:00
76dde2fac8 java: convert to .ooxlm 2023-03-24 12:44:19 +03:00
36169cbaa8 java: horizontal scroll fix for IE10-11 2023-03-22 16:54:32 +03:00
8bf38e39ac java: save file in response type 2023-03-22 12:10:27 +05:00
2f91bdd1b8 Merge pull request #361 from ONLYOFFICE/bugfix/jwt
added: getters for FileModel, fix (4a902dff94a4c1139d2f820a9e42499d57…
2023-03-22 11:34:10 +05:00
f5c6fe76d3 Merge pull request #362 from ONLYOFFICE/feature/update-jquery
Feature/update jquery
2023-03-22 11:31:41 +05:00
e1d6bac33a Merge remote-tracking branch 'remotes/origin/hotfix/1.5.1' into feature/update-jquery
# Conflicts:
#	CHANGELOG.md
#	web/documentserver-example/php/config.php
#	web/documentserver-example/php/index.php
#	web/documentserver-example/python/licenses/jQuery.license
2023-03-22 11:29:45 +05:00
2724f007db 1.5.1 2023-03-22 11:13:14 +05:00
a0abfb39a7 license: update jquery license text 2023-03-22 11:05:42 +05:00
0387b80843 java: licenses for jQuery.Migrate 2023-03-21 21:32:05 +05:00
2c1a160215 java: jquery-3.6.4 instead of 1.8.2 2023-03-21 21:32:05 +05:00
49084614cd added: getters for FileModel, fix (4a902dff94) 2023-03-21 10:18:44 +03:00
e6511a5b69 java: licenses for jQuery.Migrate 2023-03-20 09:40:56 +03:00
43b9f31aa6 java: jquery-3.6.4 instead of 1.8.2 2023-03-20 09:39:26 +03:00
5831c7f651 java: hide edit icon on view screen for anonymous 2023-03-14 15:50:03 +05:00
5749ad8db2 java: changed format list 2023-03-03 16:55:59 +05:00
469a8c087b Merge branch 'develop' into feature/referenceData 2023-02-27 10:17:41 +03:00
9c7b39bd5a protect field to information 2023-02-23 17:43:09 +05:00
ebd252f42c java: "protect" permission is added 2023-02-22 14:53:24 +03:00
21d1fd962f java: fix - search for filename by path 2023-02-22 11:55:13 +03:00
e88c2e9c68 java: search for fileName by path added + json-data fix 2023-02-17 12:20:25 +03:00
97ba0da3c2 java: referenceData 2023-02-15 14:54:12 +03:00
f0d9c54038 java: config request JWT used in functions 2023-02-06 14:52:33 +03:00
fbe5b1de37 java: added tokenUseForRequest methods into DocumentManager 2023-02-06 14:24:02 +03:00
90449fff3a java: token and address required on download 2023-02-01 15:00:09 +05:00
486a09f3b2 java: token and address required on download 2023-02-01 14:28:28 +05:00
4ffa524de0 Merge pull request #336 from ONLYOFFICE/bugfix/java-dockerfile
java: fix dockerfile path
2023-01-30 13:16:21 +03:00
cd055317e0 java: fix dockerfile path 2023-01-30 09:46:27 +00:00
83bc0fed5e Merge remote-tracking branch 'remotes/origin/master' into develop 2023-01-27 18:54:25 +05:00
3bd6f51edc 1.5.0 2023-01-24 00:55:41 +05:00