|
|
cda8a86c2a
|
Merge remote-tracking branch 'remotes/origin/release/1.4.0' into develop
v99.99.99.3149
v99.99.99.3141
v99.99.99.3151
v99.99.99.3148
v99.99.99.3150
v99.99.99.3147
v99.99.99.3146
|
2022-10-26 13:40:30 +03:00 |
|
|
|
16584c0abb
|
Merge remote-tracking branch 'remotes/origin/hotfix/1.3.1' into release/1.4.0
# Conflicts:
# CHANGELOG.md
# web/documentserver-example/csharp/settings.config
# web/documentserver-example/ruby/config/application.rb
|
2022-10-26 13:39:29 +03:00 |
|
|
|
5b76d798fb
|
1.3.1
|
2022-10-26 13:28:18 +03:00 |
|
|
|
1bdb3c03bc
|
Merge remote-tracking branch 'remotes/origin/feature/referenceData' into develop
v99.99.99.3140
v99.99.99.3127
v99.99.99.3139
v99.99.99.3138
v99.99.99.3137
v99.99.99.3136
v99.99.99.3135
v99.99.99.3134
v99.99.99.3133
v99.99.99.3132
v99.99.99.3131
v99.99.99.3130
|
2022-10-14 10:22:24 +03:00 |
|
|
|
111dc14f2b
|
nodejs: referenceData
|
2022-10-14 10:20:45 +03:00 |
|
|
|
4a656c025f
|
1.4.0
v7.2.1.34
v7.2.1.30
v7.2.1.53
v7.2.1.52
v7.2.1.51
v7.2.1.50
v7.2.1.49
v7.2.1.48
v7.2.1.54
v7.2.1.27
v7.2.1.28
v7.2.1.29
v7.2.1.31
v7.2.1.47
v7.2.1.46
v7.2.1.45
v7.2.1.44
v7.2.1.43
v7.2.1.42
v7.2.1.41
v7.2.1.40
v7.2.1.32
v7.2.1.39
v7.2.1.38
v7.2.1.37
v7.2.1.36
v7.2.1.33
|
2022-10-14 10:12:48 +03:00 |
|
|
|
ce9930e5bc
|
java-spring: fixed footer positioning
|
2022-10-12 11:12:59 +03:00 |
|
|
|
9da22d7803
|
java-spring: fixed sorting of the list of languages
|
2022-10-12 11:00:01 +03:00 |
|
|
|
d78c677c99
|
java: fixed sorting of the list of languages
|
2022-10-12 10:59:41 +03:00 |
|
|
|
b204142c13
|
csharp: include assets
v7.2.1.26
v99.99.99.3124
v7.2.1.24
v7.2.1.25
|
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 |
|
|
|
2fad227272
|
Merge remote-tracking branch 'remotes/origin/release/v7.2.0' into develop
v99.99.99.3118
v99.99.99.3122
v99.99.99.3117
v99.99.99.3119
v99.99.99.3120
v99.99.99.3121
|
2022-10-05 13:33:43 +03:00 |
|
|
|
ada438ff0b
|
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.2.0
v7.2.1.21
v7.2.1.9
v7.2.1.17
v7.2.1.16
v7.2.1.15
v7.2.1.14
v7.2.1.12
v7.2.1.11
v7.2.1.10
v7.2.1.22
v7.2.1.23
v7.2.1.8
|
2022-09-28 09:13:23 +03:00 |
|
|
|
0dbd65a577
|
ruby: rails 7.0.3.1
v99.99.99.3111
v99.99.99.3110
v99.99.99.3116
v99.99.99.3115
v99.99.99.3114
v99.99.99.3113
v99.99.99.3112
|
2022-09-27 19:03:26 +03:00 |
|
|
|
48e5b8d4e0
|
Merge pull request #304 from ONLYOFFICE/dependabot/nuget/web/documentserver-example/csharp/Newtonsoft.Json-13.0.1
build(deps): bump Newtonsoft.Json from 10.0.3 to 13.0.1 in /web/documentserver-example/csharp
|
2022-09-27 18:26:31 +03:00 |
|
|
|
7f08a96681
|
Merge remote-tracking branch 'remotes/origin/develop' into dependabot/nuget/web/documentserver-example/csharp/Newtonsoft.Json-13.0.1
# Conflicts:
# web/documentserver-example/csharp/packages.config
|
2022-09-27 18:26:07 +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 |
|
|
|
44d9ca88c6
|
build(deps): bump Newtonsoft.Json in /web/documentserver-example/csharp
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json) from 10.0.3 to 13.0.1.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases)
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/10.0.3...13.0.1)
---
updated-dependencies:
- dependency-name: Newtonsoft.Json
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-09-27 14:59:15 +00:00 |
|
|
|
d964b43087
|
Merge pull request #303 from ONLYOFFICE/develop
Release/v1.3.0
v7.2.1.5
v7.2.1.4
v1.3.0
|
2022-09-27 17:58:46 +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
v7.2.0.201
v7.2.0.209
v7.2.0.194
v7.2.0.197
v7.2.0.198
v7.2.0.199
v7.2.0.200
v7.2.0.202
v7.2.0.204
v7.2.0.205
v7.2.0.206
v7.2.0.207
v7.2.0.208
|
2022-09-15 17:17:24 +03:00 |
|
|
|
ad1d93dd20
|
Merge pull request #301 from ONLYOFFICE/bugfix/file-request
added request status check for file
|
2022-09-15 14:43:19 +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
v99.99.99.3085
v99.99.99.3082
v99.99.99.3079
v99.99.99.3078
v99.99.99.3077
v99.99.99.3076
v99.99.99.3075
v99.99.99.3074
v99.99.99.3073
v99.99.99.3081
v99.99.99.3093
v99.99.99.3080
v99.99.99.3083
v99.99.99.3084
v99.99.99.3094
v99.99.99.3086
v99.99.99.3087
v99.99.99.3088
v99.99.99.3089
v99.99.99.3090
v99.99.99.3091
v99.99.99.3092
|
2022-08-25 15:47:10 +03:00 |
|
|
|
9e94716df0
|
nodejs: reorder config items
v99.99.99.3071
v99.99.99.3056
v99.99.99.3057
v99.99.99.3058
v99.99.99.3063
v99.99.99.3064
v99.99.99.3065
v99.99.99.3066
v99.99.99.3067
v99.99.99.3069
v99.99.99.3070
v99.99.99.3072
|
2022-08-16 10:15:39 +03:00 |
|
|
|
988a8339b1
|
ruby: ERB::Util.url instead URI::encode
v99.99.99.3055
|
2022-08-15 11:10:02 +03:00 |
|
|
|
a482635e3f
|
Merge branch 'feature/directUrl' into release/v7.2.0
v7.2.0.128
v7.2.0.169
v7.2.0.193
v7.2.0.123
v7.2.0.124
v7.2.0.129
v7.2.0.130
v7.2.0.131
v7.2.0.133
v7.2.0.134
v7.2.0.135
v7.2.0.136
v7.2.0.137
v7.2.0.138
v7.2.0.192
v7.2.0.191
v7.2.0.190
v7.2.0.189
v7.2.0.188
v7.2.0.187
v7.2.0.185
v7.2.0.179
v7.2.0.178
v7.2.0.177
v7.2.0.175
v7.2.0.174
v7.2.0.173
v7.2.0.172
v7.2.0.171
v7.2.0.139
v7.2.0.168
v7.2.0.166
v7.2.0.165
v7.2.0.164
v7.2.0.163
v7.2.0.162
v7.2.0.161
v7.2.0.160
v7.2.0.159
v7.2.0.156
v7.2.0.155
v7.2.0.154
v7.2.0.153
v7.2.0.152
v7.2.0.151
v7.2.0.148
v7.2.0.140
|
2022-08-03 12:20:57 +03:00 |
|
|
|
d2c679f6b1
|
nodejs: option to send directUrl
|
2022-08-03 12:20:39 +03:00 |
|
|
|
1da452d857
|
Merge branch 'feature/directUrl' into release/v7.2.0
|
2022-08-03 12:20:18 +03:00 |
|
|
|
d9b8d2b7e9
|
directUrl to changelog
|
2022-08-03 12:14:16 +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 |
|
|
|
bd108a9c77
|
fix changelog
|
2022-08-03 12:11:01 +03:00 |
|
|
|
e737e8ed48
|
Merge remote-tracking branch 'remotes/origin/develop' into release/v7.2.0
|
2022-08-03 12:10:20 +03:00 |
|
|
|
b425d15f0a
|
Merge branch 'feature/tooltip' into develop
v99.99.99.3051
v99.99.99.3054
v99.99.99.3053
v99.99.99.3052
v99.99.99.3039
v99.99.99.3040
v99.99.99.3041
v99.99.99.3042
v99.99.99.3043
v99.99.99.3044
v99.99.99.3045
v99.99.99.3046
|
2022-08-03 12:09:47 +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)
v99.99.99.3035
v99.99.99.3034
|
2022-08-02 16:50:01 +03:00 |
|
|
|
641e45e24f
|
1.3.0
|
2022-08-02 15:35:18 +03:00 |
|
|
|
53c30fbb7d
|
Merge branch 'develop' into release/v7.2.0
# Conflicts:
# CHANGELOG.md
# 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/nodejs/app.js
# web/documentserver-example/nodejs/helpers/users.js
# web/documentserver-example/php/users.php
# web/documentserver-example/python/src/utils/users.py
# web/documentserver-example/ruby/app/models/users.rb
v7.2.0.121
v7.2.0.122
|
2022-08-02 15:04:09 +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 |
|
