|
|
3a2f30bfcd
|
Merge branch 'release/v8.0.0' into develop
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/csharp-mvc/web.appsettings.config
# web/documentserver-example/csharp/settings.config
# web/documentserver-example/java-spring/src/main/resources/application.properties
# web/documentserver-example/java/src/main/resources/settings.properties
|
2024-01-19 12:27:44 +03:00 |
|
|
|
7423edd7d9
|
ar skin language
|
2024-01-18 17:06:52 +03:00 |
|
|
|
a2c8499622
|
update formats (add missed records)
|
2024-01-10 16:54:20 +03:00 |
|
|
|
1b0e8df99f
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/users-different-goback
# Conflicts:
# CHANGELOG.md
|
2024-01-09 11:01:08 +03:00 |
|
|
|
8ba1d5e8d7
|
update formats (add missed records)
|
2023-12-26 12:32:27 +03:00 |
|
|
|
91f3bda0b4
|
ruby: add goback users.rb
|
2023-12-22 15:15:26 +03:00 |
|
|
|
09f6ba00b2
|
ruby: add changes after pr #501
|
2023-12-18 10:09:54 +03:00 |
|
|
|
7b91694107
|
Merge branch 'develop' into feature/remove-history-close-restore
|
2023-12-15 18:16:04 +03:00 |
|
|
|
a36f270829
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/fix-editros-files
# Conflicts:
# web/documentserver-example/php/templates/docEditor.tpl
|
2023-12-15 17:54:25 +03:00 |
|
|
|
6717612fc1
|
ruby: add onRequestUsers and onRequestSendNotify in editor.html.erb
|
2023-12-14 12:09:32 +03:00 |
|
|
|
7f678c9ed8
|
ruby: remove history methods for anonymous users (fe352ebad1)
old commit:
fe352ebad1
|
2023-12-12 10:35:35 +03:00 |
|
|
|
3b9bad4a26
|
Merge branch 'develop' into feature/remove-history-close-restore
|
2023-12-07 11:34:27 +03:00 |
|
|
|
435b8013f6
|
style: updates to styling
|
2023-12-07 10:58:41 +03:00 |
|
|
|
a9063af6e1
|
fix sr-Latn-RS
|
2023-12-06 12:56:12 +03:00 |
|
|
|
bde236075c
|
ruby: remove historyClose and restore
|
2023-12-05 16:08:45 +03:00 |
|
|
|
685a62bb9c
|
Merge pull request #497 from ONLYOFFICE/feature/version-on-front
Feature/version on front
|
2023-12-05 13:37:43 +03:00 |
|
|
|
2603acae16
|
ruby: Layout/ExtraSpacing correct
|
2023-12-05 13:34:30 +03:00 |
|
|
|
11489ac8ba
|
ruby: fix sr-Latn-CS
|
2023-12-05 13:26:42 +03:00 |
|
|
|
e65f6f27be
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/version-on-front
# Conflicts:
# CHANGELOG.md
|
2023-12-05 13:21:41 +03:00 |
|
|
|
7d8a1a8b6d
|
sr-Latn-CS skin language
|
2023-12-01 18:07:41 +03:00 |
|
|
|
23389056e8
|
ruby: add version application.html.erb
|
2023-12-01 10:52:44 +03:00 |
|
|
|
9cf058078c
|
ruby: fix lint problems after merging develop
|
2023-11-30 14:05:57 +03:00 |
|
|
|
d72834687e
|
Merge branch 'develop' into feature/ruby-rubocop
|
2023-11-30 13:31:47 +03:00 |
|
|
|
af1dc6d9b5
|
ruby: add rubocop-rails
|
2023-11-30 09:28:05 +03:00 |
|
|
|
e5560b25d7
|
ruby: Rails/Present correct
|
2023-11-30 09:04:24 +03:00 |
|
|
|
d894663a4a
|
ruby: Rails/NegateInclude correct
|
2023-11-30 09:02:38 +03:00 |
|
|
|
b262a34540
|
ruby: Rails/ToFormattedS correct
|
2023-11-30 09:02:38 +03:00 |
|
|
|
3d0ae07de4
|
ruby: Rails/TimeZone correct
|
2023-11-30 09:02:38 +03:00 |
|
|
|
efb4616ca6
|
ruby: Rails/HttpStatus correct
|
2023-11-30 09:02:38 +03:00 |
|
|
|
037c5682f8
|
ruby: Rails/Blank correct
|
2023-11-30 09:02:38 +03:00 |
|
|
|
7c1939e8c9
|
ruby: updated rubocop configuration file
|
2023-11-30 09:02:38 +03:00 |
|
|
|
ce58acbca9
|
Merge pull request #493 from ONLYOFFICE/fix/open-history-without-changes
Fix/open history without changes
|
2023-11-29 10:21:28 +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 |
|
|
|
160c0bef3c
|
ruby: fix opening history without changes
|
2023-11-27 10:58:03 +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 |
|
|
|
0c2a271357
|
ruby: added rubocop configuration file
|
2023-11-20 13:11:01 +03:00 |
|
|
|
e94d81e228
|
ruby: Layout/FirstMethodParameterLineBreak correct
|
2023-11-20 13:04:00 +03:00 |
|
|
|
4c9c79ae8e
|
ruby: Layout/EmptyLinesAroundClassBody correct
|
2023-11-20 13:02:20 +03:00 |
|
|
|
d51dab82c5
|
ruby: Layout/EndAlignment correct
|
2023-11-20 13:01:55 +03:00 |
|
|
|
1e66124a8a
|
ruby: ElseAlignment correct
|
2023-11-20 13:01:15 +03:00 |
|
|
|
5fd2878c3d
|
ruby: Layout/FirstHashElementIndentation correct
|
2023-11-20 13:00:04 +03:00 |
|
|
|
63ec4db0b3
|
ruby: Lint/AmbiguousOperatorPrecedence correct
|
2023-11-20 12:58:23 +03:00 |
|
|
|
0d3ed49adf
|
ruby: Layout/MultilineOperationIndentation correct
|
2023-11-20 12:57:33 +03:00 |
|
|
|
7197a216f8
|
ruby: Layout/ParameterAlignment correct
|
2023-11-20 12:56:29 +03:00 |
|
|
|
716d4dc694
|
ruby: Layout/FirstHashElementIndentation correct
|
2023-11-20 12:55:58 +03:00 |
|
|
|
d744bc2e23
|
ruby: Layout/ClosingParenthesisIndentation correct
|
2023-11-20 12:55:19 +03:00 |
|
|
|
a69f7f343a
|
ruby: Layout/HashAlignment correct
|
2023-11-20 12:54:56 +03:00 |
|
|
|
10b40423ad
|
ruby: Layout/CommentIndentation correct
|
2023-11-20 12:54:30 +03:00 |
|
|
|
4ea23d1677
|
ruby: Style/Lambda correct
|
2023-11-20 12:54:00 +03:00 |
|
