277 Commits

Author	SHA1	Message	Date
Holger Lösken	71ab4dc3d8	Refactor docblocks, unused vars, unused uses	2016-07-14 22:37:04 +02:00
Hillel Coren	8590f9ad17	Working on new pricing	2016-07-14 12:46:00 +03:00
Hillel Coren	fa9b0bf78b	Working on buy now buttons	2016-07-13 12:03:39 +03:00
Hillel Coren	243005b667	Prevent expense or task invoice item from creating a product	2016-07-11 20:17:41 +03:00
Hillel Coren	986487b4c9	Working on new hosted pricing	2016-07-11 20:08:43 +03:00
Hillel Coren	afb34d1de6	Fix saving task without a client	2016-07-10 13:20:22 +03:00
Hillel Coren	5f8ae65310	Working on expense category permissions	2016-07-07 11:44:15 +03:00
Hillel Coren	cd9aae1e22	Working on expense categories	2016-07-06 21:35:16 +03:00
Hillel Coren	8b14161d0a	Fix for expense test	2016-07-04 12:41:44 +03:00
Hillel Coren	6f1776004a	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-07-04 09:40:06 +03:00
Holger Lösken	0fbda85a59	Code Refactoring ... - Removed unused uses - Type hinting for method parameters - Removed commented code - Introduced comments for classes and methods - Short array syntax	2016-07-03 16:19:22 +00:00
Hillel Coren	d2c0003ec9	Fix for should be invoiced option on expense	2016-07-03 16:20:10 +03:00
Hillel Coren	32a2f6cdc7	Fix for #920	2016-07-03 12:33:35 +03:00
Hillel Coren	fbdabdee64	Minor formatting change	2016-06-30 21:05:02 +03:00
Hillel Coren	5ff69c6f29	Payments refactor	2016-06-20 17:14:43 +03:00
Hillel Coren	5c7a15ff83	Minor fixes	2016-06-05 19:10:15 +03:00
Hillel Coren	a7f92d0726	Merge pull request #901 from joshuadwire/wepay-integration ... Wepay integration	2016-06-03 11:20:31 +03:00
Hillel Coren	0acf4ff1fc	Support importing JSON file	2016-06-02 22:03:59 +03:00
Joshua Dwire	49d47bb9e3	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-06-01 16:46:03 -04:00
Hillel Coren	17eb2a7a79	Support saving invoice_id and expense_id with the document	2016-06-01 12:39:42 +03:00
Hillel Coren	51d9b2b427	Prevent converting a qoute from incrementing the counter	2016-06-01 10:56:44 +03:00
Hillel Coren	42ac9507e5	Enabled importing products	2016-05-31 23:15:55 +03:00
Hillel Coren	2f3c309d41	Remove fallback support for dropzone	2016-05-30 11:51:41 +03:00
Hillel Coren	a9302d4d01	Fixes for is_quote	2016-05-29 15:34:44 +03:00
Hillel Coren	cca6dcfc4a	Merge pull request #878 from benb969/invoices_types ... add support to multiple invoice types	2016-05-29 12:21:57 +03:00
ben	dadac05532	add support to multiple invoice types	2016-05-29 12:02:44 +03:00
Joshua Dwire	1c119fe35a	ACH autobill bug fixes	2016-05-26 15:22:09 -04:00
Hillel Coren	0da3741b56	Fixed date formatting in document list	2016-05-26 18:28:13 +03:00
Joshua Dwire	c9f00274b1	Support storing WePay bank tokens	2016-05-25 15:04:58 -04:00
Hillel Coren	85184f9a5b	check document completed upload before user submitted form	2016-05-25 21:42:22 +03:00
Joshua Dwire	a5fdb88d79	Add support for auto bill on due date	2016-05-24 22:49:06 -04:00
Joshua Dwire	f8835268b4	Update DB structure	2016-05-24 14:16:42 -04:00
Hillel Coren	541b19cd5f	Updated vendor expenses to new datatable class	2016-05-23 21:03:01 +03:00
Hillel Coren	e7bf0599db	Separated out entity datatable classes	2016-05-23 19:52:20 +03:00
Hillel Coren	86240affab	Show company name in client portal dashboard activities	2016-05-23 09:02:31 +03:00
Hillel Coren	6caf1ff30d	Minor fixes	2016-05-19 09:47:57 +03:00
Hillel Coren	a82437b2bc	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop ... Conflicts: app/Http/routes.php resources/lang/en/texts.php	2016-05-16 11:34:00 +03:00
Joshua Dwire	d99d81d655	Make autobill setting numbers match token settings	2016-05-14 23:15:22 -04:00
Joshua Dwire	947cb4a6f7	Better WePay configuration support	2016-05-14 17:23:20 -04:00
Hillel Coren	f873998e22	Simplified reseller setup	2016-05-13 12:23:13 +03:00
Joshua Dwire	88c9fc1ac1	Add WePay configuration UI	2016-05-11 22:55:37 -04:00
Joshua Dwire	41f4c98e08	Merge remote-tracking branch 'upstream/develop' into payments-changes	2016-05-10 10:25:42 -04:00
Joshua Dwire	20f6f32a06	Update UI for configuring auto bill	2016-05-09 16:29:02 -04:00
Hillel Coren	9b0f086cbd	Only show user’s own tokens	2016-05-08 21:50:35 +03:00
Hillel Coren	fec948f1e8	Fixed searching for non-admins	2016-05-08 21:29:49 +03:00
Hillel Coren	7c67e66fb0	Sync ninja client when updating plan	2016-05-08 15:37:32 +03:00
Hillel Coren	eff9ba5ac0	Merge pull request #846 from Rayvw/feature/improve-dynamic-dates ... Improved dynamic dates of recurring invoices	2016-05-08 11:20:18 +03:00
Hillel Coren	89b5d73615	Fix for loading tokens	2016-05-08 10:05:16 +03:00
Raymond	986156117e	Copy custom values of invoice items	2016-05-07 15:29:27 +02:00
Raymond	e4ce4e0fc8	Added dynamic dates to custom invoice fields + fixed bug in processing of notes, terms and footer.	2016-05-07 15:06:56 +02:00