Alexandr Fedorov 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

..

app_data

Update new file templates

2019-08-02 14:28:32 +03:00

css

add logo.png csharp-mvc, csharp, java, nodejs, php, python, ruby

2021-01-28 14:48:44 +03:00

js

apache

2020-09-02 12:06:52 +03:00

licenses

3rd-party license

2020-09-03 13:08:44 +03:00

3rd-Party.license

3rd-party license

2020-09-03 13:08:44 +03:00

ajax.php

apache

2020-09-02 12:06:52 +03:00

common.php

Merge branch 'hotfix/apache' into develop

2020-09-04 09:59:10 +03:00

config.php

Merge remote-tracking branch 'remotes/origin/develop' into feature/config-refactor

2021-01-29 12:49:30 +03:00

doceditor.php

Merge remote-tracking branch 'remotes/origin/develop' into feature/config-refactor

2021-01-29 12:49:30 +03:00

favicon.ico

changed favicon

2019-11-06 10:29:09 +03:00

functions.php

php: add DOC_SERV_JWT_HEADER

2020-11-25 10:20:29 +03:00

index.php

Merge remote-tracking branch 'remotes/origin/develop' into feature/config-refactor

2021-01-29 12:49:30 +03:00

jwtmanager.php

apache

2020-09-02 12:06:52 +03:00

LICENSE

apache

2020-09-02 12:06:52 +03:00

web.config

php: pure php config

2018-08-30 14:27:10 +03:00

webeditor-ajax.php

Merge remote-tracking branch 'remotes/origin/develop' into feature/config-refactor

2021-01-29 12:49:30 +03:00