Commit Graph

82 Commits

Author SHA1 Message Date
99a7c667b3 ruby: add description for user rights 2021-04-27 01:05:59 +03:00
c39aacbc6c ruby: add favorite and permissions at user list 2021-04-26 13:01:40 +03:00
2132798ee3 ruby: add list users 2021-04-23 17:11:52 +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
8d34ff2ed2 ruby: add jwt for download files 2021-04-21 15:54:21 +03:00
56a65a9f3e ruby: added comments 2021-04-20 17:33:48 +03:00
47478fc3c5 ruby: forbidden to download, print and copy for uid-2 2021-04-19 18:31:59 +03:00
487c54e471 ruby: add editorConfig.createUrl 2021-04-18 18:23:59 +03:00
a85ea5c551 ruby: add password for convert 2021-04-14 18:13:09 +03:00
e71acd9947 ruby: permissions.edit add condition view 2021-04-11 19:46:33 +03:00
22d71b8923 ruby: fix null user 2021-04-09 13:16:09 +03:00
3bd85fd747 ruby: fix filling file createdInfo.json 2021-04-09 13:15:28 +03:00
bfa0984daf ruby: extname to downcase 2021-03-29 17:31:39 +03:00
e7445dbc46 ruby: added postfix -form isSubmitForm 2021-03-19 15:02:05 +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
a2e59cf705 ruby: submit filled form 2021-02-19 15:01:32 +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
4ccd78053f renamed parameter reviewGroup on reviewGroups 2021-02-17 10:11:36 +03:00
f7f0a07239 ruby: added forcesave 2021-02-15 17:24:56 +03:00
6d27c1866b ruby: request user name 2021-02-08 22:25:08 +03:00
79d12ecd02 Merge pull request #121 from ONLYOFFICE/feature/document-type
Feature/document type
2021-02-08 10:27:36 +03:00
7d373fa1a9 ruby: reviewGroup instead reviewPermissions 2021-02-07 19:11:09 +03:00
e4eb8366bd ruby: word, cell, slide instead text, spreadsheet, presentation 2021-02-05 18:46:21 +03:00
ec90b2ff98 ruby: check filename from url 2021-02-05 13:40:13 +03:00
1e023e58b2 Merge pull request #119 from ONLYOFFICE/feature/template-submodule
Feature/template submodule
2021-02-04 18:39:50 +03:00
f9f757bd0d ruby: added templates submodule 2021-02-04 17:42:56 +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
51f712b900 ruby: improved get_files_info 2021-02-03 13:01:44 +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
2b217de9b4 ruby: get-file 2021-02-02 22:01:48 +03:00
6f64d40e5d ruby: get-files 2021-02-02 21:44:50 +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
bcd114d089 ruby: fix-history 2021-02-02 12:29:04 +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
abee34981b ruby: jwt for historyData 2021-02-02 10:57:52 +03:00
6c18acdf97 ruby: fix merge 2021-02-01 22:57:13 +03:00
d780a61e52 ruby: jwt for mailmerge 2021-02-01 20:30:07 +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
48694f0f31 ruby: mailmerge 2021-02-01 12:33:23 +03:00
9ac78b77dc ruby: fix get_server_url 2021-01-29 13:45:38 +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
7bfa4229de ruby: add Rails.configuration.header 2021-01-29 12:35:10 +03:00