|
|
aff257ac8d
|
Merge pull request #148 from ONLYOFFICE/feature/create-url
Feature/create url
|
2021-04-20 08:52:45 +03:00 |
|
|
|
c48039970a
|
Merge pull request #147 from ONLYOFFICE/feature/edit-buttons
Feature/edit buttons
|
2021-04-19 10:50:45 +03:00 |
|
|
|
d3c89ba6cf
|
java: add editorConfig.createUrl
|
2021-04-18 18:23:57 +03:00 |
|
|
|
9db75e7f4e
|
java: reload files list after closing upload dialog by Close button
|
2021-04-16 18:30:44 +03:00 |
|
|
|
dbf0d8bd67
|
java: edit link only for editable format
|
2021-04-16 16:01:24 +03:00 |
|
|
|
5dedcedb60
|
nodejs, java, php, csharp, csharp-mvc, python, ruby: bugfix window conversion
|
2021-04-16 10:38:26 +03:00 |
|
|
|
388e473e3f
|
java: add password for convert
|
2021-04-14 10:40:26 +03:00 |
|
|
|
e3c5f2008b
|
java: change api/convert method to post
|
2021-04-14 10:40:25 +03:00 |
|
|
|
c46028c026
|
java: permissions.edit add condition view
|
2021-04-11 19:41:08 +03:00 |
|
|
|
243b9daafc
|
java: fix null user
|
2021-04-09 12:33:23 +03:00 |
|
|
|
5e6d45cfd0
|
nodejs, java, php, csharp, csharp-mvc, python, ruby: changed min-height page
|
2021-04-05 18:02:21 +03:00 |
|
|
|
ba172dd5d4
|
java: fix view embedded
|
2021-03-25 22:11:13 +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 |
|
|
|
93df5adba2
|
nodejs, java: fix css
|
2021-03-25 16:47:18 +03:00 |
|
|
|
87089d3fd1
|
nodejs, java, php: fix quotes
|
2021-03-25 16:42:35 +03:00 |
|
|
|
e8c17005bb
|
java: redesign window upload
|
2021-03-21 21:31:15 +03:00 |
|
|
|
0646e25240
|
java: added tooltips
|
2021-03-19 16:05:33 +03:00 |
|
|
|
4e2fe9e607
|
java: added postfix -form isSubmitForm
|
2021-03-19 14:13:43 +03:00 |
|
|
|
8aa32308c0
|
java: redesign
|
2021-03-18 11:55:42 +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 |
|
|
|
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 |
|
