|
|
c9f58e3ca6
|
java: submit filled form
|
2021-02-19 14:59:14 +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 |
|
|
|
cf82b0ffc9
|
java: added dynamic favicon
|
2021-02-17 20:17:15 +03:00 |
|
|
|
4ccd78053f
|
renamed parameter reviewGroup on reviewGroups
|
2021-02-17 10:11:36 +03:00 |
|
|
|
1a6744a814
|
Merge branch 'develop' into feature/forcesave
# Conflicts:
# web/documentserver-example/java/src/main/resources/settings.properties
|
2021-02-16 15:07:23 +03:00 |
|
|
|
c95439c0db
|
java: download forcesaved file
|
2021-02-16 13:27:53 +03:00 |
|
|
|
0569dc7271
|
java: added forcesave
|
2021-02-15 13:37:40 +03:00 |
|
|
|
be82ae7078
|
java: ResourceService.ashx is not used anymore
|
2021-02-11 11:15:57 +03:00 |
|
|
|
845b111a85
|
java: request user name
|
2021-02-08 22:21:25 +03:00 |
|
|
|
79d12ecd02
|
Merge pull request #121 from ONLYOFFICE/feature/document-type
Feature/document type
|
2021-02-08 10:27:36 +03:00 |
|
|
|
c2db28fbcf
|
java: reviewGroup instead reviewPermissions
|
2021-02-07 18:38:47 +03:00 |
|
|
|
193238fbdb
|
java: word, cell, slide instead text, spreadsheet, presentation
|
2021-02-05 17:55:05 +03:00 |
|
|
|
758f0c08e5
|
java: add check filename for download
|
2021-02-05 13:33:57 +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 |
|
|
|
2f7352c296
|
java: changed path to sample
|
2021-02-04 16:26:05 +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 |
|
|
|
b7262ff874
|
java: improved GetFilesInfo
|
2021-02-03 12:43:08 +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 |
|
|
|
50daec31b4
|
java: fix tabulation
|
2021-02-02 12:51:08 +03:00 |
|
|
|
49592f66bf
|
Merge pull request #113 from ONLYOFFICE/feature/fix-history-cors
Feature/fix history cors
|
2021-02-02 11:13:40 +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 |
|
|
|
469c2b6ced
|
java: added function download
|
2021-02-01 23:02:55 +03:00 |
|
|
|
e921c936b8
|
java: fix merge
|
2021-02-01 23:00:10 +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 |
|
|
|
9d9afce3ce
|
GetServerUrl
|
2021-01-29 15:54:27 +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 |
|
|
|
7f95d59394
|
java: fix jwtHeader
|
2021-01-29 12:38:23 +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 |
|
|
|
90abe267bf
|
Merge branch 'develop' into feature/fix-history-cors
|
2021-01-20 12:04:38 +03:00 |
|
|
|
c54b760526
|
Merge branch 'develop' into feature/reviewPermissions
|
2021-01-19 15:54:13 +03:00 |
|
|
|
500be4f8e4
|
java: added templates submodule
|
2021-01-16 20:02:54 +03:00 |
|
|
|
0b03093c53
|
java: setFavorite
|
2020-12-24 22:49:22 +03:00 |
|
|
|
51c180726c
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge
|
2020-11-29 13:29:01 +03:00 |
|
|
|
2819cbc5e3
|
java: check filename from url
|
2020-11-27 22:52:22 +03:00 |
|
|
|
502f001cfa
|
Merge branch 'feature/csharp' into feature/add-format
|
2020-11-27 17:02:04 +03:00 |
|
|
|
aa16df8de7
|
java: fix filename (38cc631e2e)
|
2020-11-27 15:25:47 +03:00 |
|
