|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
e08e6f5f27
|
java: jwt for compare-file
|
2020-11-27 11:34:10 +03:00 |
|
|
|
38cc631e2e
|
java: compare-file
|
2020-11-27 11:31:13 +03:00 |
|
|
|
eb8cf75bc0
|
java: jwt for insert-image
|
2020-11-26 17:23:21 +03:00 |
|
|
|
17cad4a0dc
|
java: insert-image
|
2020-11-26 14:54:09 +03:00 |
|
|
|
2017c45c19
|
java: jwt for mailmerge
|
2020-11-26 01:07:23 +03:00 |
|
|
|
720c61c7b7
|
java: jwt for historyData
|
2020-11-25 18:40:30 +03:00 |
|
|
|
ea22efdac8
|
java: fix 773aa62478
|
2020-11-24 22:24:19 +03:00 |
|
|
|
773aa62478
|
java: add files.docservice.url.example
|
2020-11-23 17:22:02 +03:00 |
|
|
|
fd95aca32b
|
java: config-refactor
|
2020-11-23 10:42:32 +03:00 |
|
|
|
a76ec17e70
|
Add languages
|
2020-11-20 12:59:46 +03:00 |
|
|
|
9f806aa48a
|
java: fix banner
|
2020-11-19 17:48:51 +03:00 |
|
|
|
85dd8f8b77
|
java: add fb2 to ConverExtList
|
2020-11-19 17:18:13 +03:00 |
|
|
|
4ef5f7d290
|
nodejs, java: add Content-Type, fix 2e3fd4725a, 1d24a4a309
|
2020-11-16 16:02:12 +03:00 |
|
|
|
0512243be0
|
java: fix-history
|
2020-11-12 10:28:38 +03:00 |
|
|
|
ba3b3b4ce6
|
java: fix cors
|
2020-11-11 14:15:54 +03:00 |
|
|
|
ddb31bd4e8
|
fixed license comment 8050ec572a
|
2020-11-10 17:10:43 +03:00 |
|
|
|
57e813d0ce
|
fixed tabulation 1d24a4a309
|
2020-11-10 15:35:34 +03:00 |
|
|
|
1d24a4a309
|
The GetFilesInfo () method has been improved. If the method is called without a parameter, then the entire list of files is returned, if the idFile parameter is specified, then information about the file with id: idFile is returned.
|
2020-11-09 18:15:45 +03:00 |
|
|
|
fe7e7640b5
|
method getFilesInFolderInfo() moved from nodejs example to java example
|
2020-11-09 15:23:48 +03:00 |
|
|
|
67b93909ac
|
java: mailmerge
|
2020-11-09 11:10:34 +03:00 |
|
|
|
17f651c47a
|
java: new banner
|
2020-11-06 11:29:47 +03:00 |
|
|
|
5e852e024d
|
Merge branch 'hotfix/apache' into develop
# Conflicts:
# 3rd-Party.txt
# licences/3rd-Party.txt
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp-mvc/Views/Home/Index.aspx
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/java/src/main/webapp/index.jsp
# web/documentserver-example/js/LICENSE.txt
# web/documentserver-example/js/OnlineEditorsExampleJS.html
# web/documentserver-example/nodejs/licenses/formidable.license
# web/documentserver-example/nodejs/licenses/jsonwebtoken.license
# web/documentserver-example/nodejs/licenses/mime.license
# web/documentserver-example/nodejs/licenses/urllib.license
# web/documentserver-example/php/LICENSE.txt
# web/documentserver-example/php/doceditor.php
# web/documentserver-example/php/functions.php
# web/documentserver-example/php/index.php
# web/documentserver-example/php/webeditor-ajax.php
# web/documentserver-example/ruby/LICENSE.txt
# web/documentserver-example/ruby/app/assets/javascripts/jscript.js
# web/documentserver-example/ruby/app/assets/stylesheets/editor.scss
# web/documentserver-example/ruby/app/assets/stylesheets/stylesheet.scss
# web/welcome/index.html
|
2020-09-04 09:59:10 +03:00 |
|
|
|
c9def721d2
|
3rd-party license
|
2020-09-03 13:08:44 +03:00 |
|
