Commit Graph

35 Commits

Author SHA1 Message Date
15580ee144 add logo.png csharp-mvc, csharp, java, nodejs, php, python, ruby 2021-01-28 14:48:44 +03:00
422bb36b53 delete logo.png csharp-mvc, csharp, java, nodejs, php, python, ruby 2021-01-28 14:46:00 +03:00
c28e12e31e add logo.png csharp-mvc, csharp, java, nodejs, php, python, ruby 2021-01-28 10:32:04 +03:00
b94704adf8 Merge remote-tracking branch 'remotes/origin/develop' into feature/insert-image
# Conflicts:
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/nodejs/views/editor.ejs
#	web/documentserver-example/php/doceditor.php
#	web/documentserver-example/python/templates/editor.html
#	web/documentserver-example/ruby/app/views/home/editor.html.erb
2021-01-27 17:13:14 +03:00
1fc1fb2b76 Merge pull request #106 from ONLYOFFICE/feature/add-format
Feature/add format
2021-01-27 11:51:38 +03:00
267fe7d260 Merge pull request #105 from ONLYOFFICE/feature/favorite
Feature/favorite
2021-01-27 11:49:21 +03:00
8cf4eb2fc2 Merge branch 'develop' into feature/new-banner 2021-01-26 16:06:46 +03:00
fec328ad9d python: setFavorite 2020-12-24 22:51:35 +03:00
502f001cfa Merge branch 'feature/csharp' into feature/add-format 2020-11-27 17:02:04 +03:00
9876e745e5 python: jwt for insert-image 2020-11-26 17:27:01 +03:00
31337cc9c9 python: insert-image 2020-11-26 15:33:16 +03:00
a76ec17e70 Add languages 2020-11-20 12:59:46 +03:00
39fbf43019 python: add fb2 to ConverExtList 2020-11-19 13:59:09 +03:00
974840bbac python: new banner 2020-11-18 18:26:53 +03:00
0cf0171721 fixed an issue when creating a second action link 2020-06-18 11:44:21 +03:00
b3a79deef8 python: get link to bookmark 2020-05-21 12:51:07 +03:00
67d6eaa18b python: env vars 2020-03-03 19:03:05 +03:00
0e91256847 python: 2020 2020-03-03 14:32:11 +03:00
ce16625091 python: converted filename was not sent to client 2020-03-03 13:27:15 +03:00
4d538fc35d python: footer copyright 2020-03-03 13:26:36 +03:00
e55e27cee8 python: reload on dialog close 2020-03-03 11:03:57 +03:00
8fa77cb9ba python: copyrights & cleanup 2020-03-03 11:00:23 +03:00
f038327928 python: sorting by date 2020-03-03 10:45:08 +03:00
0adaf8a84b python: lower file extension 2020-03-03 10:35:52 +03:00
85cb88b0fc python: fixed editors language 2020-03-03 10:26:49 +03:00
a1c524df00 python: changed docserv default link 2019-12-25 11:28:12 +03:00
1c59409ce2 python: blockcontent mode 2019-11-07 17:50:30 +03:00
5545568e04 python: readme 2019-11-05 17:57:33 +03:00
6ba9b33606 python: version history 2019-11-05 17:51:22 +03:00
8d657a0101 python: jwt support 2019-11-01 15:47:59 +03:00
c1454eff13 python: document list 2019-11-01 10:58:20 +03:00
f7867e4bc3 python: document editing 2019-10-28 12:58:31 +03:00
f94e057492 python: upload, convert, create sample 2019-10-25 17:05:20 +03:00
a5371faa27 python: django template 2019-10-25 16:54:23 +03:00
34527f0b3e python: static files 2019-10-25 16:46:45 +03:00