Commit Graph

48 Commits

Author SHA1 Message Date
e51b331736 php: add password for convert 2021-04-14 12:37:06 +03:00
ab5163f237 php: xss with user name 2021-04-06 13:46:42 +03:00
7884f3c64c Merge remote-tracking branch 'remotes/origin/develop' into feature/redesign
# Conflicts:
#	web/documentserver-example/nodejs/views/index.ejs
#	web/documentserver-example/python/templates/index.html
2021-03-25 21:31:22 +03:00
4a617b516b php: redesign window upload 2021-03-24 14:00:33 +03:00
f4331cbd0a php: added tooltips 2021-03-24 10:40:38 +03:00
3665ead0b7 php: redesign 2021-03-23 22:25:49 +03:00
714b514f66 Copyright 2021 2021-03-15 11:54:47 +03:00
8fc9d6125c Merge pull request #122 from ONLYOFFICE/feature/request-name
Feature/request name
2021-02-18 14:14:00 +03:00
0aaaedc4d6 php: download forcesaved file 2021-02-16 14:14:08 +03:00
cc488187b4 php: request user name 2021-02-08 22:27:14 +03:00
f25e4ea614 php: word, cell, slide instead text, spreadsheet, presentation 2021-02-06 20:09:03 +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
8cf4eb2fc2 Merge branch 'develop' into feature/new-banner 2021-01-26 16:06:46 +03:00
c0b520e440 php: config-refactor 2020-11-23 11:00:57 +03:00
a76ec17e70 Add languages 2020-11-20 12:59:46 +03:00
47c0b04de1 php: new banner 2020-11-13 14:38:45 +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
8050ec572a apache 2020-09-02 12:06:52 +03:00
cb91ba1620 bump 2020 2020-03-03 14:39:29 +03:00
1bde1f66d3 change name 2020-03-03 11:55:24 +03:00
7ab292bc13 php: blockcontent mode 2019-11-07 16:41:16 +03:00
a60e7b9b6b php: comment, fillforms, filter modes 2019-09-25 15:17:33 +03:00
95a15661d0 php: lang selector 2019-09-19 17:30:44 +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
fa8e2cf975 [[copyright] Update Copyright
2018 -> 2019. Limited -> SIA
2019-01-17 17:32:01 +03:00
e3eb837f45 fix link in header 2018-08-30 15:54:27 +03:00
c96205b4da fix link in header 2018-08-30 14:30:17 +03:00
7b1c56ea2c php: replace download url 2018-04-24 17:32:31 +03:00
20412f0c80 Update copyright and footer info to 2018 year 2018-03-01 12:41:44 +03:00
fb1715eebc Document Editors (#39)
* Document Editors

* Update OnlineEditorsExampleJS.html
2017-10-31 19:05:29 +03:00
ba1358c116 Copyright 2017-06-26 16:29:01 +03:00
7c71d42975 Fix download link for custom EXAMPLE_URL (Issue #24) 2017-04-25 19:28:43 +03:00
dac9003e58 Fix Bug 33954 - open mobile editor by user agent 2017-02-15 16:47:30 +03:00
7e26d068a5 php: review mode 2017-01-31 18:01:19 +03:00
4f21721901 change license to 2017 2017-01-18 10:46:50 +03:00
4211056907 Fix Bug 33595 2016-12-05 17:41:43 +03:00
615e4b78bb hide ™ 2016-12-05 17:23:06 +03:00
73791ee71e php: user selector 2016-12-05 16:20:59 +03:00
cea433733f php: delete file 2016-12-05 15:22:05 +03:00
85e6de27d3 php: restyle create panel 2016-12-05 15:21:19 +03:00
a1adfd784f php: create empty file and with demo data 2016-12-05 14:21:54 +03:00
48ae10ca05 php: hide ™ 2016-12-05 13:59:49 +03:00
ab089e3052 php: change table recent files 2016-12-02 15:14:13 +03:00
4b1e588b07 php: logo as link 2016-12-02 14:12:58 +03:00
ed58fc3ebd php: list recent opened files 2016-12-02 11:07:10 +03:00
b310236c64 php: fix comment 2016-11-01 14:53:32 +03:00
8c5cff604a Document Service Integration 2016-03-23 12:55:12 +03:00