Commit Graph

164 Commits

Author SHA1 Message Date
4fd2b6f1d3 Merge branch 'feat/table-merge-fix' 2019-02-26 22:32:21 +00:00
c9fb9a827d Version bump 2019-02-26 21:54:33 +00:00
a6077b8f16 dont run coverage if publishing 2019-02-08 12:06:50 +00:00
40730548bb Add webpack type definitions 2019-01-23 20:09:32 +00:00
1f98d9461b Merge pull request #250 from dolanmiu/feat/number-of-pages
Feat/number of pages
2019-01-16 01:18:11 +01:00
8dc590746b Version bump 2019-01-16 00:15:27 +00:00
475a132ce0 Fix e2e test 2019-01-15 00:50:38 +00:00
b37d2c141d Add new e2e command 2019-01-15 00:23:01 +00:00
677300e34f Merge pull request #237 from dolanmiu/feat/image-wrap
Merge 4.6.0 into master
2019-01-10 23:53:00 +00:00
da0fa86345 Version bump 2019-01-10 02:37:40 +00:00
9271b2d11a Merge pull request #235 from dolanmiu/feat/floating-images
Feat/floating images
2019-01-09 21:33:52 +00:00
f717126145 Remove image-size dependency 2019-01-09 02:08:47 +00:00
abd5ace85c Merge branch 'master' of https://github.com/dolanmiu/docx into feat/floating-images
# Conflicts:
#	src/file/drawing/drawing.ts
2019-01-09 02:04:06 +00:00
a37ff90bd7 Version bump 2019-01-09 01:53:12 +00:00
d3af3663ec Merge branch 'release/4.4.1' 2018-12-10 19:33:00 +00:00
3a1a21e498 Version bump 2018-12-10 19:27:51 +00:00
7b47dadede Fix Prettier styling 2018-11-11 22:54:35 +00:00
f640f17fa6 Merge pull request #193 from dolanmiu/4.4.0
Version bump
2018-11-08 12:05:31 +00:00
f091cff7c9 Version bump 2018-11-07 01:06:59 +00:00
7980f14efb Introduce some functional programming techniques 2018-11-02 02:51:57 +00:00
a84eb16392 Merge branch 'master' into importDotx
# Conflicts:
#	src/import-dotx/import-dotx.ts
2018-10-31 22:09:36 +00:00
ea3777d28b Better naming 2018-10-26 20:30:42 +01:00
3346b97ee7 Clean up 2018-10-26 20:23:26 +01:00
21df53d547 Clean up 2018-10-26 20:16:18 +01:00
9143c1c2c1 Add nyc support 2018-10-26 20:11:40 +01:00
1eed844b9a Merge pull request #179 from dolanmiu/feat/import-dotx
Feat/import dotx
2018-10-23 00:47:18 +01:00
fea6afdfe4 Remove npm dependency 2018-10-22 20:27:32 +01:00
6ec2e742ef Merge branch 'master' into importDotx 2018-10-22 20:25:34 +01:00
3f3fd05cb1 works 2018-10-17 09:15:32 +03:00
a466578467 Version bump 2018-10-15 23:34:35 +01:00
e02ac43c07 Version bump 2018-10-10 20:39:11 +01:00
466e880bfc Merge from master 2018-09-25 23:46:55 +01:00
90f3da74cf Version bump 2018-09-20 21:04:21 +01:00
e6d4741955 Merge branch 'master' of https://github.com/dolanmiu/docx into importDotx
# Conflicts:
#	src/file/file.ts
2018-09-19 01:53:52 +01:00
2dab11e8b3 minimum 8 2018-08-31 11:25:05 -04:00
010fde6258 commit 2018-08-29 18:36:48 +03:00
60abe4857b Version bump 2018-08-23 01:26:30 +01:00
fe2032a3d4 change demos to typescript and WidthType disparity 2018-08-23 01:05:26 +01:00
eb9cc767c6 Merge from master 2018-08-21 20:59:20 +01:00
a777842f9d updated mocha to version 5 due to vulnerabilities found by npm audit 2018-08-21 07:16:27 -03:00
a7f6224fb2 Made demo files into typescript files 2018-08-21 02:46:21 +01:00
07261232ff Removed old compiler and unused dependencies 2018-08-15 01:22:22 +01:00
bfa0edeb09 Remove pdf packer 2018-08-14 21:56:38 +01:00
f15fdb921e Merge branch 'master' into feat/browser-packer
# Conflicts:
#	demo/demo13.js
#	package.json
#	src/export/packer/compiler.ts
#	src/file/media/data.ts
#	src/file/media/media.ts
2018-08-10 01:40:29 +01:00
94274733f4 Improve API documentation 2018-08-08 22:51:54 +01:00
e9aecfac1c Updated lint rules 2018-08-07 01:38:15 +01:00
257c8bde99 Add pre-commit hook 2018-08-06 03:26:30 +01:00
73267ac4e5 Add docsify documentation 2018-08-03 23:26:14 +01:00
ee048968cc Update request promise and pin types/bluebird 2018-07-21 01:42:34 +01:00
b9e7b9e1e3 Update typedoc 2018-07-21 01:21:28 +01:00