Commit Graph

273 Commits

Author SHA1 Message Date
e859821647 Merge remote-tracking branch 'origin/hotfix/v5.2.1' into develop 2018-10-09 17:02:46 +03:00
62d6581c43 DocFormatReader - fix bug #39236 2018-10-08 11:32:31 +03:00
f4d72572c0 Merge remote-tracking branch 'origin/hotfix/v5.2.1' into develop 2018-10-04 13:04:52 +03:00
9aad3d1adb x2t - ooxml - not strong encryption 2018-10-03 20:01:57 +03:00
474873531d OdfFormatReader - fix bug #39192 2018-10-02 14:47:38 +03:00
f9f26e84fd . 2018-09-30 14:35:49 +03:00
a3888a8186 . 2018-09-28 17:19:20 +03:00
2192bff46b Merge remote-tracking branch 'origin/hotfix/v5.2.1' into develop 2018-09-28 14:39:43 +03:00
c7eb16fa64 x2t - clear compiling warnings 2018-09-28 14:30:27 +03:00
e26f836da7 Merge commit '69d2b12f5315e96442fc5a0620d4f4c2070c4e77' into develop 2018-09-24 18:34:51 +03:00
3e5fed8482 x2t - fix return codes 2018-09-24 17:48:02 +03:00
3816162555 Merge commit '3fb166f99a211e85474c121009019d06710722f8' into develop 2018-09-10 18:43:15 +03:00
fb34d57ee6 DocFormatReader - fix footnotes for doc1995; optimization convert 2018-09-05 14:45:24 +03:00
da2d997838 . 2018-09-03 19:50:02 +03:00
677e3e49e0 . 2018-08-31 17:38:17 +03:00
02c84d107b Merge commit 'b59908e4c25b265641e77b2167826f236b3b9d64' into develop 2018-08-31 17:27:06 +03:00
49cd76d0f3 Ooxml encrypt files - add support compatibility with Office 2003-2007(+ add rc4 method to encrtypt); add des method in agile encryption 2018-08-30 17:47:17 +03:00
53a75261e3 . 2018-08-29 19:05:30 +03:00
a74c927e7e DocFormatReader - fix after testing 2018-08-28 15:13:41 +03:00
a232fcd9e1 DocFormatReader - fix bug #38524 2018-08-23 19:55:44 +03:00
6341cdbbdb [x2t] Write application and company name from environment variable 2018-08-09 19:35:51 +03:00
ccc27a2e1b x2t - fix after testing 2018-07-26 19:06:06 +03:00
7c3b060794 . 2018-07-24 17:01:49 +03:00
9601d90671 OdfFormatReader - fix dataValidations, conditional formating 2018-07-23 17:31:39 +03:00
adf2399368 x2t - DocFormat - fix after testing 2018-07-23 16:36:13 +03:00
f9b54bffd4 Merge remote-tracking branch 'origin/hotfix/v5.1.4' into develop
# Conflicts:
#	DesktopEditor/common/Directory.h
#	DesktopEditor/common/File.h
2018-05-04 16:12:30 +03:00
128529ba80 x2t - from https://github.com/ONLYOFFICE/core/pull/65. 2018-05-03 19:44:09 +03:00
449e3fc131 . 2018-05-03 16:18:33 +03:00
6afa54ebef x2t - fix users files 2018-04-28 17:04:49 +03:00
234459f37c x2t - fix bug 37579 2018-04-25 12:21:46 +03:00
85549c5b20 . 2018-04-20 13:35:30 +03:00
684d697cae Remove xml2, agg, freestyle include folders from projects 2018-04-19 16:37:04 +03:00
221d1ecbb5 x2t - fix test projects 2018-04-19 14:20:49 +03:00
bdb2ca8241 Merge remote-tracking branch 'origin/feature/core_dll' into develop 2018-04-19 13:20:07 +03:00
4055201322 . 2018-04-19 13:17:24 +03:00
8d750adb7b x2t (not complete) 2018-04-17 19:10:48 +03:00
f6305fca21 DocFormatReader - fix user file (table in table) 2018-04-17 12:50:15 +03:00
48a1f01220 DocFormatReader- fix users file (table) (#71) 2018-04-16 17:59:44 +03:00
a395420d59 DocFormatReader - fix user file(table) 2018-04-16 14:50:51 +03:00
0de5fb6bfc x2t - extended convert by UnicodeConverter 2018-04-10 19:58:48 +03:00
05bf38a35d x2t 2.4.525 linux build 2018-04-04 12:21:40 +03:00
c64a33f42d DocFormatReader - add older version format 2018-04-03 15:28:08 +03:00
0599018f99 Merge remote-tracking branch 'origin/hotfix/v5.1.1' into develop 2018-04-03 15:25:05 +03:00
d9bd1cdb32 x2t -fix users files 2018-04-02 17:14:46 +03:00
7df5ff1aeb DocFormatReader - add word doc without compound storage(earlier 1995) 2018-03-27 16:43:48 +03:00
628cb55e9b DocFormatReader - fix bug #36342 2018-03-12 17:30:50 +03:00
dfc92584f7 x2t -fix test projects 2018-03-05 16:48:06 +03:00
c3cd1afa85 Update copyright to 2018 2018-03-01 14:30:24 +03:00
7186b56b64 DocFormatReader - fix table mapping 2018-02-16 11:54:24 +03:00
ea37eab86e . 2018-02-07 13:15:58 +03:00