|
|
23389056e8
|
ruby: add version application.html.erb
|
2023-12-01 10:52:44 +03:00 |
|
|
|
248beed471
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/restore-history
# Conflicts:
# CHANGELOG.md
|
2023-11-28 10:05:46 +03:00 |
|
|
|
bf72a43605
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/submit-form
# Conflicts:
# web/documentserver-example/csharp-mvc/Helpers/Users.cs
# web/documentserver-example/csharp/Users.cs
# 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/src/helpers/ExampleUsers.php
# web/documentserver-example/python/src/utils/users.py
# web/documentserver-example/ruby/app/models/users.rb
|
2023-11-21 12:30:39 +03:00 |
|
|
|
3d63728344
|
Merge branch 'develop' into feature/restore-history
|
2023-11-21 14:21:58 +07:00 |
|
|
|
8ebbfa59be
|
Merge pull request #470 from ONLYOFFICE/feature/routing-fix
Feature/routing fix
|
2023-11-15 10:16:47 +03:00 |
|
|
|
9ea7e14c37
|
ruby: saving formsdata
|
2023-11-13 16:55:14 +03:00 |
|
|
|
febce17e86
|
Merge branch 'develop' into feature/restore-history
|
2023-11-13 16:16:10 +07:00 |
|
|
|
d2a6ebeb74
|
ruby: link in referenceData
|
2023-11-10 17:21:04 +03:00 |
|
|
|
9487a87b65
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/user-image
# Conflicts:
# CHANGELOG.md
|
2023-11-10 13:32:17 +03:00 |
|
|
|
d75a4c529d
|
ruby: renaming asset method to assets
|
2023-11-08 12:17:42 +07:00 |
|
|
|
f7386df050
|
ruby: convert after uploading only tagged formats
|
2023-11-07 13:01:27 +07:00 |
|
|
|
c86c6bf17e
|
Merge branch 'develop' into feature/user-image
|
2023-11-07 11:25:40 +07:00 |
|
|
|
0494d24e29
|
Merge branch 'develop' into feature/restore-history
|
2023-11-07 10:21:57 +07:00 |
|
|
|
a220cdd627
|
ruby: user avatar
|
2023-11-01 13:23:51 +07:00 |
|
|
|
e1d8418055
|
Merge branch 'develop' into feature/region-protect
|
2023-11-01 11:12:26 +07:00 |
|
|
|
6e6e5c472e
|
Merge branch 'develop' into feature/routing-fix
|
2023-11-01 11:04:37 +07:00 |
|
|
|
440b51c7ff
|
Merge branch 'develop' into feature/restore-history
|
2023-11-01 10:51:44 +07:00 |
|
|
|
1620e8277d
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/referenceData-open
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/python/src/views/actions.py
|
2023-10-31 14:25:00 +03:00 |
|
|
|
e444fd02e5
|
Merge branch 'develop' into feature/region-protect
|
2023-10-30 15:52:23 +07:00 |
|
|
|
3cf0c1a6a5
|
Merge remote-tracking branch 'remotes/origin/release/1.7.0' into develop
|
2023-10-27 18:44:25 +03:00 |
|
|
|
52c11fa3a1
|
using documentserver v7.5
|
2023-10-27 18:39:40 +03:00 |
|
|
|
043fb2c0cf
|
returned documentserver version 7.3.3.50 to compose
|
2023-10-27 16:49:54 +03:00 |
|
|
|
ace724bc21
|
ruby: setUsers for region protection
|
2023-10-27 18:03:13 +07:00 |
|
|
|
8b5a2aceb0
|
deleted comments that duplicate the context
|
2023-10-26 17:11:29 +03:00 |
|
|
|
73c60fba7d
|
ruby: onRequestOpen for referenceData source file
|
2023-10-26 16:45:32 +03:00 |
|
|
|
bbeaea6d2e
|
ruby: code refactoring
|
2023-10-26 13:34:14 +07:00 |
|
|
|
c6d3c8d684
|
Merge branch 'develop' into feature/routing-fix
|
2023-10-26 12:45:22 +07:00 |
|
|
|
5f2c5cea58
|
ruby: code refactoring
|
2023-10-26 11:15:26 +07:00 |
|
|
|
4ec7e46736
|
Merge pull request #473 from ONLYOFFICE/chore/ruby-readme
ruby: update readme
# Conflicts:
# web/documentserver-example/ruby/README.md
|
2023-10-25 13:11:37 +03:00 |
|
|
|
1353df7977
|
Merge pull request #473 from ONLYOFFICE/chore/ruby-readme
ruby: update readme
|
2023-10-25 13:09:35 +03:00 |
|
|
|
eaa06d1919
|
ruby: download last version
|
2023-10-24 15:19:43 +03:00 |
|
|
|
ac24eb73f7
|
small fixes
|
2023-10-24 14:56:00 +03:00 |
|
|
|
9c26b4e563
|
Update README.md
|
2023-10-24 14:02:38 +03:00 |
|
|
|
f897ffaede
|
Merge pull request #472 from ONLYOFFICE/chore/pin-bundler
ruby: pin bundler version
|
2023-10-24 13:04:40 +03:00 |
|
|
|
3658988225
|
ruby: update readme
|
2023-10-24 11:30:09 +04:00 |
|
|
|
b49341f64e
|
ruby: pin bundler version
|
2023-10-24 09:49:09 +04:00 |
|
|
|
8fd0cfcd47
|
ruby: use bundler configuration instead of flags
|
2023-10-24 09:38:00 +04:00 |
|
|
|
71215e342f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/restore-history
# Conflicts:
# CHANGELOG.md
|
2023-10-23 13:45:19 +03:00 |
|
|
|
4b822dafe9
|
Merge branch 'develop' into feature/restore-history
|
2023-10-20 18:54:16 +07:00 |
|
|
|
1b1f276354
|
Merge branch 'feature/upload-name' of https://github.com/ONLYOFFICE/document-server-integration into feature/upload-name
|
2023-10-20 18:27:27 +07:00 |
|
|
|
3e9a98f0d8
|
max name length =50 and this value in constant var
|
2023-10-20 18:22:38 +07:00 |
|
|
|
49d220d673
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/upload-name
# Conflicts:
# CHANGELOG.md
|
2023-10-20 12:11:45 +03:00 |
|
|
|
73acfe8721
|
Merge remote-tracking branch 'remotes/origin/release/1.7.0' into develop
# Conflicts:
# CHANGELOG.md
|
2023-10-19 12:52:24 +03:00 |
|
|
|
0a8df9cb5d
|
1.7.0
|
2023-10-19 12:40:03 +03:00 |
|
|
|
b19482b676
|
ruby: make the proxy service dependent on the document-server and example services
|
2023-10-19 09:52:35 +04:00 |
|
|
|
fe352ebad1
|
ruby: getting history via api
|
2023-10-19 12:15:35 +07:00 |
|
|
|
c0051304d9
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/select-word
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
# web/documentserver-example/csharp/DocEditor.aspx
# web/documentserver-example/csharp/DocEditor.aspx.cs
# web/documentserver-example/java-spring/src/main/resources/templates/editor.html
# web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
# web/documentserver-example/java/src/main/webapp/editor.jsp
# web/documentserver-example/php/src/views/DocEditorView.php
# web/documentserver-example/php/templates/docEditor.tpl
# web/documentserver-example/python/src/views/actions.py
# web/documentserver-example/python/templates/editor.html
# web/documentserver-example/ruby/app/views/home/editor.html.erb
|
2023-10-12 11:54:43 +03:00 |
|
|
|
2fe1619389
|
Merge branch 'develop' into feature/upload-name
|
2023-10-12 14:44:29 +07:00 |
|
|
|
80028ead64
|
Merge branch 'feature/upload-name' of https://github.com/ONLYOFFICE/document-server-integration into feature/upload-name
|
2023-10-12 14:40:00 +07:00 |
|
|
|
f57b430744
|
lint fix
|
2023-10-12 14:38:40 +07:00 |
|
