Commit Graph

39 Commits

Author SHA1 Message Date
faac6d58e6 csharp-mvc: changed icons from png to svg 2021-05-17 16:24:33 +03:00
48ce83c494 csharp-mvc: add description for user rights 2021-04-27 00:34:23 +03:00
c679f7ddd3 csharp-mvc: add list users 2021-04-23 17:17:35 +03:00
a2116bf3f7 csharp-mvc: add jwt for download files 2021-04-21 12:42:22 +03:00
ac4ef8fca5 csharp-mvc: edit link only for editable format 2021-04-16 16:04:42 +03:00
1f7b085455 csharp-mvc: add password for convert 2021-04-14 15:07:55 +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
1baf3617b0 csharp-mvc: redesign window upload 2021-03-23 15:46:38 +03:00
367629d01f csharp-mvc: added tooltips 2021-03-23 14:39:38 +03:00
76b4693a54 csharp-mvc: redesign 2021-03-23 14:28:09 +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
246ddc9f9c csharp-mvc: download forcesaved file 2021-02-16 13:28:30 +03:00
823374e2fe csharp-mvc: request user name 2021-02-08 22:28:56 +03:00
c9ef51a361 csharp-mvc: word, cell, slide instead text, spreadsheet, presentation 2021-02-06 20:20:38 +03:00
f8f15d2191 Merge remote-tracking branch 'remotes/origin/develop' into feature/get-files
# Conflicts:
#	web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
#	web/documentserver-example/csharp/WebEditor.ashx.cs
#	web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
#	web/documentserver-example/php/webeditor-ajax.php
#	web/documentserver-example/python/src/urls.py
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/ruby/app/controllers/home_controller.rb
#	web/documentserver-example/ruby/config/routes.rb
2021-02-02 22:12:21 +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
854f5e7045 csharp-mvc: fix banner 2021-01-26 16:14:31 +03:00
3f13590f55 csharp-mvc: config-refactor 2021-01-21 14:48:25 +03:00
06cf08822b csharp-mvc: get-files 2021-01-20 17:50:46 +03:00
a76ec17e70 Add languages 2020-11-20 12:59:46 +03:00
ddb31bd4e8 fixed license comment 8050ec572a 2020-11-10 17:10:43 +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
bd4c3543d7 csharp-mvc: blockcontent mode 2019-11-07 17:40:52 +03:00
b93aeebe3c csharp-mvc: different edit/view options 2019-09-09 18:21:35 +03:00
fe38ca4a08 csharp-mvc: user and lang selectors 2019-09-09 17:31:10 +03:00
df74cdeb66 csharp-mvc: create empty sample, new upload style 2019-09-09 17:02:40 +03:00
c064b8fa57 csharp-mvc: document list 2019-08-28 17:14:17 +03:00
16473b4e06 2019 2019-01-22 18:17:07 +03:00
fa8e2cf975 [[copyright] Update Copyright
2018 -> 2019. Limited -> SIA
2019-01-17 17:32:01 +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
4f21721901 change license to 2017 2017-01-18 10:46:50 +03:00
615e4b78bb hide ™ 2016-12-05 17:23:06 +03:00
8c5cff604a Document Service Integration 2016-03-23 12:55:12 +03:00