Commit Graph

88 Commits

Author SHA1 Message Date
17f651c47a java: new banner 2020-11-06 11:29:47 +03:00
5e852e024d Merge branch 'hotfix/apache' into develop
# Conflicts:
#	3rd-Party.txt
#	licences/3rd-Party.txt
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/java/src/main/webapp/index.jsp
#	web/documentserver-example/js/LICENSE.txt
#	web/documentserver-example/js/OnlineEditorsExampleJS.html
#	web/documentserver-example/nodejs/licenses/formidable.license
#	web/documentserver-example/nodejs/licenses/jsonwebtoken.license
#	web/documentserver-example/nodejs/licenses/mime.license
#	web/documentserver-example/nodejs/licenses/urllib.license
#	web/documentserver-example/php/LICENSE.txt
#	web/documentserver-example/php/doceditor.php
#	web/documentserver-example/php/functions.php
#	web/documentserver-example/php/index.php
#	web/documentserver-example/php/webeditor-ajax.php
#	web/documentserver-example/ruby/LICENSE.txt
#	web/documentserver-example/ruby/app/assets/javascripts/jscript.js
#	web/documentserver-example/ruby/app/assets/stylesheets/editor.scss
#	web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
#	web/welcome/index.html
2020-09-04 09:59:10 +03:00
c9def721d2 3rd-party license 2020-09-03 13:08:44 +03:00
8050ec572a apache 2020-09-02 12:06:52 +03:00
0cf0171721 fixed an issue when creating a second action link 2020-06-18 11:44:21 +03:00
c4f278d58a java: get link to bookmark 2020-05-21 12:51:07 +03:00
cb91ba1620 bump 2020 2020-03-03 14:39:29 +03:00
1bde1f66d3 change name 2020-03-03 11:55:24 +03:00
710d4f4059 Fixed displaying mobile version cb5324381e 2019-12-13 13:20:39 +03:00
51ecf3afeb java: blockcontent mode 2019-11-07 17:23:29 +03:00
6ab006e409 changed favicon 2019-11-06 10:29:09 +03:00
582ed3f61b changed logo 2019-11-06 10:28:24 +03:00
b9dd792672 [all] Rename
Rename web-apps-pro -> web-apps
2019-10-24 12:27:30 +03:00
13c3164ca1 java: header null ref error 2019-10-23 13:22:14 +03:00
48043e5d70 [all] Rename
Rename web-apps -> web-apps-pro
2019-10-18 15:41:55 +03:00
9b6e90718a java: version history 2019-09-18 17:41:11 +03:00
14f8419f00 java: different edit/view options 2019-09-12 14:19:08 +03:00
0899644f32 java: user and lang selectors 2019-09-12 11:12:01 +03:00
036c0fb19a java: create empty sample, new upload style 2019-09-10 16:42:28 +03:00
71103b802e java: send jwt token in body 2019-02-21 14:27:59 +03:00
a945870c6a java: jwt in headers 2019-02-20 14:55:35 +03:00
cafaa27e92 java: json passed to docserver contained escaped parameters 2019-02-20 14:50:38 +03:00
430a16b543 Delete dockerfile, and move building to docker-compose 2019-02-13 16:17:41 +03:00
d2a89f4a5f Merge pull request #56 from flaminestone/feature/add_docker_compose_for_java
Add docker-compose file for easy building
2019-02-13 13:43:35 +03:00
efda987b55 Add docker-compose file for easy building 2019-02-13 13:34:20 +03:00
16473b4e06 2019 2019-01-22 18:17:07 +03:00
30d26df97d Merge remote-tracking branch 'remotes/origin/hotfix/v5.2.8' into develop 2019-01-22 09:28:29 +03:00
9fb0289af4 onAppReady (Fixed #54) 2019-01-22 09:23:29 +03:00
fa8e2cf975 [[copyright] Update Copyright
2018 -> 2019. Limited -> SIA
2019-01-17 17:32:01 +03:00
4dc137cf96 ppsx is not editable 2018-08-17 10:44:27 +03:00
f8003e75ec java: 3rd party license 2018-08-06 17:16:32 +03:00
cb2414140a java: jwt in conversion 2018-08-06 16:37:32 +03:00
d1f63976cb java: conversion params to body 2018-08-06 16:13:13 +03:00
4276caf87d java: fix process error 2018-08-06 16:12:10 +03:00
d5571a3f2e java: jwt in config 2018-08-06 15:03:58 +03:00
3582109cf7 java: jwt in track 2018-08-06 15:02:46 +03:00
10ecddbe61 java: building configuration on server 2018-08-03 15:25:19 +03:00
5a4dea7bfc java: deleted extra parameters 2018-08-03 12:18:42 +03:00
911da29ecb java: fix switch view mode to edit 2018-08-03 12:13:24 +03:00
37fe8eb4d5 java: fix string compare 2018-08-02 16:42:12 +03:00
633fd6efc9 java: format 2018-08-02 13:59:19 +03:00
b00ed15051 Java: formating 2018-05-24 16:03:43 +03:00
0cbc290fbe java: using GetServerUrl 2018-05-24 16:03:42 +03:00
0078c05a74 Add folder for bin files after build and add README.md file 2018-05-03 18:13:56 +03:00
aa8a143338 java: change version 2018-04-27 15:21:00 +03:00
a999b20588 java: fix path separator 2018-04-27 15:20:05 +03:00
232fc0d156 Java: fix encoding space 2018-04-05 11:12:24 +03:00
b1352bd897 remove unusing code 2018-03-29 11:52:01 +03:00
d8e1d4d6b7 Merge pull request #44 from ONLYOFFICE/feature/otf
Feature/otf
2018-03-28 16:36:50 +03:00
fc2db9b47f v5.1.0 2018-03-28 12:09:01 +03:00