Commit Graph

8 Commits

Author SHA1 Message Date
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
5521cd44dd python: add DOC_SERV_JWT_HEADER 2020-11-24 13:27:54 +03:00
791f2b53a9 python: config-refactor 2020-11-20 18:16:26 +03:00
39fbf43019 python: add fb2 to ConverExtList 2020-11-19 13:59:09 +03:00
67d6eaa18b python: env vars 2020-03-03 19:03:05 +03:00
a1c524df00 python: changed docserv default link 2019-12-25 11:28:12 +03:00
c1454eff13 python: document list 2019-11-01 10:58:20 +03:00
f94e057492 python: upload, convert, create sample 2019-10-25 17:05:20 +03:00