|
|
39301f65b6
|
Merge remote-tracking branch 'remotes/origin/hotfix/v5.0.5' into develop
# Conflicts:
# web/documentserver-example/js/OnlineEditorsExampleJS.html
v5.0.99.351
v5.0.99.325
v5.0.99.267
v5.0.99.268
v5.0.99.269
v5.0.99.262
v5.0.99.270
v5.0.99.271
v5.0.99.272
v5.0.99.273
v5.0.99.274
v5.0.99.276
v5.0.99.277
v5.0.99.279
v5.0.99.261
v5.0.99.280
v5.0.99.281
v5.0.99.282
v5.0.99.283
v5.0.99.285
v5.0.99.286
v5.0.99.288
v5.0.99.289
v5.0.99.290
v5.0.99.292
v5.0.99.293
v5.0.99.294
v5.0.99.296
v5.0.99.297
v5.0.99.298
v5.0.99.299
v5.0.99.300
v5.0.99.301
v5.0.99.302
v5.0.99.303
v5.0.99.304
v5.0.99.306
v5.0.99.307
v5.0.99.309
v5.0.99.310
v5.0.99.311
v5.0.99.312
v5.0.99.313
v5.0.99.314
v5.0.99.317
v5.0.99.318
v5.0.99.321
v5.0.99.322
v5.0.99.323
v5.0.99.326
v5.0.99.327
v5.0.99.331
v5.0.99.332
v5.0.99.333
v5.0.99.334
v5.0.99.335
v5.0.99.336
v5.0.99.337
v5.0.99.424
v5.0.99.423
v5.0.99.422
v5.0.99.421
v5.0.99.420
v5.0.99.338
v5.0.99.419
v5.0.99.418
v5.0.99.417
v5.0.99.416
v5.0.99.415
v5.0.99.414
v5.0.99.413
v5.0.99.412
v5.0.99.410
v5.0.99.339
v5.0.99.409
v5.0.99.408
v5.0.99.407
v5.0.99.406
v5.0.99.405
v5.0.99.404
v5.0.99.403
v5.0.99.402
v5.0.99.400
v5.0.99.340
v5.0.99.341
v5.0.99.399
v5.0.99.398
v5.0.99.397
v5.0.99.396
v5.0.99.395
v5.0.99.394
v5.0.99.393
v5.0.99.391
v5.0.99.390
v5.0.99.342
v5.0.99.389
v5.0.99.388
v5.0.99.387
v5.0.99.386
v5.0.99.385
v5.0.99.384
v5.0.99.382
v5.0.99.381
v5.0.99.380
v5.0.99.343
v5.0.99.379
v5.0.99.378
v5.0.99.377
v5.0.99.376
v5.0.99.375
v5.0.99.374
v5.0.99.373
v5.0.99.372
v5.0.99.370
v5.0.99.344
v5.0.99.369
v5.0.99.368
v5.0.99.367
v5.0.99.366
v5.0.99.365
v5.0.99.364
v5.0.99.363
v5.0.99.362
v5.0.99.361
v5.0.99.360
v5.0.99.345
v5.0.99.359
v5.0.99.358
v5.0.99.357
v5.0.99.356
v5.0.99.355
v5.0.99.354
v5.0.99.353
v5.0.99.352
v5.0.99.263
v5.0.99.350
v5.0.99.346
v5.0.99.349
v5.0.99.348
v5.0.99.347
|
2017-11-27 17:29:39 +03:00 |
|
|
|
5209ea55c0
|
Document Editors (#40)
v5.0.99.232
v5.0.99.227
v5.0.99.248
v5.0.99.246
v5.0.99.244
v5.0.99.242
v5.0.99.241
v5.0.99.251
v5.0.99.240
v5.0.99.239
v5.0.99.233
v5.0.99.231
v5.0.99.230
v5.0.99.229
v5.0.99.225
v5.0.99.238
v5.0.99.226
v5.0.99.253
v5.0.99.249
v5.0.99.250
v5.0.99.222
v5.0.99.224
v5.0.99.223
v5.0.99.234
v5.0.99.254
v5.0.99.257
v5.0.99.221
v5.0.99.220
v5.0.99.237
v5.0.99.219
v5.0.99.218
v5.0.99.217
v5.0.99.256
v5.0.99.216
v5.0.99.215
v5.0.99.214
v5.0.99.235
v5.0.99.260
v5.0.99.258
v5.0.99.236
|
2017-11-13 17:54:09 +03:00 |
|
|
|
fb1715eebc
|
Document Editors (#39)
* Document Editors
* Update OnlineEditorsExampleJS.html
v5.0.99.186
v5.0.99.204
v5.0.99.203
v5.0.99.205
v5.0.99.206
v5.0.99.207
v5.0.99.208
v5.0.99.209
v5.0.99.210
v5.0.99.211
v5.0.99.212
v5.0.99.202
v5.0.99.213
v5.0.99.201
v5.0.99.200
v5.0.99.199
v5.0.99.198
v5.0.99.197
v5.0.99.196
v5.0.99.195
v5.0.99.193
v5.0.99.192
v5.0.99.191
v5.0.99.190
v5.0.99.189
v5.0.99.188
v5.0.99.187
v5.0.99.185
v5.0.99.184
v5.0.99.183
v5.0.99.180
v5.0.99.179
v5.0.99.178
|
2017-10-31 19:05:29 +03:00 |
|
|
|
59e78960ea
|
v5.0.3
v5.0.4.5
v5.0.7.29
v5.0.4.14
v5.0.4.15
v5.0.4.16
v5.0.4.3
v5.0.4.4
v5.0.4.6
v5.0.4.7
v5.0.4.8
v5.0.4.9
v5.0.5.10
v5.0.5.11
v5.0.5.12
v5.0.5.13
v5.0.5.14
v5.0.5.16
v5.0.5.17
v5.0.5.18
v5.0.5.19
v5.0.5.20
v5.0.5.21
v5.0.5.22
v5.0.5.23
v5.0.5.24
v5.0.5.25
v5.0.5.26
v5.0.5.27
v5.0.5.9
v5.0.6.10
v5.0.6.11
v5.0.6.12
v5.0.6.14
v5.0.6.15
v5.0.6.9
v5.0.7.11
v5.0.7.13
v5.0.7.14
v5.0.7.15
v5.0.7.16
v5.0.7.19
v5.0.7.20
v5.0.7.24
v5.0.7.25
v5.0.7.26
v5.0.7.27
v5.0.7.28
v5.0.4.10
v5.0.7.3
v5.0.7.30
v5.0.7.31
v5.0.7.32
v5.0.7.33
v5.0.7.34
v5.0.7.35
v5.0.7.36
v5.0.7.37
v5.0.7.38
v5.0.7.5
v5.0.7.6
v5.0.7.7
v5.0.7.8
v5.0.7.9
|
2017-10-31 18:49:25 +03:00 |
|
|
|
102f34c49e
|
Document Editors
v5.0.3.41
|
2017-10-27 17:03:35 +03:00 |
|
|
|
d0bbc736af
|
Merge pull request #37 from ONLYOFFICE/ShockwaveNN-patch-1
Add info about changing http://documentserver
v5.0.99.149
v5.0.99.150
v5.0.99.151
v5.0.99.152
v5.0.99.153
|
2017-10-20 16:22:58 +03:00 |
|
|
|
5115995fb9
|
Update Readme.md
|
2017-10-20 14:46:33 +03:00 |
|
|
|
682ed58528
|
Add info about chaning http://documentserver
|
2017-10-20 14:37:44 +03:00 |
|
|
|
2114b23900
|
Merge pull request #36 from ONLYOFFICE/fix/do-not-use-doc.onlyoffice.com
Do not use https://doc.onlyoffice.com as example
v5.0.99.147
|
2017-10-20 14:30:12 +03:00 |
|
|
|
207f896e25
|
Do not use https://doc.onlyoffice.com as example
It has JWT enabled and will not work without secret keys.
Users should setup their own http://documentserver
|
2017-10-20 14:26:57 +03:00 |
|
|
|
983c8829fa
|
editors: permisions modifyFilter
v5.0.99.144
v5.0.99.145
v5.0.99.146
|
2017-10-19 16:15:39 +03:00 |
|
|
|
02afb13601
|
Merge
v5.0.99.137
v5.0.99.143
v5.0.99.132
v5.0.99.133
v5.0.99.135
v5.0.99.136
v5.0.99.130
v5.0.99.138
v5.0.99.140
v5.0.99.141
v5.0.99.142
v5.0.99.131
|
2017-10-13 14:44:54 +03:00 |
|
|
|
494bc6b6a4
|
csharp: remove storage service
v5.0.99.127
v5.0.99.125
v5.0.99.124
v5.0.99.126
v5.0.99.123
v5.0.99.122
v5.0.99.121
v5.0.99.120
|
2017-10-09 17:39:51 +03:00 |
|
|
|
72db6178ac
|
java: remove storage service
|
2017-10-09 17:35:12 +03:00 |
|
|
|
5c1d925d42
|
nodejs: remove storage service
|
2017-10-09 17:33:30 +03:00 |
|
|
|
fd4dfea7d7
|
php: remove storage service
|
2017-10-09 17:31:49 +03:00 |
|
|
|
ebd309dabc
|
ruby: remove storage service
|
2017-10-09 17:29:09 +03:00 |
|
|
|
f376c50fd9
|
try convert once
|
2017-10-09 17:16:24 +03:00 |
|
|
|
6088e7d685
|
ruby: gemfile up
|
2017-10-09 17:01:43 +03:00 |
|
|
|
d143e3c80d
|
ruby: json response
|
2017-10-09 16:24:09 +03:00 |
|
|
|
56d6388603
|
ruby: change track event
|
2017-10-09 15:47:21 +03:00 |
|
|
|
54993942bf
|
java: json response
v5.0.99.117
v5.0.99.118
v5.0.99.119
|
2017-10-06 16:06:41 +03:00 |
|
|
|
f2301ecbbf
|
java: fix opening editor
|
2017-10-06 16:06:01 +03:00 |
|
|
|
f09f62103c
|
java: formatting
|
2017-10-06 16:05:44 +03:00 |
|
|
|
75c1cc0c83
|
v5.0.1
v5.0.3.2
v5.0.2.10
v5.0.3.8
v5.0.3.7
v5.0.3.6
v5.0.3.5
v5.0.3.4
v5.0.3.39
v5.0.3.38
v5.0.3.37
v5.0.3.36
v5.0.3.35
v5.0.3.34
v5.0.3.33
v5.0.3.32
v5.0.3.31
v5.0.3.30
v5.0.3.3
v5.0.3.27
v5.0.3.26
v5.0.3.22
v5.0.3.21
v5.0.3.20
v5.0.3.19
v5.0.3.18
v5.0.3.15
v5.0.3.14
v5.0.3.9
v5.0.3.13
v5.0.3.12
v5.0.3.11
v5.0.3.10
v5.0.2.9
v5.0.2.8
v5.0.2.7
v5.0.2.6
v5.0.2.5
v5.0.2.4
v5.0.2.3
v5.0.2.2
v5.0.2.14
v5.0.2.13
v5.0.2.12
|
2017-10-05 14:46:28 +03:00 |
|
|
|
e1e3357748
|
nodejs: json response
|
2017-09-28 18:40:18 +03:00 |
|
|
|
449020a9a4
|
php: json response
v5.0.99.115
v5.0.99.111
v5.0.99.98
v5.0.99.99
v5.0.99.116
v5.0.99.114
v5.0.99.113
v5.0.99.112
v5.0.99.110
v5.0.99.109
v5.0.99.108
v5.0.99.107
v5.0.99.106
v5.0.99.100
v5.0.99.101
v5.0.99.102
v5.0.99.103
v5.0.99.105
|
2017-09-28 18:18:23 +03:00 |
|
|
|
22f2f0f922
|
mvc: json response
|
2017-09-28 17:55:01 +03:00 |
|
|
|
1aa7e73d79
|
csharp: json response
|
2017-09-28 17:47:54 +03:00 |
|
|
|
6eaa290557
|
Merge branch 'hotfix/v5.0.1' into develop
v5.0.99.93
v5.0.99.97
v5.0.99.96
v5.0.99.90
v5.0.99.91
v5.0.99.92
v5.0.99.95
v5.0.99.94
|
2017-09-26 14:14:40 +03:00 |
|
|
|
ed8df66513
|
support OpenDocument Flat Document file type
v5.0.1.31
v5.0.1.26
v5.0.1.20
v5.0.1.21
v5.0.1.35
v5.0.1.22
v5.0.1.39
v5.0.1.23
v5.0.1.43
v5.0.1.42
v5.0.1.41
v5.0.1.34
v5.0.1.37
v5.0.1.32
v5.0.1.40
v5.0.1.24
v5.0.1.29
v5.0.1.28
v5.0.1.27
v5.0.1.25
|
2017-09-26 14:11:18 +03:00 |
|
|
|
16d942a487
|
support OpenDocument Flat Document file type
v5.0.99.89
|
2017-09-26 13:24:34 +03:00 |
|
|
|
5c6d9ec008
|
v5.0.0
v5.0.1.19
v5.0.1.17
v5.0.1.5
v5.0.1.6
v5.0.1.9
v5.0.1.8
v5.0.1.4
v5.0.1.7
v5.0.1.3
v5.0.1.16
v5.0.1.18
v5.0.1.15
v5.0.1.14
v5.0.1.13
v5.0.1.12
v5.0.1.11
v5.0.1.10
|
2017-09-19 17:04:59 +03:00 |
|
|
|
8e7f7c20e4
|
nodejs: fix opening history without changes
v5.0.99.82
v5.0.99.84
v5.0.99.78
v5.0.99.80
v5.0.99.77
v5.0.99.76
v5.0.99.75
v5.0.99.74
v5.0.99.79
v5.0.99.73
v5.0.99.72
v5.0.99.71
v5.0.99.70
v5.0.99.69
v5.0.99.68
v5.0.99.67
v5.0.99.66
v5.0.99.87
v5.0.99.86
v5.0.99.85
v5.0.99.88
v5.0.99.83
v5.0.99.81
|
2017-09-14 16:07:53 +03:00 |
|
|
|
b3f7e9861f
|
Merge remote-tracking branch 'remotes/origin/release/v5.0.0' into develop
# Conflicts:
# web/documentserver-example/nodejs/config/default.json
# web/documentserver-example/nodejs/helpers/fileUtility.js
v5.0.99.63
v5.0.99.65
v5.0.99.56
v5.0.99.60
v5.0.99.61
v5.0.99.62
v5.0.99.55
v5.0.99.59
v5.0.99.57
v5.0.99.52
v5.0.99.53
v5.0.99.54
v5.0.99.64
|
2017-09-07 15:58:30 +03:00 |
|
|
|
797696ceea
|
Merge branch 'feature/m-formats' into develop
|
2017-09-07 15:54:54 +03:00 |
|
|
|
af30096d71
|
Fix editable formats list
|
2017-09-07 15:54:14 +03:00 |
|
|
|
8a7193a645
|
support template formats
|
2017-09-07 15:52:47 +03:00 |
|
|
|
84f5be3556
|
change viewed formats list
|
2017-09-07 15:47:47 +03:00 |
|
|
|
cff90de454
|
nodejs: edit link only for editable format
v5.0.99.51
|
2017-09-07 13:51:33 +03:00 |
|
|
|
18b7bdb401
|
support convertation -m formats to -x
|
2017-09-07 12:28:46 +03:00 |
|
|
|
75155b4c54
|
Fix Bug 35704 - commenting in review mode
v5.0.0.112
v5.0.0.96
v5.0.0.105
v5.0.0.104
v5.0.0.80
v5.0.0.107
v5.0.0.103
v5.0.0.102
v5.0.0.81
v5.0.0.115
v5.0.0.82
v5.0.0.83
v5.0.0.84
v5.0.0.108
v5.0.0.109
v5.0.0.79
v5.0.0.110
v5.0.0.85
v5.0.0.119
v5.0.0.118
v5.0.0.86
v5.0.0.87
v5.0.0.88
v5.0.0.100
v5.0.0.89
v5.0.0.90
v5.0.0.91
v5.0.0.92
v5.0.0.111
v5.0.0.93
v5.0.0.94
v5.0.0.117
v5.0.0.95
v5.0.0.106
v5.0.0.97
v5.0.0.98
v5.0.0.114
v5.0.0.113
v5.0.0.116
|
2017-09-06 11:19:11 +03:00 |
|
|
|
4c3bc0e7ef
|
convert docm,dot,dotm,dotx,xlsm,xlt,xltm,xltx,pot,potm,potx,ppsm,pptm to OOX format
|
2017-09-06 11:09:29 +03:00 |
|
|
|
908affc61c
|
Fix Bug 35704 - commenting in review mode
v5.0.99.39
v5.0.99.47
v5.0.99.50
v5.0.99.28
v5.0.99.31
v5.0.99.32
v5.0.99.33
v5.0.99.34
v5.0.99.35
v5.0.99.36
v5.0.99.37
v5.0.99.38
v5.0.99.29
v5.0.99.27
v5.0.99.30
v5.0.99.41
v5.0.99.42
v5.0.99.43
v5.0.99.44
v5.0.99.45
v5.0.99.46
v5.0.99.40
v5.0.99.48
v5.0.99.49
|
2017-08-28 17:17:45 +03:00 |
|
|
|
c5b227d278
|
remove preselected lang value (Bug 35603)
v5.0.99.26
|
2017-08-28 16:08:32 +03:00 |
|
|
|
364d24dda2
|
Added new formats.
v5.0.0.32
v5.0.0.31
v5.0.0.77
v5.0.0.76
v5.0.0.75
v5.0.0.74
v5.0.0.73
v5.0.0.72
v5.0.0.71
v5.0.0.70
v5.0.0.69
v5.0.0.68
v5.0.0.67
v5.0.0.66
v5.0.0.64
v5.0.0.63
v5.0.0.62
v5.0.0.61
v5.0.0.60
v5.0.0.59
v5.0.0.58
v5.0.0.78
v5.0.0.56
v5.0.0.55
v5.0.0.54
v5.0.0.53
v5.0.0.52
v5.0.0.51
v5.0.0.50
v5.0.0.27
v5.0.0.28
v5.0.0.29
v5.0.0.49
v5.0.0.48
v5.0.0.47
v5.0.0.46
v5.0.0.45
v5.0.0.44
v5.0.0.43
v5.0.0.42
v5.0.0.41
v5.0.0.40
v5.0.0.39
v5.0.0.38
v5.0.0.36
v5.0.0.34
v5.0.0.33
v5.0.0.30
|
2017-08-18 16:37:03 +03:00 |
|
|
|
74537582d7
|
support -m formats
|
2017-08-04 17:39:02 +03:00 |
|
|
|
8057ef7cbc
|
nodejs: siteUrl
v5.0.99.13
v4.5.dev.153
v5.0.0.5
v5.0.0.6
v5.0.0.7
v5.0.0.26
v5.0.0.25
v5.0.0.24
v5.0.0.23
v5.0.0.22
v5.0.0.21
v5.0.0.20
v5.0.0.19
v5.0.0.18
v5.0.0.17
v5.0.0.16
v5.0.0.15
v5.0.0.14
v5.0.0.13
v5.0.99.10
v5.0.99.11
v4.5.dev.179
v5.0.99.14
v5.0.99.15
v5.0.99.16
v5.0.99.17
v5.0.99.18
v5.0.99.19
v5.0.99.20
v5.0.0.11
v5.0.99.8
v5.0.99.7
v5.0.99.21
v5.0.99.6
v5.0.99.9
v5.0.99.22
v5.0.99.23
v5.0.99.5
v5.0.99.24
v5.0.0.10
v5.0.99.3
v5.0.99.25
v5.0.99.4
v4.5.dev.178
v4.5.dev.176
v4.5.dev.175
v4.5.dev.174
v4.5.dev.173
v4.5.dev.172
v4.5.dev.171
v4.5.dev.170
v4.5.dev.169
v4.5.dev.168
v5.0.0.8
v4.5.dev.167
v4.5.dev.166
v4.5.dev.165
v4.5.dev.164
v4.5.dev.163
v4.5.dev.162
v4.5.dev.161
v4.5.dev.160
v4.5.dev.159
v4.5.dev.148
v4.5.dev.149
v4.5.dev.150
v4.5.dev.152
v5.0.0.9
v4.5.dev.154
v4.5.dev.155
v4.5.dev.156
v4.5.dev.157
v4.5.dev.158
|
2017-08-03 19:18:47 +03:00 |
|
|
|
8bab3ecbc6
|
nodejs: web-apps-pro for development
|
2017-08-03 16:33:29 +03:00 |
|
|
|
7e2a12c836
|
java: delete using javafx.util.Pair
v4.5.dev.123
v4.5.dev.121
v4.5.dev.129
v4.5.dev.122
v4.5.dev.127
v4.5.dev.126
v4.5.dev.125
v4.5.dev.124
v4.5.dev.130
v4.5.dev.131
v4.5.dev.128
v4.5.dev.120
v4.5.dev.119
v4.5.dev.118
v4.5.dev.117
v4.5.dev.116
v4.5.dev.115
v4.5.dev.114
v4.5.dev.113
|
2017-07-31 16:41:47 +03:00 |
|
