|
|
b9f3bfd2e2
|
new branch + anonymus without id
|
2022-03-02 11:16:24 +03:00 |
|
|
|
ebc864736d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles
# Conflicts:
# web/documentserver-example/java/README.md
|
2022-02-11 10:22:04 +03:00 |
|
|
|
c663bfe464
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/userInfoGroups
# Conflicts:
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/ExampleData.java
# web/documentserver-example/java/src/main/java/helpers/Users.java
# web/documentserver-example/php/users.php
# web/documentserver-example/python/src/utils/users.py
# web/documentserver-example/ruby/app/models/users.rb
|
2022-02-11 10:14:06 +03:00 |
|
|
|
9d2b8c4830
|
php: userInfoGroups
|
2022-02-11 00:28:22 +03:00 |
|
|
|
a62ac23aeb
|
PHP: Merge jwt prev + diff (There is a bug with the history display)
|
2022-01-14 18:02:28 +03:00 |
|
|
|
5caaf0b1c6
|
Merge branch 'develop' into feature/jwtHistoryFiles
|
2022-01-10 19:00:27 +03:00 |
|
|
|
bb28257a2d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/fileType
# Conflicts:
# web/documentserver-example/php/doceditor.php
|
2022-01-10 16:03:18 +03:00 |
|
|
|
05ea165f77
|
format
|
2022-01-10 16:00:41 +03:00 |
|
|
|
096102fa59
|
Merge branch 'develop' into feature/jwtHistoryFiles
|
2021-12-22 17:13:10 +03:00 |
|
|
|
828115e5b0
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/change-files-folder
# Conflicts:
# web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/storage/LocalFileStorage.java
|
2021-12-13 15:38:37 +03:00 |
|
|
|
c0d240728d
|
edit (fileType in setHistoryData for php)
|
2021-12-10 17:49:09 +03:00 |
|
|
|
6559c76fbd
|
fileType in setHistoryData for php
|
2021-12-08 17:24:30 +03:00 |
|
|
|
beb9885b03
|
docxf and oform since v7.0
|
2021-12-08 14:00:04 +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 |
|
|
|
8688ef1db5
|
Merge pull request #224 from ONLYOFFICE/feature/oform
Feature/oform
|
2021-11-17 13:01:49 +03:00 |
|
|
|
e97fe56914
|
php: revert filling in docx
|
2021-11-17 12:06:34 +03:00 |
|
|
|
946819926f
|
php: hide submit button
|
2021-11-17 11:55:18 +03:00 |
|
|
|
e89b6040fb
|
php: oform
|
2021-11-17 11:53:52 +03:00 |
|
|
|
bee95b4e6a
|
php: add Copy File as...
|
2021-11-15 18:15:30 +03:00 |
|
|
|
9bab8edc3c
|
using innerAlert in onRequestSendNotify
|
2021-11-15 11:48:17 +03:00 |
|
|
|
b3c02a5afd
|
php: fix embedded
|
2021-11-02 16:13:00 +03:00 |
|
|
|
4aeef2b873
|
php: fix highlighting of changes in history
|
2021-10-19 12:40:21 +03:00 |
|
|
|
5206171a70
|
php: add ability to use custom path for files storage
|
2021-10-17 15:38:02 +03:00 |
|
|
|
7a6afed510
|
Merge pull request #185 from ONLYOFFICE/feature/new-comments
New comments
|
2021-08-29 15:39:13 +03:00 |
|
|
|
29f2d63b32
|
php: new comments
|
2021-08-26 13:45:11 +03:00 |
|
|
|
3df2773867
|
change image url to "" for Blank template
|
2021-07-29 13:48:55 +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 |
|
|
|
e1b800aa69
|
php: added the ability to Create New from templates for user "John Smith"
|
2021-06-16 16:56:16 +03:00 |
|
|
|
500f93deb8
|
php: commentGroups
|
2021-06-15 12:06:18 +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 |
|
|
|
15de3e414f
|
php: fixed bug for setting and removing password for blank document
|
2021-05-31 13:42:27 +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 |
|
|
|
487adb11a7
|
php: removed the ability to add mentions for anonymous users
|
2021-05-21 17:32:43 +03:00 |
|
|
|
4790aa074e
|
php: add mentions
|
2021-05-20 10:57:17 +03:00 |
|
|
|
da92bf531d
|
php: add favorite and permissions at user list
|
2021-04-26 12:40:18 +03:00 |
|
|
|
a852056e87
|
php: fix function createMeta()
|
2021-04-23 18:00:16 +03:00 |
|
|
|
ebdd865f73
|
php: add list users
|
2021-04-23 17:12:15 +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 |
|
|
|
fac010d4bd
|
php: revert symbol $
|
2021-04-21 16:33:59 +03:00 |
|
|
|
1a825b9f17
|
php: add jwt for download files
|
2021-04-21 11:31:45 +03:00 |
|
|
|
026237d286
|
php: added comments
|
2021-04-20 17:33:48 +03:00 |
|
|
|
03635575ab
|
php: forbidden to download, print and copy for uid-2
|
2021-04-19 18:24:34 +03:00 |
|
|
|
f2bc452196
|
php: add editorConfig.createUrl
|
2021-04-18 18:23:58 +03:00 |
|
|
|
56ec61ff43
|
php: permissions.edit add condition view
|
2021-04-11 19:42:21 +03:00 |
|
|
|
8ab2ba4edc
|
php: not used parameters
|
2021-04-06 13:45:04 +03:00 |
|
|
|
714b514f66
|
Copyright 2021
|
2021-03-15 11:54:47 +03:00 |
|
