Commit Graph

74 Commits

Author SHA1 Message Date
096102fa59 Merge branch 'develop' into feature/jwtHistoryFiles 2021-12-22 17:13:10 +03:00
32ea01784c Merge pull request #234 from ONLYOFFICE/bugfix/group-fix
replace group value null with empty string
2021-12-13 16:27:14 +03:00
df1a5f38c1 fileType in setHistoryData for python 2021-12-08 17:25:01 +03:00
b453aa19f0 replace group value null with empty string 2021-12-02 17:39:48 +03:00
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
59801951e6 python: oform 2021-11-16 16:07:30 +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
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
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
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
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
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
9f5c4b479b python: fix null user 2021-04-09 13:01:43 +03:00
42b24e4307 python: added postfix -form isSubmitForm 2021-03-19 14:53:34 +03:00
714b514f66 Copyright 2021 2021-03-15 11:54:47 +03:00
dc074d4baf python: submit filled form 2021-02-19 15:00:42 +03:00
8fc9d6125c Merge pull request #122 from ONLYOFFICE/feature/request-name
Feature/request name
2021-02-18 14:14:00 +03:00
353119145c python: download forcesaved file 2021-02-16 14:59:04 +03:00
ee79e02c54 python: added forcesave 2021-02-15 16:52:44 +03:00
0e191eed91 python: request user name 2021-02-08 22:26:24 +03:00
79d12ecd02 Merge pull request #121 from ONLYOFFICE/feature/document-type
Feature/document type
2021-02-08 10:27:36 +03:00
bcfa08b43c python: word, cell, slide instead text, spreadsheet, presentation 2021-02-05 18:36:58 +03:00
75c11f4ee8 Merge remote-tracking branch 'remotes/origin/develop' into feature/fix-filename
# Conflicts:
#	web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
#	web/documentserver-example/python/src/views/actions.py
2021-02-05 12:56:04 +03:00
90dd2c837f Merge remote-tracking branch 'remotes/origin/develop' into feature/template-submodule 2021-02-04 11:00:08 +03:00