|
|
95ea50210f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/change-files-folder
# Conflicts:
# web/documentserver-example/csharp-mvc/web.appsettings.config
# web/documentserver-example/java/src/main/java/helpers/DocumentManager.java
|
2021-11-18 12:54:57 +03:00 |
|
|
|
80e1be2261
|
python: docxf
|
2021-11-17 15:38:14 +03:00 |
|
|
|
8688ef1db5
|
Merge pull request #224 from ONLYOFFICE/feature/oform
Feature/oform
|
2021-11-17 13:01:49 +03:00 |
|
|
|
fac436f5e6
|
python: opening uploaded form
|
2021-11-16 16:20:08 +03:00 |
|
|
|
b52196ec91
|
python: revert filling in docx
|
2021-11-16 16:13:39 +03:00 |
|
|
|
2314e74ade
|
python: hide submit button
|
2021-11-16 16:08:40 +03:00 |
|
|
|
59801951e6
|
python: oform
|
2021-11-16 16:07:30 +03:00 |
|
|
|
5ecb4226e8
|
python: add Save Copy as...
|
2021-11-15 14:24:03 +03:00 |
|
|
|
9ca242fe82
|
python: fix storage path and embedded mode
|
2021-11-02 16:59:20 +03:00 |
|
|
|
a9e2df73ca
|
add region(lang) param to convert
|
2021-10-15 13:50:15 +03:00 |
|
|
|
1b6d08e9bb
|
rename email.com to example.com
|
2021-10-01 12:41:12 +03:00 |
|
|
|
bb9411a82c
|
rename mails
|
2021-09-30 18:55:22 +03:00 |
|
|
|
7a6afed510
|
Merge pull request #185 from ONLYOFFICE/feature/new-comments
New comments
|
2021-08-29 15:39:13 +03:00 |
|
|
|
b979f667f2
|
python: new comments
|
2021-08-26 13:52:21 +03:00 |
|
|
|
f0a86d924f
|
saving without url
|
2021-08-24 13:08:08 +03:00 |
|
|
|
3df2773867
|
change image url to "" for Blank template
|
2021-07-29 13:48:55 +03:00 |
|
|
|
563e02a5ba
|
Merge pull request #175 from ONLYOFFICE/feature/converter-downloadUrl-fix
fix downloadUrl for convert
|
2021-07-13 15:05:56 +03:00 |
|
|
|
b2980b5749
|
fix downloadUrl for convert
|
2021-07-13 14:32:39 +03:00 |
|
|
|
b58f33dddf
|
file versions on index page fix
|
2021-07-09 16:32:12 +03:00 |
|
|
|
6f691b6b9f
|
Update Users (#171)
Small issues with English fixed
|
2021-06-21 10:41:48 +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 |
|
|
|
61cbba05f3
|
python: added the ability to Create New from templates for user "John Smith"
|
2021-06-16 16:53:33 +03:00 |
|
|
|
e259b303be
|
python: new sets of comment permissions to demonstate comment groups
|
2021-06-15 16:08:37 +02:00 |
|
|
|
ba5a4e64f5
|
python: commentGroups
|
2021-06-15 12:18:34 +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 |
|
|
|
aebcbe058e
|
python: 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 |
|
|
|
97fc45a15c
|
python: removed the ability to add mentions for anonymous users
|
2021-05-21 17:33:27 +03:00 |
|
|
|
25ccda7e89
|
python: add mentions
|
2021-05-21 10:15:20 +03:00 |
|
|
|
69c16e0441
|
python: add description for user rights
|
2021-04-27 00:56:45 +03:00 |
|
|
|
0dec9d930d
|
python: add favorite and permissions at user list
|
2021-04-26 12:51:36 +03:00 |
|
|
|
9ff5523631
|
python: add list users
|
2021-04-23 11:53:27 +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 |
|
|
|
fb38127ebc
|
python: add jwt for download files
|
2021-04-21 14:55:45 +03:00 |
|
|
|
6a1ecf8d0b
|
python: added comments for python example
|
2021-04-20 15:46:41 +03:00 |
|
|
|
aff257ac8d
|
Merge pull request #148 from ONLYOFFICE/feature/create-url
Feature/create url
|
2021-04-20 08:52:45 +03:00 |
|
|
|
4ec3b7fb58
|
python: forbidden to download, print and copy for uid-2
|
2021-04-19 18:28:55 +03:00 |
|
|
|
ea47d65231
|
python: add editorConfig.createUrl
|
2021-04-18 18:23:59 +03:00 |
|
|
|
6ea6e35d54
|
python: edit link only for editable format
|
2021-04-16 16:07:50 +03:00 |
|
|
|
a899483e5c
|
python: add password for convert
|
2021-04-14 15:40:23 +03:00 |
|
|
|
7d766da6f0
|
python: change api/convert method to post
|
2021-04-14 15:30:13 +03:00 |
|
|
|
b8af9b7d95
|
python: permissions.edit add condition view
|
2021-04-11 19:42:58 +03:00 |
|