|
|
75c11f4ee8
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/fix-filename
# Conflicts:
# web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
# web/documentserver-example/python/src/views/actions.py
|
2021-02-05 12:56:04 +03:00 |
|
|
|
1e023e58b2
|
Merge pull request #119 from ONLYOFFICE/feature/template-submodule
Feature/template submodule
|
2021-02-04 18:39:50 +03:00 |
|
|
|
5fdbd2954b
|
uploaded instead created
|
2021-02-04 16:06:40 +03:00 |
|
|
|
758291fd71
|
owner instead author
|
2021-02-04 15:43:09 +03:00 |
|
|
|
2a856c6919
|
python: changed path to sample
|
2021-02-04 15:25:28 +03:00 |
|
|
|
506b55a201
|
update submodule (csharp-mvc, csharp, php, java, nodejs, python)
|
2021-02-04 14:26:15 +03:00 |
|
|
|
90dd2c837f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/template-submodule
|
2021-02-04 11:00:08 +03:00 |
|
|
|
75d828a6ae
|
Merge pull request #118 from ONLYOFFICE/feature/update-dependencies
python: update (django, requests, pyjwt)
|
2021-02-04 10:45:50 +03:00 |
|
|
|
fe3b5558df
|
python: update (django, requests, pyjwt)
|
2021-02-04 10:41:41 +03:00 |
|
|
|
7db6983167
|
python: improved GetFilesInfo
|
2021-02-03 12:47:13 +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 |
|
|
|
9759839cd0
|
Merge pull request #114 from ONLYOFFICE/feature/fix-history
Feature/fix history
|
2021-02-02 13:09:41 +03:00 |
|
|
|
4dd5f9d9f6
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/add-jwt
# Conflicts:
# web/documentserver-example/python/src/utils/historyManager.py
|
2021-02-02 11:02:53 +03:00 |
|
|
|
00a1c64353
|
python: fix merge
|
2021-02-01 22:58:42 +03:00 |
|
|
|
361b8bd0f4
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/csharp/WebEditor.ashx.cs
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/php/webeditor-ajax.php
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/models/file_model.rb
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-02-01 16:57:59 +03:00 |
|
|
|
71fde6f7b9
|
python: fix getServerUrl
|
2021-01-29 13:58:29 +03:00 |
|
|
|
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 |
|
|
|
6e81fa8996
|
Merge branch 'develop' into feature/insert-image
# Conflicts:
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/nodejs/app.js
# web/documentserver-example/nodejs/views/editor.ejs
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/models/file_model.rb
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2021-01-28 15:12:36 +03:00 |
|
|
|
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 |
|
|
|
54c6025bc5
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/compare-file
# 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-28 13:38: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 |
|
|
|
60ddcb433c
|
Merge branch 'develop' into feature/fix-history
|
2021-01-20 21:58:27 +03:00 |
|
|
|
c4e2921040
|
Merge branch 'develop' into feature/get-files
|
2021-01-20 14:52:30 +03:00 |
|
|
|
d19ee9d4c1
|
python: added templates submodule
|
2021-01-16 21:19:36 +03:00 |
|
|
|
fec328ad9d
|
python: setFavorite
|
2020-12-24 22:51:35 +03:00 |
|
|
|
51c180726c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge
|
2020-11-29 13:29:01 +03:00 |
|
|
|
aee637b980
|
python: check filename from url
|
2020-11-27 22:56:24 +03:00 |
|
|
|
502f001cfa
|
Merge branch 'feature/csharp' into feature/add-format
|
2020-11-27 17:02:04 +03:00 |
|
|
|
b21d179f4b
|
python: jwt for compare-file
|
2020-11-26 18:32:06 +03:00 |
|
|
|
c75f9166c5
|
python: compare-file
|
2020-11-26 18:30:27 +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 |
|
|
|
6f6e80cf68
|
python: jwt for mailmerge
|
2020-11-26 00:14:12 +03:00 |
|
|
|
d5a8cdc760
|
python: jwt for historyData
|
2020-11-25 18:54:46 +03:00 |
|
|
|
5521cd44dd
|
python: add DOC_SERV_JWT_HEADER
|
2020-11-24 13:27:54 +03:00 |
|
|
|
ee5fe30010
|
python: fix 791f2b53a9
|
2020-11-23 15:19:38 +03:00 |
|
|
|
791f2b53a9
|
python: config-refactor
|
2020-11-20 18:16:26 +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 |
|
|
|
e8eb607325
|
python: fix-history
|
2020-11-19 12:17:04 +03:00 |
|
|
|
974840bbac
|
python: new banner
|
2020-11-18 18:26:53 +03:00 |
|
|
|
be5f6e3a6e
|
python: fix 4903c017f4
|
2020-11-18 18:14:59 +03:00 |
|
|
|
4903c017f4
|
python: mailmerge
|
2020-11-18 17:48:19 +03:00 |
|
|
|
6c3f31c32a
|
python: get-file
|
2020-11-18 14:57:17 +03:00 |
|
|
|
73d79c1f61
|
python: get-files
|
2020-11-18 14:55:23 +03:00 |
|
