4088 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ElenaSubbotina	8efed345b0	fix bug #35412 v4.5.dev.89 v4.5.dev.92 v4.5.dev.97 v4.5.dev.98 v4.5.dev.90 v4.5.dev.91 core-win-64/develop-426 core-linux-64/develop-491 core-win-32/develop-37 v4.5.dev.93 v4.5.dev.94 v4.5.dev.96 v4.5.dev.95	2017-07-24 17:32:31 +03:00
Oleg Korshul	f5dcb1bed7	Merge branch 'hotfix/v4.4.2' into develop ... Conflicts: ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp core-win-64/develop-425 v4.5.dev.87 v4.5.dev.88	2017-07-24 15:46:05 +03:00
ElenaSubbotina	6b4695fc3a	.	2017-07-24 15:06:01 +03:00
ElenaSubbotina	bed884007c	PptxFormat - slide sections v4.5.dev.84 v4.5.dev.85 v4.5.dev.86	2017-07-23 16:38:57 +03:00
ElenaSubbotina	1aa0b03901	XlsFormat - fix pivots after testing core-win-64/develop-423 core-win-32/develop-35 v4.5.dev.83 v4.5.dev.82 v4.5.dev.81	2017-07-21 19:41:26 +03:00
ElenaSubbotina	e2ada4ca61	Merge commit '08e97b4a68950d969dce001f8e1ead84086c0244' into develop	2017-07-21 18:40:26 +03:00
ElenaSubbotina	d87649f08e	no message	2017-07-21 18:37:34 +03:00
Alexander Trofimov	3982ac06d2	Merge pull request #35 from ONLYOFFICE/feature/lena_fix_2 ... fix not compiled core-win-64/hotfixFv4.4.2-11 core-win-64/hotfixFv4.4.2-10 v4.4.2.20 core-win-32/hotfixFv4.4.2-5 core-linux-64/hotfix%2Fv4.4.2-11 core-linux-64/hotfix%2Fv4.4.2-10	2017-07-21 17:38:16 +03:00
Oleg Korshul	0a5d0af882	fix not compiled	2017-07-21 17:36:56 +03:00
Alexander Trofimov	08e97b4a68	Merge pull request #34 from ONLYOFFICE/feature/lenas-fixes ... Feature/lenas fixes v4.4.2.19	2017-07-21 16:21:05 +03:00
ElenaSubbotina	c4447d7396	fix bug #35395	2017-07-21 16:12:28 +03:00
ElenaSubbotina	c55af15ccd	. v4.5.dev.80	2017-07-21 15:47:36 +03:00
ElenaSubbotina	333d2fdbf0	fix	2017-07-21 15:36:47 +03:00
Oleg Korshul	a2bbb1640c	project for mac debug v4.5.dev.75 core-win-32/develop-34 v4.5.dev.76 v4.5.dev.77 v4.5.dev.78 v4.5.dev.74 core-win-64/develop-421	2017-07-20 17:46:38 +03:00
Oleg Korshul	7388bf871f	refactoring	2017-07-20 17:41:28 +03:00
ElenaSubbotina	493238d656	Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop ios/v2.0-235 v4.5.dev.73 core-win-64/develop-420	2017-07-20 16:40:01 +03:00
ElenaSubbotina	ea8dc009c9	OdfFormatReader - pilot(pivot) tables	2017-07-20 16:39:23 +03:00
Alexey.Musinov	9ade820313	Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop ... * 'develop' of https://github.com/ONLYOFFICE/core: . fix unsize shape text rect XlsFormat - pivot charts fix bug #35396. version up. . OdfFormatWriter - data label position XlsFormatReader - fix pivots	2017-07-20 16:38:41 +03:00
Alexey.Musinov	358c1613ad	fix bug #35395	2017-07-20 16:38:30 +03:00
ElenaSubbotina	b3a83ad699	. v4.5.dev.72 v4.5.dev.71	2017-07-20 13:28:58 +03:00
ElenaSubbotina	8d4e78ed40	fix unsize shape text rect	2017-07-20 13:28:52 +03:00
ElenaSubbotina	bde2c73f64	XlsFormat - pivot charts v4.5.dev.70	2017-07-20 11:14:47 +03:00
ElenaSubbotina	66fe9e6447	Merge remote-tracking branch 'origin/hotfix/v4.4.2' into develop v4.5.dev.69 v4.5.dev.67 core-win-64/develop-417 core-linux-64/develop-481 v4.5.dev.68 core-win-32/develop-33	2017-07-19 12:25:21 +03:00
ElenaSubbotina	f6d745cd25	Merge remote-tracking branch 'origin/hotfix/v4.4.2' into develop	2017-07-20 11:21:03 +03:00
ElenaSubbotina	002d30454c	fix bug #35396. version up.	2017-07-20 11:19:07 +03:00
ElenaSubbotina	ae2e9a5f26	. core-win-32/hotfixFv4.4.2-4 v4.4.2.17 v4.4.2.18 core-linux-64/hotfix%2Fv4.4.2-7 core-linux-64/hotfix%2Fv4.4.2-8 v4.4.2.16 v4.4.2.15 v4.4.2.14 core-win-64/hotfixFv4.4.2-8 core-win-64/hotfixFv4.4.2-7	2017-07-19 12:22:58 +03:00
ElenaSubbotina	c985d1e0a2	OdfFormatWriter - data label position ... XlsFormatReader - fix pivots core-linux-64/develop-480 core-win-32/develop-32 core-win-64/develop-415	2017-07-18 19:25:39 +03:00
ElenaSubbotina	5aaf90ebf2	Merge remote-tracking branch 'origin/hotfix/v4.4.2' into develop core-win-32/develop-31 v4.5.dev.60 core-win-64/develop-414 v4.5.dev.65 v4.5.dev.64 v4.5.dev.62 core-linux-64/develop-479 v4.5.dev.61	2017-07-17 19:43:41 +03:00
ElenaSubbotina	ebb9c89a0a	fix bug #35389 core-win-64/hotfixFv4.4.2-5 v4.4.2.12 core-linux-64/hotfix%2Fv4.4.2-5 core-win-32/hotfixFv4.4.2-3 v4.4.2.13 v4.4.2.10 v4.4.2.11	2017-07-17 19:42:35 +03:00
ElenaSubbotina	c4765e9f2e	fix bug #24236 core-linux-64/develop-478 v4.5.dev.59 core-win-64/develop-413	2017-07-17 17:39:50 +03:00
ElenaSubbotina	3ff5233ea4	Merge remote-tracking branch 'origin/hotfix/v4.4.2' into develop v4.5.dev.58 core-win-64/develop-412 core-linux-64/develop-477	2017-07-17 13:16:07 +03:00
ElenaSubbotina	4c7ab6e616	OdfFormatWriter - fix convert named range with formulas core-win-64/featureFnew-toolbar-1 core-linux-64/hotfix%2Fv4.4.2-4 v1.new.toolbar.24 v1.new.toolbar.23 v1.new.toolbar.20 core-linux-64/feature%2Fnew-toolbar-1 v1.new.toolbar.19 core-win-64/hotfixFv4.4.2-4 v4.5.devl.7 v4.5.devl.14	2017-07-17 13:13:29 +03:00
ElenaSubbotina	a88ad0c279	XlsFormat - fix calculations in pivot tables core-win-64/develop-411 v4.5.dev.54 core-linux-64/develop-476 v4.5.dev.57 v4.5.dev.56 v4.5.dev.55 core-win-32/develop-30	2017-07-14 11:43:16 +03:00
ElenaSubbotina	cf5458c761	XlsFormat - pivot tables core-win-32/develop-29 core-win-64/develop-410 v4.5.dev.53 core-linux-64/develop-475	2017-07-13 18:09:17 +03:00
ElenaSubbotina	9115edbd78	fix bug #35382.	2017-07-13 17:51:32 +03:00
Sergey Konovalov	3f18f96171	codegen change Pivot constants format core-linux-64/develop-474	2017-07-13 17:13:38 +03:00
ElenaSubbotina	8a75916944	XlsFormat - pivots dB connections v4.5.dev.50 core-win-64/develop-409 core-win-32/develop-28 v4.5.dev.51 v4.5.dev.52 core-linux-64/develop-473	2017-07-12 16:40:36 +03:00
ElenaSubbotina	da45eb4f33	XlsFormat - pivots... v4.5.dev.49 v4.5.dev.48 core-win-64/develop-408 core-linux-64/develop-472	2017-07-12 11:25:12 +03:00
ElenaSubbotina	59d75ed148	XlsFormat - fix pivots core-win-64/develop-407 v4.5.dev.39 v4.5.dev.38 core-linux-64/develop-471 v4.5.dev.37 v4.5.dev.43 v4.5.dev.42 v4.5.dev.41 core-win-32/develop-27 v4.5.dev.44 v4.5.dev.45 v4.5.dev.46 v4.5.dev.36 v4.5.dev.35 v4.5.dev.47 v4.5.dev.40	2017-07-06 19:09:06 +03:00
ElenaSubbotina	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
ElenaSubbotina	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
ElenaSubbotina	7852b7fbe8	.	2017-07-06 15:35:14 +03:00
Alexey Golubev	a64fd8792d	Fixed build error v4.5.dev.32 core-linux-64/develop-469	2017-07-06 12:19:50 +03:00
Alexey.Musinov	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
Alexey.Musinov	b3384f1466	chart-settings seralize	2017-07-05 15:35:46 +03:00
Oleg Korshul	93274395a9	.	2017-07-05 13:55:37 +03:00
ElenaSubbotina	2726e14445	Merge remote-tracking branch 'origin/hotfix/v4.4.2' into develop	2017-07-05 13:46:05 +03:00
ElenaSubbotina	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
Alexey Golubev	8c2637b89c	Merge tag 'v4.4.1' into develop ... v4.4.1 v4.5.dev.28	2017-07-05 11:48:04 +03:00
Alexey Golubev	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