229 Commits

Author	SHA1	Message	Date
Hillel Coren	f5530a30b2	Revert "Re-revert "Improve Import Support"""	2015-12-31 15:36:53 +02:00
Hillel Coren	e60c52e93c	Revert "Revert "Improve Import Support""	2015-12-31 15:06:30 +02:00
Hillel Coren	fc0313bade	Revert "Improve Import Support"	2015-12-31 13:46:56 +02:00
Joshua Dwire	5932a837dd	Improve Import Support ... * Add support for payment imports * Add support for Wave Invoice import * Add ability to merge invoice line items into a single invoice	2015-12-30 00:14:14 -05:00
Hillel Coren	60daef8d58	Bug fixes	2015-12-29 19:49:40 +02:00
Christian González	966ff02ffd	removed German "Deppenleerzeichen"	2015-12-28 21:28:15 +01:00
Hillel Coren	2ead34fef0	Enabled setting reminder before/after due date or invoice date	2015-12-28 12:15:56 +02:00
Hillel Coren	3f1891fa3b	Bug fixes	2015-12-23 13:49:49 +02:00
Hillel Coren	9603c43277	Bug fixes	2015-12-21 21:57:55 +02:00
Hillel Coren	14152fd3f1	Added HTML formatting to system emails	2015-12-17 20:03:32 +02:00
Hillel Coren	f4863d3ec0	Added email settings page	2015-12-15 23:06:42 +02:00
Hillel Coren	08a4c4dcb4	Added email settings page	2015-12-15 22:25:12 +02:00
Hillel Coren	5547f222e1	Added warning for token mismatch error	2015-12-13 23:22:06 +02:00
Hillel Coren	c9bc85c382	Merge pull request #559 from CyBeRoni/fix-dutch-translations ... Update Dutch translations	2015-12-10 15:16:32 +02:00
Marco Wessel	893347ab65	Update Dutch translations ... starttijd should be one word Use consistent language for recurring invoice Be more consistent about BTW too notes aren't messages	2015-12-10 13:44:21 +01:00
Samuel Laulhau	80ddf1f998	typo in french	2015-12-10 11:18:42 +01:00
Hillel Coren	683f66762a	Merge pull request #556 from nerdoc/patch-13 ... de: gesendet -> versendet, for consistency	2015-12-09 16:13:55 +02:00
Christian González	99c7bdd337	de: gesendet -> versendet, for consistency ... part 2	2015-12-09 13:42:56 +01:00
Christian González	5415d04a3b	de: gesendet -> versendet, for consistency	2015-12-09 13:36:28 +01:00
Hillel Coren	254dd4ff53	Updated texts	2015-12-03 20:29:13 +02:00
Hillel Coren	19ce3e3063	Add settings help texts	2015-12-03 17:35:41 +02:00
Hillel Coren	c5a1abf66f	Added HTML email designs	2015-12-02 15:26:06 +02:00
rafael.sisweb	c182b67408	Remove action header again	2015-11-30 06:29:43 -05:00
Hillel Coren	b4f05440e5	Updated version and lang files	2015-11-30 09:21:46 +02:00
Hillel Coren	165ecd0bf0	Added support for Stripe.js	2015-11-29 22:13:50 +02:00
Hillel Coren	68bb3c8a82	Added .env field for MySQL strict mode	2015-11-29 12:12:59 +02:00
Hillel Coren	1a37a197a5	Working on CSV import	2015-11-25 11:35:24 +02:00
Hillel Coren	ae57fdf9a3	Updated readme	2015-11-24 21:45:38 +02:00
rafael.sisweb	a86ba6ed36	Merge remote-tracking branch 'upstream/master'	2015-11-23 08:50:49 -05:00
Hillel Coren	9b0426f4ab	Merge branch 'master' of github.com:hillelcoren/invoice-ninja	2015-11-21 23:10:35 +02:00
Hillel Coren	61ed298699	Minor improvements	2015-11-21 23:10:26 +02:00
Joris van de Sande	6e4c544fcc	Improved Dutch translations	2015-11-21 16:31:43 +01:00
Christian González	14374b71a8	removed spaces in composita	2015-11-20 14:03:07 +01:00
rafael.sisweb	a151e68111	New string to pt_BR	2015-11-20 06:04:00 -05:00
Linus Metzler	6d0051f8a2	Merge pull request #1 from limenet/patch-3 ... More German translations	2015-11-19 08:41:59 +01:00
Linus Metzler	f1e7a6870b	More German translations	2015-11-19 08:41:18 +01:00
Linus Metzler	3009822227	Added German translations	2015-11-19 08:30:18 +01:00
Hillel Coren	4a0906a92c	Bug fixes	2015-11-18 23:37:11 +02:00
Hillel Coren	bcad8af535	Working on import	2015-11-18 19:16:23 +02:00
Hillel Coren	636a2beada	Merge branch 'master' of github.com:hillelcoren/invoice-ninja	2015-11-18 16:41:01 +02:00
Hillel Coren	5c6b2fe906	Working on import	2015-11-18 16:40:50 +02:00
rafael.sisweb	3a82463f03	Sync new texts to pt-BR whith some fixes	2015-11-17 11:10:16 -05:00
rafael.sisweb	a8bc3f0663	Merge remote-tracking branch 'upstream/master'	2015-11-17 10:54:44 -05:00
Hillel Coren	24bcb0e2e5	Merging import changes	2015-11-17 15:53:14 +02:00
Hillel Coren	cd3aecdf5b	Clarifying email errors	2015-11-16 21:51:34 +02:00
Hillel Coren	ce4524ba1a	Bug fixes	2015-11-16 21:07:23 +02:00
Hillel Coren	1b099d09cc	Check for large logo image files	2015-11-16 20:02:04 +02:00
rafael.sisweb	eb0ab85300	Merge remote-tracking branch 'upstream/master'	2015-11-16 10:27:01 -05:00
Simon	61d6fb3961	French 95% translated	2015-11-16 14:18:33 +01:00
rafael.sisweb	d2290203cc	Sync with main repo	2015-11-16 06:26:47 -05:00