|
|
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 |
|
|
|
220516c930
|
csharp: get link to bookmark
|
2020-05-18 16:31:16 +03:00 |
|
|
|
cb91ba1620
|
bump 2020
|
2020-03-03 14:39:29 +03:00 |
|
|
|
fddc08c24b
|
csharp: removed c#7 features
|
2020-03-03 11:40:00 +03:00 |
|
|
|
8770526316
|
csharp: blockcontent mode
|
2019-11-07 17:36:49 +03:00 |
|
|
|
1f022f12a1
|
csharp: version history
|
2019-09-09 15:28:32 +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 |
|
|
|
0f549db065
|
csharp: format
|
2019-09-02 14:53:06 +03:00 |
|
|
|
097a99b947
|
csharp: jwt support
|
2019-08-28 15:57:09 +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 |
|
|
|
ba1358c116
|
Copyright
|
2017-06-26 16:29:01 +03:00 |
|
|
|
680670294b
|
fileName is not the last parameter
|
2017-02-15 11:59:42 +03:00 |
|
|
|
4f21721901
|
change license to 2017
|
2017-01-18 10:46:50 +03:00 |
|
|
|
8c5cff604a
|
Document Service Integration
|
2016-03-23 12:55:12 +03:00 |
|
