Commit Graph

52 Commits

Author SHA1 Message Date
02b22e9e26 Merge remote-tracking branch 'remotes/origin/develop' into feature/mobile-upload 2022-03-01 16:01:30 +03:00
1d7775f25b C# - Add viewport device display on index page 2022-03-01 15:44:00 +03:00
f542e9dcfc csharp:upload for mobile 2022-02-28 18:27:42 +03:00
468488c384 note to index page 2022-02-09 10:55:02 +03:00
71041fea9f Merge pull request #233 from ONLYOFFICE/feature/pptx-xpath
Feature/pptx xpath
2021-12-13 16:16:54 +03:00
299a68e0bd Merge pull request #229 from ONLYOFFICE/bugfix/layout-fixes
fix layout
2021-12-13 15:42:15 +03:00
20f28afec1 rename master form to form template 2021-12-02 11:32:07 +03:00
7841822c54 delete unused block 2021-12-02 10:37:05 +03:00
d3b962dcb8 fix layout 2021-11-26 15:45:53 +03:00
ad9d627c82 csharp: docxf 2021-11-17 16:46:09 +03:00
d673fd86e0 csharp: opening uploaded form 2021-11-17 11:10:14 +03:00
901b2a83fa csharp: filling on mobile 2021-11-17 11:08:22 +03:00
08119d7458 csharp: revert filling in docx 2021-11-17 11:00:49 +03:00
f1a64c92d2 csharp: oform 2021-11-17 10:47:50 +03:00
a4122c1393 csharp and csharp-mvc: layout misprint 2021-10-11 17:22:08 +03:00
c3774d8cb6 replace hiding portal-info block from js to templates 2021-10-06 15:14:45 +03:00
b965ec08aa csharp: user tooltip layout 2021-09-29 10:56:56 +03:00
b58f33dddf file versions on index page fix 2021-07-09 16:32:12 +03:00
293fbb4802 csharp: adaptive layout 2021-06-29 15:22:44 +03:00
771cc25c18 csharp: changed icons from png to svg 2021-05-17 16:22:11 +03:00
0309203b72 csharp: add description for user rights 2021-04-27 00:24:22 +03:00
f908bba727 csharp: add list users 2021-04-23 17:39:41 +03:00
27093c5c7a csharp: add jwt for download files 2021-04-21 13:13:52 +03:00
b94225e3e1 csharp: edit link only for editable format 2021-04-16 16:03:54 +03:00
c89fa0e869 csharp: add password for convert 2021-04-14 14:46:30 +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
1dda4bbe5e csharp: redesign window upload 2021-03-22 23:11:50 +03:00
899df4f39f csharp: added tooltips 2021-03-22 21:17:33 +03:00
c416712ac3 csharp: redesign 2021-03-22 16:42:25 +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
3e8b6aaffa csharp: download forcesaved file 2021-02-16 13:28:14 +03:00
3b89aae808 csharp: request user name 2021-02-08 22:28:19 +03:00
79d12ecd02 Merge pull request #121 from ONLYOFFICE/feature/document-type
Feature/document type
2021-02-08 10:27:36 +03:00
212fd26807 csharp: word, cell, slide instead text, spreadsheet, presentation 2021-02-06 20:36:55 +03:00
90dd2c837f Merge remote-tracking branch 'remotes/origin/develop' into feature/template-submodule 2021-02-04 11:00:08 +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
a4b75554bd csharp: fix banner 2021-01-26 16:18:00 +03:00
491f600dc0 csharp: added templates submodule 2021-01-25 12:22:42 +03:00
6427db4ea6 csharp: get-files 2021-01-25 01:39:28 +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
1bde1f66d3 change name 2020-03-03 11:55:24 +03:00
8770526316 csharp: blockcontent mode 2019-11-07 17:36:49 +03:00
cd94eb0401 csharp: different edit/view options 2019-09-03 16:11:14 +03:00
31c23fbf49 csharp: user and lang selectors 2019-09-03 13:43:04 +03:00
95b4556884 csharp: create empty sample, new upload style 2019-09-03 11:54:37 +03:00
fb1715eebc Document Editors (#39)
* Document Editors

* Update OnlineEditorsExampleJS.html
2017-10-31 19:05:29 +03:00