Commit Graph

4049 Commits

Author SHA1 Message Date
ccc4d751d0 Merge remote-tracking branch 'origin/hotfix/v4.4.2' into develop v4.5.dev.34 core-linux-64/develop-470 v4.5.dev.33 core-win-64/develop-406 2017-07-06 15:40:57 +03:00
a020d3dbf9 PptxFormat - fix audio wav files, fix old standart ole
XlsFormat - fix custom shape with connectors
core-win-64/hotfixFv4.4.2-3 core-win-32/hotfixFv4.4.2-2 v4.4.2.6 core-linux-64/hotfix%2Fv4.4.2-3 v4.4.2.7 v4.4.2.4 v4.4.2.3 v4.4.2.5 v4.4.2.2 v4.4.2.9 v4.4.2.8
2017-07-06 15:40:10 +03:00
7852b7fbe8 . 2017-07-06 15:35:14 +03:00
a64fd8792d Fixed build error v4.5.dev.32 core-linux-64/develop-469 2017-07-06 12:19:50 +03:00
32448298a3 Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop
* 'develop' of https://github.com/ONLYOFFICE/core:
  .
  OdfFormatReader - fix spreadsheets margins PptFormatReader - fix previous users picture, fix read picture stream version up
  XlsFormat - convert pivot tables
  debug
  .
  .
v4.5.dev.31 core-win-32/develop-26 v4.5.dev.30 v4.5.dev.29
2017-07-05 15:35:54 +03:00
b3384f1466 chart-settings seralize 2017-07-05 15:35:46 +03:00
93274395a9 . 2017-07-05 13:55:37 +03:00
2726e14445 Merge remote-tracking branch 'origin/hotfix/v4.4.2' into develop 2017-07-05 13:46:05 +03:00
75e32a1562 OdfFormatReader - fix spreadsheets margins
PptFormatReader - fix previous users picture, fix read picture stream
version up
core-win-64/hotfixFv4.4.2-2 core-linux-64/hotfix%2Fv4.4.2-1 core-linux-64/hotfix%2Fv4.4.2-2 core-win-32/hotfixFv4.4.2-1 core-win-64/hotfixFv4.4.2-1
2017-07-05 13:44:50 +03:00
8c2637b89c Merge tag 'v4.4.1' into develop
v4.4.1
v4.5.dev.28
2017-07-05 11:48:04 +03:00
ef389872df Merge branch 'release/v4.4.1' core-win-32/master-2 core-linux-64/master-2 2017-07-05 11:47:48 +03:00
6fc611fdfc XlsFormat - convert pivot tables v4.5.dev.27 core-win-32/develop-25 core-win-64/develop-402 v4.5.dev.26 2017-07-04 18:50:39 +03:00
0cabb63336 debug core-win-64/develop-401 v4.5.dev.23 v4.5.dev.24 v4.5.dev.25 2017-07-04 13:54:52 +03:00
f501bf7930 remove curl for ios 2017-07-04 11:52:23 +03:00
7b617dc9e9 fix curl path v4.5.dev.22 2017-07-04 10:40:26 +03:00
245f989ae3 XlsFormat... core-win-64/develop-399 core-win-32/develop-24 2017-07-03 19:27:46 +03:00
429729b979 remade build.bat 2017-07-03 18:17:49 +03:00
d709652992 debug core-win-64/develop-398 v4.5.dev.20 2017-07-03 17:01:02 +03:00
776d799fd2 Debug 2017-07-03 16:50:49 +03:00
a975cb8261 Merge pull request #32 from ONLYOFFICE/feature/lenas-fixes
Feature/lenas fixies
v4.4.1.37 v4.4.1.36 core-linux-64/release%2Fv4.4.1-14 core-linux-64/release%2Fv4.4.1-13 v4.4.1.38 v4.4.1.39 core-linux-64/release%2Fv4.4.1-15 core-win-64/releaseFv4.4.1-12 core-win-32/releaseFv4.4.1-6
2017-07-03 16:36:04 +03:00
c932b5af26 Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop
* 'develop' of https://github.com/ONLYOFFICE/core:
  XlsFormat - convert pivot tables view
  Added scripts for fetching and building curl
  Removed curl sources
  refactoring
  refactoring
  XlsFormat ...
  XlsFormat ...
  .
  .
  .
  .
  min command length
  XlsFormat - convert piot cache
  x2t - return error code by PptConvert
  memset before readlink.
2017-07-03 16:06:14 +03:00
423e8dda86 chart-settings seralize 2017-07-03 16:06:02 +03:00
afcf6b079e . 2017-07-03 15:56:21 +03:00
3ed2224f93 . 2017-07-03 15:56:08 +03:00
5307855120 XlsFormat - convert pivot tables view 2017-07-03 15:10:00 +03:00
3c9a91af45 Added scripts for fetching and building curl v4.5.dev.19 2017-07-03 14:46:56 +03:00
9f06f94c93 Removed curl sources v4.5.dev.18 core-win-64/develop-397 2017-07-03 12:45:30 +03:00
4954ef2934 refactoring core-linux-64/develop-456 2017-07-03 10:27:49 +03:00
721e8800f1 refactoring 2017-07-03 10:27:23 +03:00
ef8e5cab6d XlsFormat ... core-win-64/develop-396 core-linux-64/develop-455 2017-07-02 17:49:41 +03:00
028e58ad51 XlsFormat ... core-linux-64/develop-454 core-win-64/develop-395 2017-07-02 13:18:56 +03:00
424e0e34cc . core-win-64/develop-394 core-win-32/develop-23 core-win-64/develop-393 core-linux-64/develop-453 2017-07-01 17:56:12 +03:00
d8988cd101 . v4.5.dev.17 2017-07-01 16:33:36 +03:00
440a884c0a . core-linux-64/develop-452 v4.5.dev.16 core-win-64/develop-392 2017-07-01 14:38:46 +03:00
449bab1a70 . core-linux-64/develop-451 core-win-32/develop-22 core-win-64/develop-391 v4.5.dev.15 2017-06-30 19:42:25 +03:00
c1e5e33691 min command length core-linux-64/develop-450 core-linux-64/develop-449 core-win-64/develop-390 v4.5.dev.14 2017-06-30 17:30:03 +03:00
8c7515443a Merge remote-tracking branch 'origin/release/v4.4.1' into develop 2017-06-30 16:56:51 +03:00
1d16f4ab8f XlsFormat - convert piot cache 2017-06-30 16:55:37 +03:00
122a5cd056 x2t - return error code by PptConvert core-win-32/releaseFv4.4.1-5 core-linux-64/release%2Fv4.4.1-11 v4.4.1.35 v4.4.1.34 core-win-64/releaseFv4.4.1-11 core-linux-64/release%2Fv4.4.1-12 2017-06-30 16:21:07 +03:00
b0994759e7 memset before readlink. core-linux-64/release%2Fv4.4.1-10 core-win-64/releaseFv4.4.1-10 2017-06-30 15:02:21 +03:00
118f1c5736 . core-linux-64/develop-448 v4.5.dev.13 v4.5.dev.12 core-win-64/develop-389 2017-06-30 12:51:08 +03:00
b65703ceb1 . 2017-06-30 12:22:45 +03:00
c08c960c96 . 2017-06-30 12:22:37 +03:00
02ece25af8 . 2017-06-30 10:15:08 +03:00
435a27f6d9 Merge remote-tracking branch 'origin/release/v4.4.1' into develop 2017-06-29 19:26:31 +03:00
85ea22048a fix bug #35120 v4.4.1.33 v4.4.1.32 core-win-64/releaseFv4.4.1-8 v4.4.1.31 core-win-64/releaseFv4.4.1-9 core-linux-64/release%2Fv4.4.1-8 core-linux-64/release%2Fv4.4.1-9 v4.4.1.30 2017-06-29 19:25:23 +03:00
87ae0b38fa XlsFormat - read pivot cache stream 2017-06-29 19:05:45 +03:00
b93d463469 OdfFormat - fix roundRect v4.5.dev.9 core-linux-64/develop-445 v4.5.dev.10 2017-06-29 12:43:05 +03:00
0aa59b0d92 debug build v4.5.dev.8 core-win-64/develop-385 core-win-32/develop-20 core-linux-64/develop-444 2017-06-28 19:05:05 +03:00
3dbcce8c36 . 2017-06-28 18:39:37 +03:00