Commit Graph

521 Commits

Author SHA1 Message Date
4b822dafe9 Merge branch 'develop' into feature/restore-history 2023-10-20 18:54:16 +07: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
73ef86edc9 Merge remote-tracking branch 'remotes/origin/develop' into feature/select-cell
# Conflicts:
#	CHANGELOG.md
2023-10-12 09:52:46 +03:00
d36c70b6f5 Merge branch 'develop' into feature/select-word 2023-10-11 13:49:39 +07:00
78cc152c93 Merge branch 'develop' into feature/select-word 2023-10-11 13:42:34 +07:00
9c20e50eb3 ruby: removed routing changes 2023-10-11 13:15:56 +07:00
5f19bdcff0 Merge branch 'develop' into feature/select-cell 2023-10-10 10:47:06 +07:00
bc6fd8f796 ruby: added key in referenceData 2023-10-09 14:25:02 +07:00
8f031df9f1 ruby: assets route fix 2023-10-05 13:28:01 +07:00
035dda6093 ruby: selectDocument event fix 2023-10-04 11:31:35 +07:00
e49372123b update icons 2023-09-29 14:23:44 +03:00
c274923072 ruby: update nokogiri to 1.14.3 2023-09-28 14:39:58 +03:00
6eafce5462 ruby: update rails to 7.0.8 2023-09-28 10:55:26 +03:00
756a0d0722 ruby: onRequestSelectDocument / setRequestedDocument 2023-09-27 11:24:54 +07:00
4cad298394 ruby: onRequestSelectSpreadsheet/setRequestedSpreadsheet 2023-09-26 11:49:55 +07:00
01e9dcf1a8 fixed the sample archive names 2023-09-20 17:58:00 +03:00
33600df8a9 added paths to the config files 2023-09-11 18:57:19 +03:00
22dbacaa63 ruby: replace the previous implementation of formats 2023-08-31 11:44:52 +04:00
d192d1e0e8 ruby: add tests for the format module 2023-08-31 11:44:52 +04:00
5b115f7dbc ruby: add format module 2023-08-31 11:44:52 +04:00
41a22934a0 ruby: add document-formats submodule 2023-08-31 11:44:51 +04:00
c98e8d03d2 Merge pull request #431 from ONLYOFFICE/feature/ruby-internal-network
ruby: add support for internal network
2023-08-17 17:02:21 +03:00
7b6c9b5683 ruby: update paths to the new location of templates 2023-08-14 17:36:24 +04:00
d4bed077e0 ruby: move document-templates to the assets directory 2023-08-14 17:36:24 +04:00
10e67c787c ruby: add public and private document-server urls to the compose 2023-08-02 10:17:14 +04:00
565a27d981 ruby: add support for the internal network for the track endpoint 2023-08-02 10:17:14 +04:00
7304c1e67a ruby: add tests for proxy manager 2023-08-02 10:17:14 +04:00
f9ba90d3ac ruby: add proxy manager to resolve the document-server url 2023-08-02 10:17:14 +04:00
d2f40c5395 ruby: add tests for specifying public and private document-server urls 2023-08-02 10:17:14 +04:00
ca0b7adcee ruby: add support for specifying public and private document-server urls 2023-08-02 10:17:14 +04:00
1939b85c8c ruby: disable strict hosts policy 2023-07-27 11:26:40 +04:00
ee0ac33820 ruby: add recipes to work with docker 2023-07-27 11:26:40 +04:00
c93579d98f ruby: add docker files 2023-07-27 11:26:40 +04:00
61a9e122cd ruby: move the lint recipe to the bottom of file 2023-07-27 11:26:40 +04:00
e88a9f5bed ruby: delete recipes sorting in the help recipe 2023-07-27 11:26:40 +04:00
f1ce0fb415 ruby: rename server recipes 2023-07-27 11:26:40 +04:00
2d83f3f39c Merge pull request #419 from ONLYOFFICE/feature/ruby-restore-endpoint
ruby: add restore endpoint
2023-07-18 12:20:46 +03:00
001a99b502 Merge pull request #418 from ONLYOFFICE/fix/ruby-sorbet-commands
ruby: hide sorbet commands for unsupported platforms
2023-07-18 12:18:26 +03:00
a7a9f997d5 ruby: add restore endpoint 2023-07-18 10:35:31 +04:00
4c3dc96e30 Merge pull request #417 from ONLYOFFICE/fix/ruby-config-manager-typo
ruby: fix typo in config manager name
2023-07-18 09:19:46 +03:00
dce840c627 ruby: hide sorbet commands for unsupported platforms 2023-07-17 18:50:17 +04:00
4f832ac2f7 ruby: fix typo in config manager name 2023-07-17 18:42:59 +04:00
e7623e29d7 ruby: add test recipe 2023-07-17 18:26:09 +04:00
16dd8a55e5 ruby: add missed configuration manager tests 2023-07-17 18:26:09 +04:00
dca68bf0d1 ruby: add missed imports 2023-07-17 18:26:09 +04:00
f028f1ba2f ruby: add test-unit as a dependency to satisfy rake 2023-07-17 18:26:09 +04:00