|
|
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 |
|
|
|
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 |
|
|
|
1deeade91e
|
java: added the ability to Create New from templates for user "John Smith"
|
2021-06-16 16:50:37 +03:00 |
|
|
|
40eada3a17
|
java: new sets of comment permissions to demonstate comment groups
|
2021-06-15 16:26:03 +02:00 |
|
|
|
ee0c1571f6
|
java: commentGroups
|
2021-06-15 14:49:52 +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 |
|
|
|
f3718a0f44
|
java: fixed bug for setting and removing password for blank document
|
2021-05-31 13:42:27 +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 |
|
|
|
60992ecb38
|
variable users renamed to usersForMentions
|
2021-05-26 17:01:47 +03:00 |
|
|
|
667ff98142
|
java: removed the ability to add mentions for anonymous users
|
2021-05-21 17:29:29 +03:00 |
|
|
|
76dd0b6d7b
|
java: add mentions
|
2021-05-21 10:17:55 +03:00 |
|
|
|
c16359b1c0
|
Update README.md
|
2021-05-17 17:46:27 +03:00 |
|
|
|
73f7b31bfa
|
Update README.md
|
2021-05-17 17:45:03 +03:00 |
|
|
|
2ea4dbf289
|
Update README.md
|
2021-05-17 17:43:26 +03:00 |
|
|
|
8f95634af5
|
java: changed icons from png to svg
|
2021-05-17 16:26:09 +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 |
|
