2886 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Hillel Coren	b5bb8d5011	Working on TravisCI - updated composer.json	2016-02-17 18:10:50 +02:00
Hillel Coren	66f2df132d	Working on TravisCI	2016-02-17 18:07:39 +02:00
Hillel Coren	e4b8b85839	Working on TravisCI	2016-02-17 18:05:14 +02:00
Hillel Coren	8ddd281e83	Working on TravisCI	2016-02-17 18:00:07 +02:00
Hillel Coren	e19e888a17	Working on TravisCI	2016-02-17 17:59:32 +02:00
Hillel Coren	1ebea445a9	Updated travis to remove prefer-dist	2016-02-17 17:57:49 +02:00
Hillel Coren	94ecfbb5a3	Updated travis to run composer install	2016-02-17 17:54:17 +02:00
Hillel Coren	4a1bb71ea4	Working on Travis, merging from #671	2016-02-17 17:50:56 +02:00
Hillel Coren	25d2af4891	Working on download PDF route	2016-02-17 17:50:01 +02:00
Hillel Coren	34b3501842	Working on Travis, merging from #671	2016-02-17 17:47:46 +02:00
Hillel Coren	fdab849705	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-02-17 15:55:47 +02:00
Hillel Coren	611d908112	Fixed sorting expenses by status	2016-02-17 15:55:31 +02:00
Hillel Coren	a489c2cab8	Made expense currency conversion hidden by default	2016-02-17 15:52:16 +02:00
Hillel Coren	eac4c823d3	Made expense currency conversion hidden by default	2016-02-17 13:06:03 +02:00
David Bomba	cea1ee8701	Merge pull request #728 from turbo124/develop ... Working on API	2016-02-17 21:53:05 +11:00
David Bomba	992802c164	Working on API functionality	2016-02-17 21:50:52 +11:00
David Bomba	6d09bda646	Working on API functionality	2016-02-17 21:16:13 +11:00
Hillel Coren	ee516cb327	Combined search and history in navbar	2016-02-17 12:12:39 +02:00
Hillel Coren	0e2bf3bb88	Focus the search input if the user clicks forward slash	2016-02-17 11:49:20 +02:00
David Bomba	aef4658873	Api work/Bug fixes	2016-02-17 19:10:33 +11:00
David Bomba	35d905f4f4	Merge pull request #727 from turbo124/develop ... API work	2016-02-17 14:47:36 +11:00
David Bomba	a6e9c5198d	Bug fixes	2016-02-17 14:46:28 +11:00
David Bomba	9428557e70	Bug Fixes	2016-02-17 14:43:25 +11:00
David Bomba	f959164f2a	Expense and Vendor Transformers for API	2016-02-17 14:32:20 +11:00
David Bomba	e3ee79f369	Improving error reporting API	2016-02-17 10:44:01 +11:00
David Bomba	7da522599c	Improving error reporting API	2016-02-17 10:36:45 +11:00
David Bomba	7cd3bac29c	Improving error reporting API	2016-02-17 10:35:54 +11:00
David Bomba	1a953c5bcb	Improving error reporting API	2016-02-17 10:34:23 +11:00
David Bomba	3e4df4ff4f	Improving error reporting API	2016-02-17 10:29:18 +11:00
David Bomba	09650123d7	Improving error reporting API	2016-02-17 10:05:08 +11:00
David Bomba	a1be1f3529	Improving error reporting API	2016-02-17 09:45:28 +11:00
David Bomba	1fde9261e6	Improving error reporting API	2016-02-17 09:38:23 +11:00
David Bomba	170ee5a40b	Improving error reporting API	2016-02-17 09:28:00 +11:00
David Bomba	31720b59fd	Improving error reporting API	2016-02-17 09:12:34 +11:00
David Bomba	746b6ef362	Improving error reporting API	2016-02-17 09:09:32 +11:00
Hillel Coren	2295102b98	Adding back change from conflict	2016-02-17 00:07:05 +02:00
Hillel Coren	2de09d9835	Merge branch 'release-2.5.0.2' into develop	2016-02-17 00:03:40 +02:00
Hillel Coren	8735409753	Merge branch 'release-2.5.0.2' ... Conflicts: app/Http/Controllers/ClientApiController.php	2016-02-17 00:03:23 +02:00
Hillel Coren	c9f58ce2d3	Bumped version number to 2.5.0.2	2016-02-16 23:59:24 +02:00
David Bomba	4a033ce925	Improving error reporting API	2016-02-17 08:57:06 +11:00
Hillel Coren	aad648b901	Fix for 'model not defined' error	2016-02-16 23:56:59 +02:00
David Bomba	1ab4bb636f	Improving error reporting API	2016-02-17 08:48:10 +11:00
Hillel Coren	81f08cdd17	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-02-16 17:30:30 +02:00
Hillel Coren	049c20f062	Zapier improvements	2016-02-16 17:30:09 +02:00
David Bomba	00457879af	Merge pull request #723 from turbo124/develop ... Error handling	2016-02-16 10:31:00 +11:00
David Bomba	3c2b0ba45d	Error handling	2016-02-16 10:30:28 +11:00
David Bomba	cacc24ede4	Merge pull request #722 from turbo124/api_errors ... Improve error handling in API	2016-02-16 10:28:31 +11:00
Hillel Coren	ae6a81ea48	Added improved fr_CA translation	2016-02-15 20:22:02 +02:00
Hillel Coren	0ea8461706	Fixed problem with search when using foreign language	2016-02-15 20:15:45 +02:00
Hillel Coren	668eab0279	Hide ‘Client Portal’ settings for hosted users	2016-02-15 20:05:41 +02:00