|
|
b204142c13
|
csharp: include assets
|
2022-10-11 18:04:21 +03:00 |
|
|
|
fd1c26ab9f
|
csharp-mvc: reload refs
|
2022-10-11 17:53:14 +03:00 |
|
|
|
5993d10bee
|
csharp-mvc: fix ref
|
2022-10-11 17:23:16 +03:00 |
|
|
|
c5771c9008
|
sharp-mvc: Fix merge 24aee6d194
|
2022-10-11 17:22:49 +03:00 |
|
|
|
ada438ff0b
|
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.2.0
|
2022-09-28 09:13:23 +03:00 |
|
|
|
0dbd65a577
|
ruby: rails 7.0.3.1
|
2022-09-27 19:03:26 +03:00 |
|
|
|
3549b4bc2a
|
csharp: Newtonsoft.Json update
|
2022-09-27 18:24:53 +03:00 |
|
|
|
c9265d9ddc
|
csharp-mvc: fix dep path
|
2022-09-27 18:08:47 +03:00 |
|
|
|
5a0debd9e8
|
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.2.0
|
2022-09-27 17:55:26 +03:00 |
|
|
|
3b0f942eee
|
Merge pull request #302 from ONLYOFFICE/feature/ruby-3.0.0
support ruby v.3
|
2022-09-27 17:54:59 +03:00 |
|
|
|
4ee110c2d5
|
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.2.0
# Conflicts:
# web/documentserver-example/nodejs/views/config.ejs
# web/documentserver-example/ruby/app/models/document_helper.rb
|
2022-09-15 17:17:24 +03:00 |
|
|
|
d2d98df5ab
|
support ruby v.3
|
2022-09-01 16:56:38 +03:00 |
|
|
|
7805f7dc91
|
added request status check for file
|
2022-09-01 09:34:30 +03:00 |
|
|
|
51ec27d67c
|
nodejs: removed trailing comma
|
2022-08-25 15:47:10 +03:00 |
|
|
|
9e94716df0
|
nodejs: reorder config items
|
2022-08-16 10:15:39 +03:00 |
|
|
|
988a8339b1
|
ruby: ERB::Util.url instead URI::encode
|
2022-08-15 11:10:02 +03:00 |
|
|
|
d2c679f6b1
|
nodejs: option to send directUrl
|
2022-08-03 12:20:39 +03:00 |
|
|
|
24aee6d194
|
Merge branch 'release/v7.2.0' into feature/directUrl
# Conflicts:
# web/documentserver-example/csharp-mvc/Helpers/DocManagerHelper.cs
# web/documentserver-example/csharp/DocEditor.aspx.cs
|
2022-08-03 12:13:12 +03:00 |
|
|
|
e737e8ed48
|
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.2.0
|
2022-08-03 12:10:20 +03:00 |
|
|
|
0f8dec1e6e
|
nodejs: revert tooltip for language (e1753a154d)
|
2022-08-03 12:08:10 +03:00 |
|
|
|
193b31fe75
|
nodejs: id to info block
|
2022-08-03 11:59:58 +03:00 |
|
|
|
583403cf78
|
update empty files (Fix Bug 58202)
|
2022-08-02 16:50:01 +03:00 |
|
|
|
641e45e24f
|
1.3.0
|
2022-08-02 15:35:18 +03:00 |
|
|
|
87a1755729
|
Merge pull request #300 from ONLYOFFICE/feature/ruby-bundle-update
ruby: bundle update
|
2022-08-02 14:32:40 +03:00 |
|
|
|
752a2a2364
|
Merge pull request #298 from ONLYOFFICE/fix/notification-incorrect-file-size
Fix/notification incorrect file size
|
2022-08-02 14:32:40 +03:00 |
|
|
|
d1affa2911
|
Merge pull request #297 from ONLYOFFICE/feature/refactoring-jwt-manager
Feature/refactoring jwt manager
# Conflicts:
# CHANGELOG.md
|
2022-08-02 14:32:31 +03:00 |
|
|
|
0ef2a4f3fd
|
Merge pull request #292 from ONLYOFFICE/Build(deps)/bot-recommendations
changes - ruby - raise gem version
|
2022-08-02 14:25:18 +03:00 |
|
|
|
675d3f318a
|
Merge pull request #294 from ONLYOFFICE/dependabot/nuget/web/documentserver-example/csharp-mvc/Newtonsoft.Json-13.0.1
build(deps): bump Newtonsoft.Json from 12.0.3 to 13.0.1 in /web/documentserver-example/csharp-mvc
|
2022-08-02 14:25:18 +03:00 |
|
|
|
05512ffa23
|
Merge pull request #288 from ONLYOFFICE/feature/localhost-for-client
Localhost for client urls
|
2022-08-02 14:25:17 +03:00 |
|
|
|
2eeed5d26d
|
Fix #287 Fix #285 Fix #284 Fix #280
Build(deps)/bot recommendations
|
2022-08-02 14:24:11 +03:00 |
|
|
|
9e3dbd5eb5
|
Merge pull request #290 from ONLYOFFICE/fix/php-convert-manager
fix - php - add substrings to string
|
2022-08-02 14:21:09 +03:00 |
|
|
|
efbab7c113
|
nodejs: fix embed link for client request
|
2022-08-02 14:20:48 +03:00 |
|
|
|
b8f0f6447c
|
nodejs: remove getlocalFileUri
|
2022-08-02 14:20:48 +03:00 |
|
|
|
8779a90433
|
nodejs: fix history url for server request
|
2022-08-02 14:20:48 +03:00 |
|
|
|
b3162ee410
|
Merge pull request #278 from ONLYOFFICE/dependabot/maven/web/documentserver-example/java-spring/com.fasterxml.jackson.core-jackson-databind-2.12.6.1
build(deps): bump jackson-databind from 2.12.2 to 2.12.6.1 in /web/documentserver-example/java-spring
|
2022-08-02 14:18:23 +03:00 |
|
|
|
42edd5e208
|
Merge pull request #276 from ONLYOFFICE/dependabot/bundler/web/documentserver-example/ruby/nokogiri-1.13.4
build(deps): bump nokogiri from 1.12.5 to 1.13.4 in /web/documentserver-example/ruby
|
2022-08-02 14:18:23 +03:00 |
|
|
|
e041baeef7
|
Merge branch 'feature/extension-on-rename' into develop
|
2022-08-02 14:18:22 +03:00 |
|
|
|
5bf682a007
|
nodejs: package lock
|
2022-08-02 14:18:22 +03:00 |
|
|
|
6dacf49faa
|
ruby: fix (23e616aade)
|
2022-08-02 14:18:22 +03:00 |
|
|
|
63c9c4242e
|
Merge pull request #291 from ONLYOFFICE/feature/chat
Feature/chat
# Conflicts:
# CHANGELOG.md
|
2022-08-02 14:18:21 +03:00 |
|
|
|
b5e345ed50
|
Merge branch 'feature/chat' into develop
|
2022-08-02 14:18:21 +03:00 |
|
|
|
58c27f8f2f
|
ruby: bundle update
|
2022-08-01 12:56:57 +03:00 |
|
|
|
0510fd1354
|
[fix] - node.js - don't send file size limit to incoming form
Revert "nodejs: upload big file"
This reverts commit fa4c3e3258.
|
2022-07-29 17:31:22 +03:00 |
|
|
|
901bb61883
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/liveview
# Conflicts:
# CHANGELOG.md
|
2022-07-29 17:21:54 +03:00 |
|
|
|
b3512ea0ce
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/chat
# Conflicts:
# CHANGELOG.md
|
2022-07-29 17:16:54 +03:00 |
|
|
|
17674ef5bc
|
ruby: licenses
|
2022-07-29 17:12:12 +03:00 |
|
|
|
dc2ee2a997
|
php: jwt
|
2022-07-29 17:12:02 +03:00 |
|
|
|
c358fa814a
|
csharp-mvc: jwt
|
2022-07-29 17:11:05 +03:00 |
|
|
|
143a73e083
|
csharp: jwt
|
2022-07-29 17:10:37 +03:00 |
|
|
|
c266592434
|
Merge pull request #292 from ONLYOFFICE/Build(deps)/bot-recommendations
changes - ruby - raise gem version
|
2022-07-29 11:55:36 +03:00 |
|
