|
|
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 |
|
|
|
4068e23556
|
ruby: userInfoGroups
|
2022-02-11 00:20:29 +03:00 |
|
|
|
382160f2fc
|
Merge remote-tracking branch 'remotes/origin/release/v7.1.0' into develop
# Conflicts:
# web/documentserver-example/csharp-mvc/assets
# web/documentserver-example/csharp/assets
# web/documentserver-example/java-spring/src/main/resources/assets
# web/documentserver-example/java/src/main/resources/assets
# web/documentserver-example/nodejs/public/assets
# web/documentserver-example/php/assets
# web/documentserver-example/python/assets
# web/documentserver-example/ruby/public/assets
|
2022-02-09 10:05:10 +03:00 |
|
|
|
6716d38a40
|
support xlsb
|
2022-02-06 11:15:20 +03:00 |
|
|
|
5bbc4c6232
|
Ruby: remove unnecessary action (version encoding)
|
2022-01-31 16:28:34 +03:00 |
|
|
|
29cbe66d09
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/jwtHistoryFiles
|
2022-01-18 18:16:53 +03:00 |
|
|
|
a900183056
|
Merge pull request #241 from ONLYOFFICE/feature/fileTypeInsteadParsing
Feature/file type instead parsing
|
2022-01-14 16:52:30 +03:00 |
|
|
|
507a7f3162
|
Ruby: Merge jwt prev + diff
|
2022-01-13 18:08:40 +03:00 |
|
|
|
2d85a4166e
|
Ruby: fix code
|
2022-01-11 15:07:19 +03:00 |
|
|
|
db976766cc
|
Ruby: fix[support old version] fileType instead parsing
|
2022-01-10 18:47:02 +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 |
|
|
|
606f7d2d44
|
[fix] fileType instead parsing url to save doc in Ruby (take fileType out of body)
|
2021-12-24 16:47:57 +03:00 |
|
|
|
c5a2b72b39
|
fileType instead parsing url to save doc in Ruby (take fileType out of body)
|
2021-12-23 18:29:31 +03:00 |
|
|
|
096102fa59
|
Merge branch 'develop' into feature/jwtHistoryFiles
|
2021-12-22 17:13:10 +03:00 |
|
|
|
dac09bd1e1
|
jwt signature for prev.* files. Ruby (by redirection)
|
2021-12-14 19:26:56 +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 |
|
|
|
bc1c9f455c
|
fileType in setHistoryData for ruby (+ Gemfile)
|
2021-12-08 17:25:43 +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 |
|
|
|
cd1a312aba
|
ruby: revert filling in docx
|
2021-11-16 15:13:32 +03:00 |
|
|
|
8cd0297917
|
ruby: hide submit button
|
2021-11-16 15:06:03 +03:00 |
|
|
|
4568dcfdce
|
ruby: oform
|
2021-11-16 15:05:06 +03:00 |
|
|
|
11e8f40f8c
|
ruby: fix embedded mode; fix media.css connect
|
2021-11-02 18:13:45 +03:00 |
|
|
|
a597c37684
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/document-server-integration into feature/change-files-folder
|
2021-10-17 15:38:48 +03:00 |
|
|
|
a9e2df73ca
|
add region(lang) param to convert
|
2021-10-15 13:50:15 +03:00 |
|
|
|
da7450c732
|
ruby: add ability to use custom path for files storage
|
2021-10-14 12:19:45 +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 |
|
|
|
ce18f76698
|
cors, fix regexp, fix manifest
|
2021-09-23 21:56:08 +03:00 |
|
|
|
42859d7a28
|
Merge remote-tracking branch 'remotes/origin/hotfix/v6.4.1' into develop
|
2021-09-14 09:29:48 +03:00 |
|
|
|
7027970b65
|
support oxps
|
2021-09-14 09:29:19 +03:00 |
|
|
|
7a6afed510
|
Merge pull request #185 from ONLYOFFICE/feature/new-comments
New comments
|
2021-08-29 15:39:13 +03:00 |
|
|
|
e165c695fb
|
ruby: new comments
|
2021-08-26 14:00:52 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
