Commit Graph

3923 Commits

Author SHA1 Message Date
525b828540 Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop
* 'develop' of https://github.com/ONLYOFFICE/core:
  TextParagraphPr swap marR/marL
  .
  .
  .
  Use `uname -m` for determine linux x64\x686
  Add travis example config
  .
v4.4.0.184 core/develop-388
2017-06-08 15:48:04 +03:00
f64ee80a1a add event 2017-06-08 15:47:56 +03:00
f6402813c4 TextParagraphPr swap marR/marL v4.4.0.183 core/develop-387 core-win-64/develop-347 2017-06-08 13:19:53 +03:00
224ac7d6e2 . core/develop-386 core-win-64/develop-346 v4.4.0.182 v4.4.0.181 2017-06-07 18:53:35 +03:00
2e2bd8989d . core/develop-385 2017-06-07 18:39:24 +03:00
8f434efb95 . core/develop-384 2017-06-07 18:36:40 +03:00
244dafb02b Merge pull request #31 from ONLYOFFICE/ShockwaveNN-patch-1
Use `uname -m` for determine linux x64\x686
core-win-64/develop-345
2017-06-07 18:35:57 +03:00
149a1bdbd5 Use uname -m for determine linux x64\x686
`uname -p` return `unknown` on several system (including debian, but not including ubuntu)
2017-06-07 18:34:18 +03:00
a79d9041bc Merge pull request #30 from ONLYOFFICE/fix/travis-status-green
Add travis example config
v4.4.0.180
2017-06-07 17:26:08 +03:00
3954c42602 Add travis example config 2017-06-07 17:16:51 +03:00
29dc0aee32 . core/develop-383 v4.4.0.173 v4.4.0.174 v4.4.0.175 v4.4.0.176 v4.4.0.177 v4.4.0.179 core-win-32/develop-4 core-windows/develop-344 2017-06-06 16:50:39 +03:00
d805972d6d Merge pull request #28 from ONLYOFFICE/hotfix/v4.3.5
Hotfix/v4.3.5
v4.4.0.164 v4.4.0.166 v4.4.0.169 core-windows/develop-343 v4.4.0.168 v4.4.0.161 core/develop-382 v4.4.0.170 v4.4.0.165 v4.4.0.171 v4.4.0.172 v4.4.0.167
2017-06-05 17:19:24 +03:00
549d5a46a6 Merge branch 'develop' into hotfix/v4.3.5 2017-06-05 17:12:36 +03:00
771bf2d55c for bug 27765
EncodeXml
v4.4.0.159 v4.4.0.160 core/develop-381 v4.4.0.158 core-windows/develop-342
2017-06-05 15:03:29 +03:00
3c58cd96fc for bug 27765 core/develop-380 2017-06-05 14:36:34 +03:00
e50864fa98 . v4.4.0.156 v4.4.0.157 core-windows/develop-341 core/develop-379 2017-06-05 10:39:58 +03:00
c8c0924c74 for oox2mscrypt v4.4.0.154 v4.4.0.155 core/develop-378 core-windows/develop-340 2017-06-02 18:43:38 +03:00
af732e4e85 . 2017-06-02 18:38:44 +03:00
47ffdae8cc PptxFormat - partly fix 35054 v4.4.0.153 v4.4.0.152 core-windows/develop-339 core/develop-377 2017-06-02 14:35:41 +03:00
fd5870083b . core/develop-376 v4.4.0.151 v4.4.0.150 core-windows/develop-338 2017-06-02 11:16:59 +03:00
5ba62cb25d . v4.4.0.146 v4.4.0.147 v4.4.0.148 v4.4.0.149 core/develop-375 core-windows/develop-337 core-windows/develop-336 2017-06-01 16:54:16 +03:00
79e0588544 fix partly 35047 2017-06-01 16:16:39 +03:00
a3d08cfc35 XlsxFormat - fix object without replacement image v4.4.0.145 core/develop-374 core/develop-373 2017-06-01 14:39:41 +03:00
5caccb284a Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop v4.4.0.143 v4.4.0.144 core-windows/develop-335 core/develop-372 2017-06-01 12:27:46 +03:00
ce19969b52 PptxFormat - fix objects without replacement image 2017-06-01 12:24:27 +03:00
0f91dc392e test ParseAllCultureInfo 2017-06-01 11:52:36 +03:00
e9805cef30 PptxFormat - fix Ole object without image cash core/develop-371 v4.4.0.142 v4.4.0.141 core-windows/develop-334 2017-05-31 19:22:26 +03:00
e3e05eb2db test 2017-05-31 19:01:24 +03:00
c09f17cffb . core/develop-370 core-windows/develop-333 2017-05-31 17:56:45 +03:00
ce73dd5987 linux build error v4.4.0.140 2017-05-31 15:48:59 +03:00
77df8aacb9 . core-windows/develop-332 2017-05-31 14:13:54 +03:00
ce45b2802f fix bug #34953 2017-05-31 13:46:49 +03:00
7886018d6f Oox file crypter v4.4.0.139 v4.4.0.138 2017-05-31 12:35:27 +03:00
5b5cb4188e OfficeCryptReader - check data integrity core-windows/develop-331 v4.4.0.137 v4.4.0.135 v4.4.0.136 2017-05-30 19:49:54 +03:00
f797af5f17 . v4.4.0.133 v4.4.0.132 core-windows/develop-329 core-windows/develop-330 v4.4.0.134 2017-05-30 16:05:49 +03:00
055977535e fixed build error 2017-05-30 16:04:33 +03:00
6ab24f10f0 Added prefix for lib targets 2017-05-30 15:55:31 +03:00
12a03da231 Changed extension for ooxmlsignature core/develop-362 2017-05-30 15:29:43 +03:00
cb7088979a . 2017-05-30 15:26:56 +03:00
1fb1fc6c97 Added OOXMLSIGNATURE project v4.4.0.130 v4.4.0.131 core/develop-361 2017-05-30 13:15:14 +03:00
e633c3c5d1 fix bug 35012 v4.4.0.129 v4.4.0.125 v4.4.0.126 v4.4.0.127 core/develop-359 v4.4.0.128 core/develop-360 2017-05-29 17:11:10 +03:00
0f04de34b1 OdfFormatWriter - dont write backgroud master notes, notes (errors in libre & open office) v4.4.0.124 core/develop-358 2017-05-29 16:19:26 +03:00
3f8c2c293a XlsFormatReader - fix users file v4.4.0.121 v4.4.0.122 core/develop-357 v4.4.0.123 2017-05-28 17:18:27 +03:00
2c97e743da . 2017-05-28 15:44:49 +03:00
2c83860c04 Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop
Conflicts:
	DesktopEditor/raster/Metafile/Emf/EmfFile.cpp
core/develop-356 v4.4.0.119
2017-05-27 15:27:51 +03:00
c64b624de2 . 2017-05-27 15:24:50 +03:00
5e3990937d OdfFormatReader - fix after testing 2017-05-27 15:17:46 +03:00
21744c1607 . core/develop-355 v4.4.0.118 2017-05-26 17:50:23 +03:00
0892e2549f . 2017-05-26 17:48:13 +03:00
cff6f305d4 Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop 2017-05-26 17:09:34 +03:00