Commit Graph

187 Commits

Author SHA1 Message Date
05cd67a2f1 Merge pull request #158 from ONLYOFFICE/hellonadya-patch-1-1
Update README.md
2021-06-21 11:25:13 +03:00
6f691b6b9f Update Users (#171)
Small issues with English fixed
2021-06-21 10:41:48 +03:00
85e3f83d84 Merge remote-tracking branch 'remotes/origin/release/v6.4.0' into develop 2021-06-18 11:07:30 +03:00
b00a4dba31 update document templates 2021-06-18 11:07:11 +03:00
5d0f190dc8 change full permission value for commentGroups 2021-06-17 12:05:45 +03:00
2782f8f9bd Merge remote-tracking branch 'remotes/origin/develop' into feature/comment-group
# Conflicts:
#	web/documentserver-example/csharp-mvc/Helpers/Users.cs
#	web/documentserver-example/csharp/Users.cs
#	web/documentserver-example/java/src/main/java/entities/FileModel.java
#	web/documentserver-example/java/src/main/java/entities/User.java
#	web/documentserver-example/java/src/main/java/helpers/Users.java
#	web/documentserver-example/nodejs/helpers/users.js
#	web/documentserver-example/php/users.php
#	web/documentserver-example/python/src/utils/users.py
#	web/documentserver-example/ruby/app/models/users.rb
2021-06-17 10:11:07 +03:00
75e14c9452 added a description for users about creating a file from the editor 2021-06-16 16:56:25 +03:00
4e69a7dfa5 ruby: added the ability to Create New from templates for user "John Smith" 2021-06-16 16:54:38 +03:00
66d977abaf ruby: new sets of comment permissions to demonstate comment groups 2021-06-15 16:14:28 +02:00
b732f6e8cc ruby: commentGroups 2021-06-15 11:49:56 +02:00
badc6644c2 Merge pull request #164 from ONLYOFFICE/feature/document-password
Fixed password bug for blank document
2021-05-31 13:51:53 +03:00
3bf8d72454 ruby: fixed bug for setting and removing password for blank document 2021-05-31 13:44:05 +03:00
b36668468e added description by mentions for anonymous user 2021-05-31 10:22:56 +03:00
5c3c0b4361 Merge remote-tracking branch 'remotes/origin/develop' into feature/mentions 2021-05-31 10:02:04 +03:00
07d11f0bae fixed the no ability to add mentions for anonymous users 2021-05-28 15:10:06 +03:00
6c022134d0 ruby: removed the ability to add mentions for anonymous users 2021-05-21 17:36:47 +03:00
b3dd5bc15d ruby: add mentions 2021-05-21 10:15:19 +03:00
06e93c5b0f Update README.md 2021-05-17 17:51:06 +03:00
0278fd05e2 Update README.md 2021-05-17 17:31:43 +03:00
6b54e18aad ruby: changed icons from png to svg 2021-05-17 16:31:41 +03:00
2809fc5408 csharp-mvc: added readme 2021-05-04 18:09:02 +03:00
138673fc80 ruby: added readme 2021-05-04 14:32:01 +03:00
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
aff257ac8d Merge pull request #148 from ONLYOFFICE/feature/create-url
Feature/create url
2021-04-20 08:52:45 +03:00
47478fc3c5 ruby: forbidden to download, print and copy for uid-2 2021-04-19 18:31:59 +03:00
c48039970a Merge pull request #147 from ONLYOFFICE/feature/edit-buttons
Feature/edit buttons
2021-04-19 10:50:45 +03:00
487c54e471 ruby: add editorConfig.createUrl 2021-04-18 18:23:59 +03:00
55f7adcdc7 ruby: reload files list after closing upload dialog by Close button 2021-04-16 18:34:12 +03:00
72ec12d297 ruby: edit link only for editable format 2021-04-16 16:08:18 +03:00
5dedcedb60 nodejs, java, php, csharp, csharp-mvc, python, ruby: bugfix window conversion 2021-04-16 10:38:26 +03:00
a85ea5c551 ruby: add password for convert 2021-04-14 18:13:09 +03:00
492b8b6c81 ruby: change api/convert method to post 2021-04-14 17:51:40 +03:00
ef064992f2 ruby: fix onRequestEditRights 2021-04-11 19:47:22 +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
5e6d45cfd0 nodejs, java, php, csharp, csharp-mvc, python, ruby: changed min-height page 2021-04-05 18:02:21 +03:00
193b0aeb80 ruby: update dependencies 2021-03-30 12:15:33 +03:00
abe807f288 Merge pull request #135 from ONLYOFFICE/feature/fix-filename
Feature/fix filename
2021-03-30 12:06:34 +03:00
db8d816660 Merge pull request #134 from ONLYOFFICE/feature/redesign
Feature/redesign
2021-03-30 12:05:20 +03:00
4f44082456 Merge pull request #129 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.11.1
build(deps): bump nokogiri from 1.10.10 to 1.11.1 in /web/documentserver-example/ruby
2021-03-30 10:54:14 +03:00
bfa0984daf ruby: extname to downcase 2021-03-29 17:31:39 +03:00