Commit Graph

200 Commits

Author SHA1 Message Date
022acfb9cd Merge tag 'v4.3.5' into develop
v4.3.5 v4.3.5
v4.4.0.200 v4.4.0.210 v4.4.0.172 v4.4.0.173 v4.4.0.174 v4.4.0.175 v4.4.0.176 v4.4.0.177 v4.4.0.179 v4.4.0.180 v4.4.0.181 v4.4.0.182 v4.4.0.183 v4.4.0.184 v4.4.0.185 v4.4.0.186 v4.4.0.187 v4.4.0.188 v4.4.0.189 v4.4.0.190 v4.4.0.191 v4.4.0.192 v4.4.0.193 v4.4.0.194 v4.4.0.195 v4.4.0.196 v4.4.0.197 v4.4.0.198 v4.4.0.199 v4.4.0.170 v4.4.0.201 v4.4.0.202 v4.4.0.203 v4.4.0.204 v4.4.0.205 v4.4.0.206 v4.4.0.207 v4.4.0.208 v4.4.0.209 v4.4.0.171 v4.4.0.211 v4.4.0.212 v4.4.0.213 v4.4.0.214 v4.4.0.215 v4.4.0.216 v4.4.0.217 v4.4.0.218 v4.4.0.219 v4.4.0.220 v4.4.0.221 v4.4.0.222 v4.4.0.223 v4.4.0.224 v4.4.0.169 v4.4.0.168 v4.4.0.167 v4.4.0.166 v4.4.0.165 v4.4.0.164 v4.4.0.161 v4.4.0.160 v4.4.0.227 v4.4.0.225 v4.4.0.238 v4.4.0.237 v4.4.0.236 v4.4.0.235 v4.4.0.234 v4.4.0.233 v4.4.0.232 v4.4.0.231 v4.4.0.230 v4.4.0.226 v4.4.0.229 v4.4.0.228
2017-06-05 16:49:44 +03:00
66c19c1b89 qBBBBBBBBBAAAAAMerge branch 'hotfix/v4.3.5' v4.3.6 v4.3.5 v4.3.6.2 2017-06-05 16:49:28 +03:00
bbd8305ad9 nodejs: error when save deleted file v4.4.0.117 v4.4.0.86 v4.4.0.92 v4.4.0.143 v4.4.0.98 v4.4.0.99 v4.4.0.97 v4.4.0.96 v4.4.0.95 v4.4.0.94 v4.4.0.93 v4.4.0.144 v4.4.0.145 v4.4.0.146 v4.4.0.147 v4.4.0.148 v4.4.0.149 v4.4.0.141 v4.4.0.150 v4.4.0.151 v4.4.0.152 v4.4.0.153 v4.4.0.154 v4.4.0.155 v4.4.0.91 v4.4.0.100 v4.4.0.101 v4.4.0.102 v4.4.0.103 v4.4.0.104 v4.4.0.105 v4.4.0.106 v4.4.0.107 v4.4.0.108 v4.4.0.109 v4.4.0.110 v4.4.0.111 v4.4.0.112 v4.4.0.113 v4.4.0.114 v4.4.0.115 v4.4.0.116 v4.4.0.90 v4.4.0.118 v4.4.0.119 v4.4.0.121 v4.4.0.122 v4.4.0.123 v4.4.0.124 v4.4.0.125 v4.4.0.126 v4.4.0.127 v4.4.0.128 v4.4.0.129 v4.4.0.130 v4.4.0.131 v4.4.0.132 v4.4.0.133 v4.4.0.134 v4.4.0.135 v4.4.0.136 v4.4.0.137 v4.4.0.138 v4.4.0.85 v4.4.0.142 v4.4.0.87 v4.4.0.88 v4.4.0.89 v4.4.0.139 v4.4.0.140 v4.4.0.159 v4.4.0.158 v4.4.0.157 v4.4.0.156 2017-05-18 19:53:56 +03:00
c5b6b7ab1b nodejs: use the date when creating the key 2017-05-18 19:53:23 +03:00
c854249add Merge pull request #27 from ONLYOFFICE/feature/nssm-startup
fixed crash on windows 2008r2
v4.3.5.9 v4.3.5.8 v4.3.5.7 v4.3.5.6 v4.3.5.5 v4.3.5.4 v4.3.5.3 v4.3.5.2 v4.3.5.14 v4.3.5.13 v4.3.5.12 v4.3.5.11 v4.3.5.10
2017-05-16 13:10:59 +03:00
837b56b20f fixed crash on windows 2008r2 2017-05-15 16:36:58 +03:00
80b081883e Fix Bug 34711 - css iPhone4s v4.4.0.81 v4.4.0.58 v4.4.0.29 v4.4.0.34 v4.4.0.84 v4.4.0.83 v4.4.0.35 v4.4.0.82 v4.4.0.36 v4.4.0.80 v4.4.0.37 v4.4.0.79 v4.4.0.78 v4.4.0.77 v4.4.0.76 v4.4.0.75 v4.4.0.38 v4.4.0.74 v4.4.0.73 v4.4.0.72 v4.4.0.71 v4.4.0.70 v4.4.0.39 v4.4.0.40 v4.4.0.69 v4.4.0.68 v4.4.0.67 v4.4.0.66 v4.4.0.65 v4.4.0.64 v4.4.0.63 v4.4.0.62 v4.4.0.61 v4.4.0.41 v4.4.0.60 v4.4.0.42 v4.4.0.59 v4.4.0.28 v4.4.0.56 v4.4.0.55 v4.4.0.54 v4.4.0.53 v4.4.0.52 v4.4.0.51 v4.4.0.43 v4.4.0.50 v4.4.0.49 v4.4.0.47 v4.4.0.46 v4.4.0.45 v4.4.0.44 2017-04-27 15:46:19 +03:00
7c71d42975 Fix download link for custom EXAMPLE_URL (Issue #24) v4.4.0.27 v4.4.0.26 2017-04-25 19:28:43 +03:00
a52d5cb3be Fix Bug 33758 - replacing address for document server (exampleUrl) 2017-04-25 18:30:39 +03:00
a9d261a0ad Fix Bug 34620 - resize on mobile 2017-04-25 17:55:45 +03:00
5dea4c77a9 Fix Bug 34739 - encode ' 2017-04-25 17:42:51 +03:00
8eb017b092 nodejs: plugins new format 2017-04-25 17:08:04 +03:00
dd346a380e Merge tag 'v4.3.2' into develop
v4.3.2 v4.3.2
v4.4.0.21 v4.4.0.11 v4.4.0.23 v4.4.0.12 v4.4.0.18 v4.4.0.24 v4.4.0.16 v4.4.0.22 v4.4.0.17 v4.4.0.15
2017-04-17 14:59:31 +03:00
61497a8da7 Merge branch 'hotfix/v4.3.2' v4.3.4 v4.3.3.4 v4.3.4.10 v4.3.4.6 v4.3.4.8 v4.3.4.9 2017-04-17 14:59:29 +03:00
34d568bdbc Fix goback button v4.3.2.3 v4.3.2.2 2017-04-06 18:42:18 +03:00
905084dc52 Fix goback button v4.4.0.9 v4.4.0.8 v4.4.0.7 v4.4.0.6 v4.4.0.10 2017-04-06 17:22:13 +03:00
e00b662660 Merge tag 'v4.3.0' into develop
v4.3.0
2017-04-03 12:58:54 +03:00
5ded3f6135 Merge branch 'release/v4.3.0' 2017-04-03 12:58:44 +03:00
a096e96b29 Fix Bug 34518 - "Uncaught SyntaxError: Unexpected token }" v4.3.0.333 v4.3.0.340 v4.3.0.322 win-v4.3.0.110 win-v4.3.0.109 win-v4.3.0.108 win-v4.3.0.107 win-v4.3.0.106 v4.3.0.323 v4.3.0.324 v4.3.0.325 v4.3.0.326 v4.3.0.327 v4.3.0.328 v4.3.0.329 v4.3.0.330 v4.3.0.331 v4.3.0.332 v4.3.0.334 v4.3.0.335 v4.3.0.336 v4.3.0.338 v4.3.0.339 2017-03-27 14:31:58 +03:00
b452a171d1 nodejs: append dependencies win-v4.3.0.95 v4.3.0.307 v4.3.0.303 v4.3.0.304 v4.3.0.305 v4.3.0.306 v4.3.0.308 win-v4.3.0.97 v4.3.0.309 v4.3.0.310 win-v4.3.0.94 v4.3.0.311 v4.3.0.312 win-v4.3.0.100 win-v4.3.0.101 win-v4.3.0.102 win-v4.3.0.103 win-v4.3.0.104 win-v4.3.0.105 v4.3.0.313 v4.3.0.321 v4.3.0.320 v4.3.0.319 v4.3.0.318 v4.3.0.317 v4.3.0.316 v4.3.0.315 v4.3.0.314 2017-03-21 10:40:03 +03:00
282ea78799 Merge pull request #22 from ONLYOFFICE/feature/forcesave
Feature/forcesave
v4.3.0.289 v4.3.0.291 win-v4.3.0.93 win-v4.3.0.91 v4.3.0.296 v4.3.0.286 v4.3.0.294 v4.3.0.287 win-v4.3.0.92 v4.3.0.292 v4.3.0.298 v4.3.0.302 v4.3.0.301 v4.3.0.300 v4.3.0.295 v4.3.0.299
2017-03-16 15:58:38 +03:00
4824373678 nodejs: forcesave configuration for new sсheme editing 2017-03-16 15:57:07 +03:00
df8a575d75 ignore vscode 2017-03-16 15:54:40 +03:00
e023ec3bb7 nodejs: download forcesaved file, delete forcesaved file after saving 2017-03-16 14:53:12 +03:00
535ba03cdf nodejs: download file via handler 2017-03-16 14:36:34 +03:00
f5d416e371 nodejs: forcesave to history directory 2017-03-16 14:03:22 +03:00
931e05a175 nodejs: jwt for historyData win-v4.3.0.90 2017-03-15 17:54:04 +03:00
293919bb6e nodejs: new arguments in setHistoryData 2017-03-15 17:46:34 +03:00
35c4dd6a95 Disabled jwt v4.3.0.274 v4.3.0.265 win-v4.3.0.88 win-v4.3.0.87 win-v4.3.0.86 win-v4.3.0.85 win-v4.3.0.84 win-v4.3.0.82 v4.3.0.284 v4.3.0.283 v4.3.0.282 v4.3.0.281 v4.3.0.280 win-v4.3.0.81 v4.3.0.279 v4.3.0.278 v4.3.0.277 v4.3.0.276 v4.3.0.275 win-v4.3.0.80 v4.3.0.272 v4.3.0.270 win-v4.3.0.79 v4.3.0.269 v4.3.0.268 v4.3.0.267 v4.3.0.266 win-v4.3.0.89 v4.3.0.264 v4.3.0.263 v4.3.0.262 v4.3.0.261 v4.3.0.260 v4.3.0.259 v4.3.0.258 v4.3.0.257 v4.3.0.256 v4.3.0.255 v4.3.0.254 v4.3.0.253 v4.3.0.252 v4.3.0.251 v4.3.0.249 v4.3.0.248 v4.3.0.240 v4.3.0.247 v4.3.0.246 v4.3.0.245 2017-03-03 17:34:24 +03:00
32aff45d7d Merge pull request #21 from ONLYOFFICE/feature/token
Feature/token
v4.3.0.239
2017-03-03 16:54:38 +03:00
1b73970ebc node: jwt 2017-03-03 16:48:45 +03:00
c014250479 node: moved config in a separate file 2017-03-02 19:38:24 +03:00
b1e216da88 node: upload request without file v4.3.0.238 win-v4.3.0.78 v4.3.0.236 v4.3.0.237 2017-03-02 18:52:20 +03:00
257bf005eb Removed plugins form config v4.3.0.232 v4.3.0.224 win-v4.3.0.77 v4.3.0.235 v4.3.0.234 v4.3.0.233 win-v4.3.0.76 v4.3.0.231 v4.3.0.230 win-v4.3.0.75 2017-02-28 15:57:08 +03:00
4d7a777730 fix scope v4.3.0.216 v4.3.0.212 v4.3.0.221 v4.3.0.220 win-v4.3.0.74 v4.3.0.219 v4.3.0.218 win-v4.3.0.72 v4.3.0.215 v4.3.0.214 v4.3.0.213 v4.3.0.222 v4.3.0.211 v4.3.0.210 win-v4.3.0.73 v4.3.0.209 v4.3.0.208 win-v4.3.0.71 2017-02-21 18:10:54 +03:00
71fd3e8ce8 update packages 2017-02-21 18:06:27 +03:00
fabb6f5f6d add check error on upload
upload to tmp folder (delete if error)
2017-02-21 18:06:06 +03:00
9c4fc0347f add delete all files
if filename exist delete file, other - delete all files
var -> let and const
v4.3.0.207
2017-02-21 16:23:32 +03:00
8ab3069acf update package formidable 2017-02-21 16:19:39 +03:00
96666e9723 Copyright 2017 v4.3.0.206 v4.3.0.205 win-v4.3.0.70 2017-02-21 11:01:51 +03:00
bec8de63eb remove base ulr v4.3.0.204 2017-02-20 17:47:19 +03:00
6c01f7a11b add plugins v4.3.0.201 v4.3.0.203 v4.3.0.202 v4.3.0.200 win-v4.3.0.69 win-v4.3.0.68 2017-02-17 19:27:29 +03:00
d83c103a31 update favicon.ico v4.3.0.199 2017-02-17 15:22:16 +03:00
dac9003e58 Fix Bug 33954 - open mobile editor by user agent v4.3.0.197 v4.3.0.194 v4.3.0.193 v4.3.0.192 v4.3.0.191 v4.3.0.195 win-v4.3.0.66 win-v4.3.0.67 v4.3.0.196 v4.3.0.198 2017-02-15 16:47:30 +03:00
680670294b fileName is not the last parameter v4.3.0.190 2017-02-15 11:59:42 +03:00
62906cd744 Applying https://github.com/ONLYOFFICE/document-server-integration/pull/20 2017-02-15 11:45:40 +03:00
f4e7a5cd6f check exist history file instead of folder v4.3.0.185 v4.3.0.184 v4.3.0.182 v4.3.0.181 v4.3.0.183 win-v4.3.0.63 win-v4.3.0.64 v4.3.0.189 v4.3.0.187 v4.3.0.186 2017-02-10 13:22:43 +03:00
63cea1cecb Fix Bug 33279 - add onOutdatedVersion event v4.3.0.180 v4.3.0.178 v4.3.0.179 2017-02-09 18:58:45 +03:00
2e6e8ccfd1 php: replace domain for DocumentServer from config 2017-02-09 17:45:43 +03:00
bc5bb0d142 php: fix convert response with fileuri 2017-02-09 17:44:27 +03:00