1706 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hillel Coren	156ca3cb86	Commenting out API command	2015-11-07 19:59:14 +02:00
Hillel Coren	1a527a610a	Merge pull request #509 from juanluisbaptiste/master ... Updated spanish translation for version 2.4.5.	2015-11-07 19:35:18 +02:00
David Bomba	81fc77d142	Mapped transformers	2015-11-07 23:15:37 +11:00
Juan Luis Baptiste	b5b3ce404c	Updated spanish translation for version 2.4.5.	2015-11-06 22:20:35 -05:00
David Bomba	d49f2fe9c9	automerge	2015-11-07 08:49:14 +11:00
Hillel Coren	15b17dfeed	Added view presenters	2015-11-06 12:59:53 +02:00
Hillel Coren	aa69a17232	Check for duplicate invoice number when approving a quote	2015-11-06 10:21:45 +02:00
Hillel Coren	a30b9039de	Bug fixes	2015-11-06 09:54:29 +02:00
Hillel Coren	c79ee49c1d	Merge pull request #507 from adamgoose/patch-1 ... Allow zero-costs	2015-11-06 08:52:07 +02:00
David Bomba	76f90b7ff3	Merge remote-tracking branch 'upstream/master'	2015-11-06 17:16:38 +11:00
Hillel Coren	002c994c0b	Refactoring datatable code	2015-11-06 01:14:00 +02:00
Hillel Coren	d147dba542	Refactoring datatable code	2015-11-06 00:46:02 +02:00
Hillel Coren	436b8be8d9	Refactoring datatable code	2015-11-06 00:37:04 +02:00
Adam Engebretson	303de7a0b6	Allow zero-costs ... Currently, the `parepareItem` method checks to see if the cost and notes evaluate to false. If so, it checks from the product list. However, we need the ability to set cost to zero explicitly through the API. This allows a user to pass null, which will use the default. Otherwise, passing 0 will persist.	2015-11-05 12:39:33 -06:00
David Bomba	a6201bb503	Merge branch 'master' of github.com:turbo124/invoice-ninja	2015-11-05 21:36:38 +11:00
Hillel Coren	0953fbe7cd	Added Quill to email signature	2015-11-05 12:02:14 +02:00
Hillel Coren	e18ae1aac0	Working on the API	2015-11-05 10:50:35 +02:00
Hillel Coren	cb243fec0a	Working on the API	2015-11-05 10:44:48 +02:00
Hillel Coren	d0f8ee7797	Added HTML editor for client emails	2015-11-04 23:52:12 +02:00
David Bomba	a7f2103a88	merge	2015-11-05 07:18:03 +11:00
Hillel Coren	5555000f83	Added additional OmniPay drivers	2015-11-04 20:13:15 +02:00
Hillel Coren	ffab252436	Working on the API	2015-11-04 17:23:22 +02:00
Hillel Coren	8abdc4a43f	Merge pull request #505 from eduardocruz/patch-1 ... Update on AccountController.php - fix CSV Client import	2015-11-04 17:11:53 +02:00
Eduardo Cruz	1042c54077	Update on AccountController.php - fix CSV Client import ... Fix CSV Client import	2015-11-04 11:35:42 -03:00
Hillel Coren	65e959e84d	Added system settings page	2015-11-04 15:57:59 +02:00
Hillel Coren	4b935f5844	Fixed issue when user has single company	2015-11-04 15:10:41 +02:00
Hillel Coren	72c7cbb237	Added 'apply credit' action	2015-11-04 09:48:47 +02:00
David Bomba	9738203e8c	merge	2015-11-04 11:34:17 +11:00
Hillel Coren	029e740a6c	Working on the API	2015-11-03 21:03:24 +02:00
Hillel Coren	ebd63f1805	Working on the API	2015-11-03 16:21:17 +02:00
Hillel Coren	26ec972819	Merge branch 'master' of github.com:hillelcoren/invoice-ninja	2015-11-03 13:20:55 +02:00
Hillel Coren	521fc107f1	Bug fixes	2015-11-03 13:20:49 +02:00
Hillel Coren	fd59d37285	Merge pull request #502 from turbo124/master ... Api Changes	2015-11-03 10:33:56 +02:00
David Bomba	d0f8fca420	api	2015-11-03 19:13:15 +11:00
David Bomba	6f320aa624	merge	2015-11-03 19:09:52 +11:00
David Bomba	9b54113b9b	Merge remote-tracking branch 'upstream/master'	2015-11-03 19:09:40 +11:00
David Bomba	ab930a2dbe	fixed pr issues	2015-11-03 18:54:57 +11:00
David Bomba	38c3f14081	working on api	2015-11-03 13:02:15 +11:00
David Bomba	c3066c824f	working on api	2015-11-03 10:55:31 +11:00
Hillel Coren	c3d43ab480	Bug fixes	2015-11-03 00:05:28 +02:00
David Bomba	d577a34675	fix conflicts	2015-11-03 08:47:32 +11:00
Hillel Coren	1ae35b853a	Merge pull request #500 from rafaelsisweb/master ... New texts on pt_br.	2015-11-02 23:06:08 +02:00
Rafael Almeida	71b66338e0	revert composer.lock to original of hillelcoren repo.	2015-11-02 15:52:53 -05:00
Rafael Almeida	2a61015e36	restore composer.lock file	2015-11-02 15:36:23 -05:00
Rafael Almeida	c8375ad983	Distinct text message when quote is converted or approved	2015-11-02 15:14:00 -05:00
Rafael Almeida	67a5d5d9cc	Merge remote-tracking branch 'upstream/master'	2015-11-02 14:35:59 -05:00
Rafael Almeida	d35e57a3a1	Adjust some terms on pt_br texts	2015-11-02 14:30:53 -05:00
Rafael Almeida	191d002597	PT_br new text strings	2015-11-02 14:07:55 -05:00
Hillel Coren	6130626422	Working on the API	2015-11-02 20:43:22 +02:00
Rafael Almeida	db97fa9c95	solve merge conflits	2015-11-02 11:28:01 -05:00