1302 Commits

Author	SHA1	Message	Date
Hillel Coren	d1de95303b	Merge branch 'master' of github.com:hillelcoren/invoice-ninja	2015-12-28 12:16:03 +02:00
Hillel Coren	2ead34fef0	Enabled setting reminder before/after due date or invoice date	2015-12-28 12:15:56 +02:00
David Bomba	4bcf8c1922	date formatting products	2015-12-28 20:14:21 +11:00
Hillel Coren	9943c824dd	Bug fixes	2015-12-27 14:45:57 +02:00
Hillel Coren	8d61925e06	Merge branch 'master' of github.com:hillelcoren/invoice-ninja	2015-12-27 13:38:01 +02:00
Hillel Coren	6f2c3c76a3	Bug fixes	2015-12-27 13:37:54 +02:00
David Bomba	5b87821774	Merge remote-tracking branch 'upstream/master'	2015-12-27 22:34:16 +11:00
Hillel Coren	c493f6e49a	Working on the API	2015-12-27 13:08:58 +02:00
Hillel Coren	ddd5915ca1	git update	2015-12-27 09:36:22 +02:00
David Bomba	5a03b923db	Merge branch 'master' of https://github.com/turbo124/invoice-ninja	2015-12-25 11:16:11 +11:00
Hillel Coren	991b19b2a2	Bug fixes	2015-12-24 13:17:11 +02:00
Hillel Coren	c0409b86fd	Added custom labels to email variables	2015-12-23 16:21:48 +02:00
Hillel Coren	3f1891fa3b	Bug fixes	2015-12-23 13:49:49 +02:00
Hillel Coren	9341ea0c87	Bug fixes	2015-12-22 14:06:53 +02:00
David Bomba	d044cffa44	Merge remote-tracking branch 'upstream/master'	2015-12-22 22:19:43 +11:00
David Bomba	087b60a503	additional GET for user_accounts	2015-12-22 22:19:21 +11:00
Hillel Coren	8739a1b46b	Merge branch 'master' of github.com:hillelcoren/invoice-ninja	2015-12-21 21:58:02 +02:00
Hillel Coren	9603c43277	Bug fixes	2015-12-21 21:57:55 +02:00
David Bomba	68ee5d04a4	Tax Rate Transformer added	2015-12-21 18:36:29 +11:00
David Bomba	083e995e2b	Working on API Transformers	2015-12-20 08:30:06 +11:00
David Bomba	79bef21e82	Added currency_id to client transformer	2015-12-18 19:33:14 +11:00
Hillel Coren	14152fd3f1	Added HTML formatting to system emails	2015-12-17 20:03:32 +02:00
Hillel Coren	b57866456c	Bug fixes	2015-12-17 10:21:31 +02:00
Hillel Coren	c854f6ba16	Merge branch 'master' of github.com:hillelcoren/invoice-ninja	2015-12-17 10:20:02 +02:00
Hillel Coren	372ffb0ea9	Bug fixes	2015-12-17 10:19:56 +02:00
David Bomba	75fa8566c3	custom taxes boolean added to transformer	2015-12-17 13:33:40 +11:00
Hillel Coren	4dc7a8d5f1	Working on email markup	2015-12-16 13:49:26 +02:00
Hillel Coren	f4863d3ec0	Added email settings page	2015-12-15 23:06:42 +02:00
Hillel Coren	399ad76fc3	Merge branch 'master' of github.com:hillelcoren/invoice-ninja	2015-12-15 22:25:19 +02:00
Hillel Coren	08a4c4dcb4	Added email settings page	2015-12-15 22:25:12 +02:00
David Bomba	bc41eb0c42	Working on API	2015-12-15 22:03:01 +11:00
Hillel Coren	e893d74b41	Added company website	2015-12-14 23:05:17 +02:00
Hillel Coren	c5c5ff3458	Working on data import	2015-12-14 22:07:48 +02:00
Hillel Coren	5547f222e1	Added warning for token mismatch error	2015-12-13 23:22:06 +02:00
Hillel Coren	19d5d49e63	Working on #427	2015-12-13 22:12:54 +02:00
Hillel Coren	4b328acc67	Working on #427	2015-12-10 21:36:34 +02:00
Hillel Coren	1783cb5129	Working on data import	2015-12-10 15:35:40 +02:00
Hillel Coren	ff139bc09c	Working on data import	2015-12-10 12:57:51 +02:00
Hillel Coren	d98a185c04	Fix for #557	2015-12-09 18:08:24 +02:00
Hillel Coren	3a5f2ebaf7	Fix for #557	2015-12-09 17:54:24 +02:00
Hillel Coren	0aca2e7fb4	Added check for account data	2015-12-09 17:47:14 +02:00
Hillel Coren	6fc8f76ea8	Working on data import	2015-12-08 12:10:20 +02:00
Hillel Coren	e46d804cd7	Working on importing data from more providers	2015-12-07 23:41:48 +02:00
Hillel Coren	f600cbb6dd	Merge branch 'master' of github.com:hillelcoren/invoice-ninja	2015-12-07 15:35:02 +02:00
Hillel Coren	1a474f362f	Added support for country specific Euro formatting	2015-12-07 15:34:55 +02:00
David Bomba	def729bfac	Added additional fields to invoice transformer	2015-12-04 10:02:31 +11:00
David Bomba	7182078acb	Added additional fields to transformer	2015-12-04 10:00:39 +11: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	30631b2bc4	Optimized client view page	2015-11-29 18:00:50 +02:00
Hillel Coren	44336fd7c4	Bug fixes	2015-11-29 12:58:40 +02:00
Hillel Coren	72d906d6d2	Auto increment invoice number counter	2015-11-29 12:41:32 +02:00
Hillel Coren	68bb3c8a82	Added .env field for MySQL strict mode	2015-11-29 12:12:59 +02:00
Hillel Coren	64fec3b502	Updated to phantomjscloud v2 API	2015-11-28 22:00:24 +02:00
Hillel Coren	c6c9a34c04	Set default invoice values	2015-11-28 19:19:37 +02:00
Hillel Coren	cf458c52a2	Working on the API	2015-11-27 14:55:28 +02:00
Hillel Coren	1497b99b36	Update client API controller to use transformations	2015-11-25 13:44:43 +02:00
Hillel Coren	1a37a197a5	Working on CSV import	2015-11-25 11:35:24 +02:00
Hillel Coren	a324434375	Working on invoice CSV import	2015-11-24 23:10:09 +02:00
Hillel Coren	dbe7de2d05	Working on invoice CSV import	2015-11-24 22:54:04 +02:00
Hillel Coren	bc14df4658	Working on invoice CSV import	2015-11-24 22:41:08 +02:00
Hillel Coren	ae57fdf9a3	Updated readme	2015-11-24 21:45:38 +02:00
rafael.sisweb	5888fdf12a	Missing action header on datatables	2015-11-24 06:59:30 -05:00
Hillel Coren	681e14c63e	Merge branch 'master' of github.com:hillelcoren/invoice-ninja	2015-11-22 12:00:03 +02:00
Hillel Coren	5d26eadb9c	Removed ENV_PRODUCTION	2015-11-22 11:59:56 +02:00
David Bomba	78c74471cd	Merge pull request #546 from turbo124/master ... Additional statics included in API	2015-11-22 08:12:10 +11:00
David Bomba	f3960d799e	Additional statics included in API	2015-11-22 08:11:23 +11: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
David Bomba	6461ff3d4f	added user_id to invoicetransformer	2015-11-21 20:31:31 +11:00
David Bomba	e8239bbf37	Added InvoiceStatus to static api call	2015-11-20 08:30:30 +11:00
Hillel Coren	d35b0f7f35	Added products to the API	2015-11-19 13:50:35 +02:00
Hillel Coren	01946f7bc8	Added static data to the API	2015-11-19 13:37:30 +02:00
David Bomba	43b6e749c3	transformation of IDs to PUBLIC_IDs	2015-11-19 19:42:53 +11:00
David Bomba	f2fdb7f51c	Merge pull request #535 from turbo124/master ... swapped out user_id for public_id	2015-11-19 14:03:16 +11:00
David Bomba	2866201416	swapped out user_id for public_id	2015-11-19 13:58:40 +11:00
Hillel Coren	dede870fed	Bug fixes	2015-11-19 00:02:01 +02:00
Hillel Coren	4a0906a92c	Bug fixes	2015-11-18 23:37:11 +02:00
Hillel Coren	947b9690d6	Cleaning up code	2015-11-18 19:42:09 +02:00
Hillel Coren	bcad8af535	Working on import	2015-11-18 19:16:23 +02:00
Hillel Coren	73a0192446	Working on import	2015-11-18 18:08:37 +02:00
Hillel Coren	5c6b2fe906	Working on import	2015-11-18 16:40:50 +02:00
Hillel Coren	24bcb0e2e5	Merging import changes	2015-11-17 15:53:14 +02:00
Hillel Coren	9f4cd62832	Add space	2015-11-17 15:42:54 +02:00
Hillel Coren	1d82881814	Removing payments of archived/deleted invoices from the dashboard	2015-11-17 10:55:33 +02:00
Hillel Coren	b4e5690103	Fixed problem creating client with invoice in the API	2015-11-17 10:46:14 +02:00
Hillel Coren	cd3aecdf5b	Clarifying email errors	2015-11-16 21:51:34 +02:00
Hillel Coren	3767a8a6a7	Bug fixes	2015-11-16 21:29:22 +02:00
Hillel Coren	eaf73077b1	Bug fixes	2015-11-16 21:21:48 +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
Hillel Coren	e93a7aa915	Bug fixes	2015-11-16 14:30:44 +02:00
Hillel Coren	d68b78f926	Merge branch 'master' of github.com:hillelcoren/invoice-ninja	2015-11-15 19:23:56 +02:00
Hillel Coren	9a0058deb1	Bug fixes	2015-11-15 19:23:45 +02:00
David Bomba	325605de8f	Merge pull request #527 from turbo124/master ... Flattened API JSON output	2015-11-15 22:08:13 +11:00
David Bomba	d5cf1279c7	Modifying JSON structure for API	2015-11-15 22:04:06 +11:00
David Bomba	e3c7fa572b	Modifying JSON structure for API	2015-11-15 21:43:32 +11:00