|
|
c4c819c513
|
format
|
2022-02-11 10:54:03 +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 |
|
|
|
af86ec1ca3
|
update submodule
|
2022-02-11 10:19:44 +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 |
|
|
|
468488c384
|
note to index page
|
2022-02-09 10:55:02 +03:00 |
|
|
|
20012c7678
|
change note in readme
|
2022-02-09 10:17:36 +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 |
|
|
|
761e578faf
|
update submodule
|
2022-02-07 16:14:53 +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 |
|
|
|
5caaf0b1c6
|
Merge branch 'develop' into feature/jwtHistoryFiles
|
2022-01-10 19:00:27 +03:00 |
|
|
|
db976766cc
|
Ruby: fix[support old version] fileType instead parsing
|
2022-01-10 18:47:02 +03:00 |
|
|
|
f81ae23a64
|
Merge branch 'feature/jwtHistoryFiles' of github.com:ONLYOFFICE/document-server-integration into feature/jwtHistoryFiles
# Conflicts:
# web/documentserver-example/csharp-mvc/Models/FileModel.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/ruby/licenses/3rd-Party.license
|
2022-01-10 17:08:45 +03:00 |
|
|
|
4f3882f892
|
Merge pull request #248 from ONLYOFFICE/feature/ruby-add-mimemagic
Add licenses of mimemagic on ruby
|
2022-01-10 16:08:31 +03:00 |
|
|
|
727418277f
|
ruby: correct license
|
2022-01-10 16:08:14 +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 |
|
|
|
7a61fac6b7
|
Add licenses of mimemagic on ruby
|
2022-01-10 15:57:57 +03:00 |
|
|
|
0c677f3d65
|
Delete mimemagic on Ruby to do it on a new branch
|
2022-01-10 15:41:09 +03:00 |
|
|
|
6efa357c19
|
Delete mimemagic on Ruby in order to add in a new branch
|
2022-01-10 15:36:13 +03:00 |
|
|
|
cdc8647f21
|
LICENSE for mimemagic on Ruby
|
2022-01-10 13:01:11 +03:00 |
|
|
|
514303d053
|
jwt signature for prev.* files. Ruby (by redirection)
|
2022-01-10 12:53:40 +03:00 |
|
|
|
ef1c53d330
|
ruby: fix bug of displaying the editor
|
2022-01-10 12:30:28 +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 |
|
|
|
05c62bbdf3
|
LICENSE for mimemagic on Ruby
|
2021-12-22 19:01:25 +03:00 |
|
|
|
096102fa59
|
Merge branch 'develop' into feature/jwtHistoryFiles
|
2021-12-22 17:13:10 +03:00 |
|
|
|
8d194b78a1
|
Update samples
|
2021-12-20 11:29:02 +03:00 |
|
|
|
b8e726a7be
|
Update pptx sample
|
2021-12-20 11:02:24 +03:00 |
|
|
|
ec6ea72069
|
small fixes for readme files
|
2021-12-16 17:51:01 +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 |
|
|
|
71041fea9f
|
Merge pull request #233 from ONLYOFFICE/feature/pptx-xpath
Feature/pptx xpath
|
2021-12-13 16:16:54 +03:00 |
|
|
|
8b25a7a869
|
ruby: v 3.0
|
2021-12-13 16:02:48 +03:00 |
|
|
|
dd20d79236
|
Merge pull request #230 from ONLYOFFICE/feature/ruby-3.0
ruby 3.0 version
|
2021-12-13 15:47:25 +03:00 |
|
|
|
299a68e0bd
|
Merge pull request #229 from ONLYOFFICE/bugfix/layout-fixes
fix layout
|
2021-12-13 15:42:15 +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 |
|
|
|
24cfd661ef
|
1.1.0
|
2021-12-13 11:34:05 +03:00 |
|
|
|
6481ac7e13
|
update presentation sample
|
2021-12-13 11:21:56 +03:00 |
|
|
|
bc1c9f455c
|
fileType in setHistoryData for ruby (+ Gemfile)
|
2021-12-08 17:25:43 +03:00 |
|
|
|
beb9885b03
|
docxf and oform since v7.0
|
2021-12-08 14:00:04 +03:00 |
|
|
|
b453aa19f0
|
replace group value null with empty string
|
2021-12-02 17:39:48 +03:00 |
|
|
|
20f28afec1
|
rename master form to form template
|
2021-12-02 11:32:07 +03:00 |
|
|
|
7841822c54
|
delete unused block
|
2021-12-02 10:37:05 +03:00 |
|
|
|
d3b962dcb8
|
fix layout
|
2021-11-26 15:45:53 +03:00 |
|
