|
|
5e6d45cfd0
|
nodejs, java, php, csharp, csharp-mvc, python, ruby: changed min-height page
|
2021-04-05 18:02:21 +03:00 |
|
|
|
7884f3c64c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/redesign
# Conflicts:
# web/documentserver-example/nodejs/views/index.ejs
# web/documentserver-example/python/templates/index.html
|
2021-03-25 21:31:22 +03:00 |
|
|
|
d4e984e6b3
|
nodejs, java, php, python, csharp, csharp-mvc, ruby: fix remove upload name
|
2021-03-25 21:24:04 +03:00 |
|
|
|
0645fba83d
|
python: redesign window upload
|
2021-03-25 10:58:56 +03:00 |
|
|
|
7dade2ff46
|
python: added tooltips
|
2021-03-24 21:17:27 +03:00 |
|
|
|
d2b5335de9
|
python: redesign
|
2021-03-24 21:09:35 +03:00 |
|
|
|
42b24e4307
|
python: added postfix -form isSubmitForm
|
2021-03-19 14:53:34 +03:00 |
|
|
|
714b514f66
|
Copyright 2021
|
2021-03-15 11:54:47 +03:00 |
|
|
|
988e336f43
|
forcesave is disabled by default (b541936473)
|
2021-03-05 11:20:12 +03:00 |
|
|
|
fe02c4914c
|
converting xml
|
2021-03-01 14:26:43 +03:00 |
|
|
|
7d5c90e9cf
|
python: set version pyjwt 1.7.1
|
2021-02-19 16:08:43 +03:00 |
|
|
|
dc074d4baf
|
python: submit filled form
|
2021-02-19 15:00:42 +03:00 |
|
|
|
8e6ae3b915
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reviewPermissions
# Conflicts:
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/java/src/main/java/entities/FileModel.java
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/ruby/app/models/file_model.rb
|
2021-02-18 15:13:34 +03:00 |
|
|
|
8fc9d6125c
|
Merge pull request #122 from ONLYOFFICE/feature/request-name
Feature/request name
|
2021-02-18 14:14:00 +03:00 |
|
|
|
ffcf787f94
|
python: renamed favicon
|
2021-02-17 20:16:32 +03:00 |
|
|
|
4ccd78053f
|
renamed parameter reviewGroup on reviewGroups
|
2021-02-17 10:11:36 +03:00 |
|
|
|
353119145c
|
python: download forcesaved file
|
2021-02-16 14:59:04 +03:00 |
|
|
|
ee79e02c54
|
python: added forcesave
|
2021-02-15 16:52:44 +03:00 |
|
|
|
0e191eed91
|
python: request user name
|
2021-02-08 22:26:24 +03:00 |
|
|
|
79d12ecd02
|
Merge pull request #121 from ONLYOFFICE/feature/document-type
Feature/document type
|
2021-02-08 10:27:36 +03:00 |
|
|
|
8af2607e62
|
python: reviewGroup instead reviewPermissions
|
2021-02-07 19:00:34 +03:00 |
|
|
|
bcfa08b43c
|
python: word, cell, slide instead text, spreadsheet, presentation
|
2021-02-05 18:36:58 +03:00 |
|
|
|
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 |
|
|
|
620a097faa
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/reviewPermissions
# Conflicts:
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/java/src/main/java/entities/FileModel.java
# web/documentserver-example/python/src/views/actions.py
|
2021-02-02 13:59:17 +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 |
|
|
|
255ec7afe9
|
python: reviewPermissions
|
2021-01-27 12:48:46 +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 |
|
