Commit Graph

37 Commits

Author SHA1 Message Date
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
487467cbed python: changed format list 2023-03-03 17:09:15 +05:00
3319e6428a python: user address required on download 2023-02-01 15:00:08 +05:00
3bd6f51edc 1.5.0 2023-01-24 00:55:41 +05:00
820883a584 python: added fake language 2022-11-24 13:15:33 +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
f809c7e525 python: certificate ignore was added 2022-03-25 13:26:00 +03:00
492f9c7baa python: config 2022-03-16 14:58:16 +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
80e1be2261 python: docxf 2021-11-17 15:38:14 +03:00
b52196ec91 python: revert filling in docx 2021-11-16 16:13:39 +03:00
59801951e6 python: oform 2021-11-16 16:07:30 +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
6a1ecf8d0b python: added comments for python example 2021-04-20 15:46:41 +03:00
fe02c4914c converting xml 2021-03-01 14:26:43 +03:00
ee79e02c54 python: added forcesave 2021-02-15 16:52:44 +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
5521cd44dd python: add DOC_SERV_JWT_HEADER 2020-11-24 13:27:54 +03:00
791f2b53a9 python: config-refactor 2020-11-20 18:16:26 +03:00
39fbf43019 python: add fb2 to ConverExtList 2020-11-19 13:59:09 +03:00
67d6eaa18b python: env vars 2020-03-03 19:03:05 +03:00
a1c524df00 python: changed docserv default link 2019-12-25 11:28:12 +03:00
c1454eff13 python: document list 2019-11-01 10:58:20 +03:00
f94e057492 python: upload, convert, create sample 2019-10-25 17:05:20 +03:00