Commit Graph

199 Commits

Author SHA1 Message Date
2ea4dbf289 Update README.md 2021-05-17 17:43:26 +03:00
9cea54a949 Update README.md 2021-05-17 15:25:56 +03:00
4d3059ffa0 Update README.md 2021-05-17 15:20:59 +03:00
22179d6c4f Update README.md 2021-05-17 11:25:49 +03:00
7606f5f9bd php: added readme 2021-05-04 13:45:58 +03:00
3bb3f6e878 java: added readme 2021-05-04 11:21:17 +03:00
a2b10800fc java: add description for user rights 2021-04-27 00:05:27 +03:00
a655bf002a java: add favorite and permissions at user list 2021-04-26 11:59:38 +03:00
6d44c1d2de java: add list users 2021-04-23 10:40:48 +03:00
0b0cdd395c nodejs, java, php, csharp, csharp-mvc, python, ruby: forbidden download, print and copy for uid-3 2021-04-22 16:27:52 +03:00
ba9d927fc0 nodejs, java, php, csharp, csharp-mvc, python, ruby: remove edit button for not OOXML 2021-04-22 11:29:59 +03:00
495435c8ff Merge remote-tracking branch 'remotes/origin/develop' into feature/jwt-download-files
# Conflicts:
#	web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
#	web/documentserver-example/csharp-mvc/Models/FileModel.cs
#	web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
#	web/documentserver-example/csharp/DocEditor.aspx.cs
#	web/documentserver-example/csharp/WebEditor.ashx.cs
#	web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
#	web/documentserver-example/java/src/main/java/entities/FileModel.java
#	web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
#	web/documentserver-example/nodejs/helpers/docManager.js
#	web/documentserver-example/php/doceditor.php
#	web/documentserver-example/php/webeditor-ajax.php
#	web/documentserver-example/python/src/utils/docManager.py
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/ruby/app/controllers/home_controller.rb
#	web/documentserver-example/ruby/app/models/document_helper.rb
#	web/documentserver-example/ruby/app/models/file_model.rb
2021-04-21 17:53:53 +03:00
5928ed1756 Merge pull request #151 from ONLYOFFICE/feature/user-permissions
Feature/user permissions
2021-04-21 17:32:25 +03:00
82adaf6ad0 java: revert variable fileName 2021-04-21 16:10:16 +03:00
0ba090e5ba java: add jwt for download files 2021-04-21 11:31:26 +03:00
beaffd40de java: added comments 2021-04-20 17:33:39 +03:00
aff257ac8d Merge pull request #148 from ONLYOFFICE/feature/create-url
Feature/create url
2021-04-20 08:52:45 +03:00
5f14f206bb java: forbidden to download, print and copy for uid-2 2021-04-19 18:01:33 +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