Commit Graph

58 Commits

Author SHA1 Message Date
50a4ddbd11 1.6.0 2023-06-29 11:00:42 +05: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
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
5749ad8db2 java: changed format list 2023-03-03 16:55:59 +05:00
90449fff3a java: token and address required on download 2023-02-01 15:00:09 +05:00
3bd6f51edc 1.5.0 2023-01-24 00:55:41 +05:00
9a9d3c0b35 java: NewlineAtEndOfFile formatting 2022-12-20 19:12:53 +03:00
1012bf13a6 java: added fake language 2022-12-01 10:46:29 +03:00
4a656c025f 1.4.0 2022-10-14 10:12:48 +03:00
e737e8ed48 Merge remote-tracking branch 'remotes/origin/develop' into release/v7.2.0 2022-08-03 12:10:20 +03:00
641e45e24f 1.3.0 2022-08-02 15:35:18 +03:00
8fb698bb75 Basque (Spain), Armenian and Malay (Malaysia) lang 2022-07-29 11:38:25 +03:00
13e3d7673b Merge pull request #275 from ONLYOFFICE/feature/new-langs-7.2
added langs
2022-04-18 15:20:53 +03:00
7a70a44bcb 1.2.0 2022-04-18 13:59:07 +03:00
ce2e7f97d6 added langs 2022-04-11 15:28:55 +03:00
23e616aade languages sort fix 2022-04-11 10:38:26 +03:00
589ca9b601 Merge branch 'develop' into feature/ignore-self-signed-certificate 2022-03-28 16:00:59 +03:00
60469b0dba java: ignore certificate in config 2022-03-23 15:39:11 +03:00
4d25418fc8 java: move languages to config 2022-03-17 14:05:56 +03:00
6716d38a40 support xlsb 2022-02-06 11:15:20 +03:00
24cfd661ef 1.1.0 2021-12-13 11:34:05 +03:00
a3e84f50fa java: docxf 2021-11-17 15:28:19 +03:00
ace2677062 java: revert filling in docx 2021-11-16 13:56:06 +03:00
1a2c68abe8 java: oform 2021-11-16 13:24:37 +03:00
90a6514b6e http protocol
Revert "https://documentserver/"

This reverts commit ceb4db9de6.

# Conflicts:
#	web/documentserver-example/csharp-mvc/web.appsettings.config
#	web/documentserver-example/csharp/settings.config
#	web/documentserver-example/java/src/main/resources/settings.properties
#	web/documentserver-example/nodejs/config/default.json
#	web/documentserver-example/php/config.php
#	web/documentserver-example/ruby/config/application.rb
2021-10-21 12:19:48 +03:00
0b0919568c 1.0.0 2021-10-06 16:48:03 +03:00
e3304792c4 0.0.0 2021-10-04 14:05:11 +03:00
7027970b65 support oxps 2021-09-14 09:29:19 +03:00
fe02c4914c converting xml 2021-03-01 14:26:43 +03:00
1a6744a814 Merge branch 'develop' into feature/forcesave
# Conflicts:
#	web/documentserver-example/java/src/main/resources/settings.properties
2021-02-16 15:07:23 +03:00
0569dc7271 java: added forcesave 2021-02-15 13:37:40 +03:00
be82ae7078 java: ResourceService.ashx is not used anymore 2021-02-11 11:15:57 +03:00
dae246e8a2 Merge remote-tracking branch 'remotes/origin/develop' into feature/config-refactor
# Conflicts:
#	web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/ruby/config/application.rb
2021-01-29 12:49:30 +03:00
ea22efdac8 java: fix 773aa62478 2020-11-24 22:24:19 +03:00
773aa62478 java: add files.docservice.url.example 2020-11-23 17:22:02 +03:00
fd95aca32b java: config-refactor 2020-11-23 10:42:32 +03:00
85dd8f8b77 java: add fb2 to ConverExtList 2020-11-19 17:18:13 +03:00
b9dd792672 [all] Rename
Rename web-apps-pro -> web-apps
2019-10-24 12:27:30 +03:00
48043e5d70 [all] Rename
Rename web-apps -> web-apps-pro
2019-10-18 15:41:55 +03:00
a945870c6a java: jwt in headers 2019-02-20 14:55:35 +03:00
4dc137cf96 ppsx is not editable 2018-08-17 10:44:27 +03:00
3582109cf7 java: jwt in track 2018-08-06 15:02:46 +03:00
db9287263c OpenDocument template 2018-03-19 12:31:58 +03:00
ceb4db9de6 https://documentserver/ 2018-03-15 14:13:47 +03:00
207f896e25 Do not use https://doc.onlyoffice.com as example
It has JWT enabled and will not work without secret keys.
Users should setup their own http://documentserver
2017-10-20 14:26:57 +03:00
72db6178ac java: remove storage service 2017-10-09 17:35:12 +03:00
16d942a487 support OpenDocument Flat Document file type 2017-09-26 13:24:34 +03:00
af30096d71 Fix editable formats list 2017-09-07 15:54:14 +03:00