|
|
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 |
|
|
|
615e4b78bb
|
hide ™
|
2016-12-05 17:23:06 +03:00 |
|
|
|
8c5cff604a
|
Document Service Integration
|
2016-03-23 12:55:12 +03:00 |
|
