Commit Graph

73 Commits

Author SHA1 Message Date
d72834687e Merge branch 'develop' into feature/ruby-rubocop 2023-11-30 13:31:47 +03:00
94d22003b5 ruby: Naming/MethodName correct 2023-11-20 11:50:10 +03:00
f8d62ab8db ruby: Naming/AccessorMethodName correct 2023-11-20 00:37:46 +03:00
febce17e86 Merge branch 'develop' into feature/restore-history 2023-11-13 16:16:10 +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
440b51c7ff Merge branch 'develop' into feature/restore-history 2023-11-01 10:51:44 +07: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
5f2c5cea58 ruby: code refactoring 2023-10-26 11:15:26 +07:00
4b822dafe9 Merge branch 'develop' into feature/restore-history 2023-10-20 18:54:16 +07: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
035dda6093 ruby: selectDocument event fix 2023-10-04 11:31:35 +07: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
a7a9f997d5 ruby: add restore endpoint 2023-07-18 10:35:31 +04:00
952b495c4d ruby: support for configuration via environment variables 2023-07-04 13:52:37 +04:00
f79fb213f1 ruby: hide edit icon on view screen for anonymous 2023-03-14 16:16:01 +05:00
55734a1458 ruby: referenceData 2023-02-16 10:10:23 +03:00
3181c7449d Copyright 2023 2023-01-20 15:27:03 +05:00
e041baeef7 Merge branch 'feature/extension-on-rename' into develop 2022-08-02 14:18:22 +03:00
54bb5b0a24 format 2022-03-28 13:26:17 +03:00
56d5913808 ruby 2022-03-23 10:48:28 +03:00
416b1fde8c Merge pull request #270 from ONLYOFFICE/feature/hide-history-for-anonymous
Feature/hide history for anonymous
2022-03-22 11:54:12 +03:00
8f09dadfa0 ruby: java-spring: bugfix 2022-03-21 17:10:11 +03:00
23176ddf07 ruby: version history button was hidden 2022-03-21 09:27:26 +03:00
2c12393c78 ruby: removed rename action for anonymous 2022-03-18 14:52:59 +03:00
4ba708631e Merge pull request #266 from ONLYOFFICE/feature/renaming-files
Feature/renaming files
2022-03-18 10:31:19 +03:00
0e1a580a86 refactoring 2022-03-11 14:13:09 +03:00
8a04e5fbc4 ruby:meta command 2022-03-09 13:50:47 +03:00
935377a941 all: fix link in mentions 2022-03-02 17:42:12 +03:00
beb9885b03 docxf and oform since v7.0 2021-12-08 14:00:04 +03:00
2429668b57 ruby: add Copy File as... 2021-11-15 16:02:11 +03:00
9bab8edc3c using innerAlert in onRequestSendNotify 2021-11-15 11:48:17 +03:00
e165c695fb ruby: new comments 2021-08-26 14:00:52 +03:00
4e69a7dfa5 ruby: added the ability to Create New from templates for user "John Smith" 2021-06-16 16:54:38 +03:00
07d11f0bae fixed the no ability to add mentions for anonymous users 2021-05-28 15:10:06 +03:00
b3dd5bc15d ruby: add mentions 2021-05-21 10:15:19 +03:00
56a65a9f3e ruby: added comments 2021-04-20 17:33:48 +03:00
ef064992f2 ruby: fix onRequestEditRights 2021-04-11 19:47:22 +03:00
714b514f66 Copyright 2021 2021-03-15 11:54:47 +03:00
9759839cd0 Merge pull request #114 from ONLYOFFICE/feature/fix-history
Feature/fix history
2021-02-02 13:09:41 +03:00
bcd114d089 ruby: fix-history 2021-02-02 12:29:04 +03:00
361b8bd0f4 Merge remote-tracking branch 'remotes/origin/develop' into feature/mail-merge
# Conflicts:
#	web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
#	web/documentserver-example/csharp-mvc/WebEditor.ashx.cs
#	web/documentserver-example/csharp/DocEditor.aspx
#	web/documentserver-example/csharp/DocEditor.aspx.cs
#	web/documentserver-example/csharp/WebEditor.ashx.cs
#	web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
#	web/documentserver-example/java/src/main/java/controllers/IndexServlet.java
#	web/documentserver-example/java/src/main/webapp/editor.jsp
#	web/documentserver-example/nodejs/app.js
#	web/documentserver-example/nodejs/views/editor.ejs
#	web/documentserver-example/php/doceditor.php
#	web/documentserver-example/php/webeditor-ajax.php
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/python/templates/editor.html
#	web/documentserver-example/ruby/app/models/file_model.rb
#	web/documentserver-example/ruby/app/views/home/editor.html.erb
2021-02-01 16:57:59 +03:00
48694f0f31 ruby: mailmerge 2021-02-01 12:33:23 +03:00
dae246e8a2 Merge remote-tracking branch 'remotes/origin/develop' into feature/config-refactor
# Conflicts:
#	web/documentserver-example/java/src/main/java/controllers/EditorServlet.java
#	web/documentserver-example/python/src/views/actions.py
#	web/documentserver-example/ruby/config/application.rb
2021-01-29 12:49:30 +03:00