163 Commits

Author	SHA1	Message	Date
Hillel Coren	28d8e53764	Updated plan price field name	2016-07-10 16:53:01 +03:00
Hillel Coren	bf8ab297f9	Updated plan price field name	2016-07-10 16:49:48 +03:00
Hillel Coren	5fbae548e2	Updated plan price field name	2016-07-10 16:47:22 +03:00
Hillel Coren	afb34d1de6	Fix saving task without a client	2016-07-10 13:20:22 +03:00
Hillel Coren	3ae8df3fdf	Merge migrations	2016-07-10 12:45:42 +03:00
Hillel Coren	6756fde908	Merge pull request #955 from codedge/#583-Add-Task-creating-editing-to-activity-stream ... #583 add task creating editing to activity stream	2016-07-10 12:42:29 +03:00
Holger Lösken	d1dc1a7e5b	Added tasks to activity on dashboard ... - Fixes #583 and resolves #583 - Creating and updating tasks creates an activity now - Each has its own event - The activity is shown on the dashboard	2016-07-05 16:31:57 +00:00
Holger Lösken	fcc8cac7b5	Adding configuration for first day of the week ... - Fix #868 and resolves #868 - The first day of the week can be configured in localization settings, which affects the Bootstrap date picker	2016-07-04 16:20:22 +02:00
Hillel Coren	0cc0bcbdcf	Remove uses_local_payment_methods	2016-06-30 20:30:47 +03:00
Hillel Coren	5ff69c6f29	Payments refactor	2016-06-20 17:14:43 +03:00
Hillel Coren	e0d512dab7	Remove individual languages from migration files	2016-06-04 23:20:01 +03:00
Hillel Coren	5cda4c0dd9	Fix capitalization of migration file name	2016-06-03 11:29:03 +03:00
Joshua Dwire	49d47bb9e3	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-06-01 16:46:03 -04:00
Hillel Coren	162c6d2ce6	Changed attach defaults	2016-05-29 22:12:09 +03:00
Hillel Coren	7af05c077a	Fix for rollback	2016-05-29 17:36:36 +03:00
Hillel Coren	c254544b19	Added setting to hide second tax rate	2016-05-29 12:56:10 +03:00
ben	dadac05532	add support to multiple invoice types	2016-05-29 12:02:44 +03:00
Joshua Dwire	6ddbbbc64d	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-05-25 11:14:14 -04:00
Hillel Coren	4a4494a2f3	Fix for cancelled accounts	2016-05-25 16:16:34 +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	faec0a2f04	Fix for deleting account	2016-05-17 15:03:17 +03:00
Hillel Coren	bc0cd4ee52	Added fields for expense taxes	2016-05-17 10:47:24 +03:00
Bartlomiej Szala	9d67e54fbb	Add swap currency symbol to currency	2016-05-16 22:33:34 +02:00
Joshua Dwire	f6942a199f	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-05-15 21:21:59 -04:00
Joshua Dwire	d99d81d655	Make autobill setting numbers match token settings	2016-05-14 23:15:22 -04:00
Hillel Coren	6c4009d1ef	Fixes for initial setup	2016-05-12 20:27:24 +03:00
Hillel Coren	cca4e40ef5	Fix problem with migration	2016-05-12 12:44:44 +03:00
Joshua Dwire	0d41d8aeb6	Payments bug fixes - Part 2	2016-05-11 12:53:43 -04:00
Joshua Dwire	0ca073291e	Make storing card summary locally part of payments changes	2016-05-10 19:17:14 -04:00
Joshua Dwire	88ec714cd5	Store Stripe card summary locally	2016-05-10 18:46:32 -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
Joshua Dwire	0fc44962d4	Add Braintree/PayPal support	2016-05-06 22:33:03 -04:00
Joshua Dwire	cf98c37f40	Better Braintree support	2016-05-06 17:05:42 -04:00
Joshua Dwire	9a64db3234	Allow client to choose auto bill settings	2016-05-06 13:26:37 -04:00
Joshua Dwire	ed1f2b6044	Handle failed payments	2016-04-30 17:54:56 -04:00
Joshua Dwire	1cb2b9dc25	Use existing PaymentType instead of CardType	2016-04-27 22:13:51 -04:00
Joshua Dwire	42c1f537bc	Store/display credit card type, expiration and last 4 digits	2016-04-23 22:10:51 -04:00
Joshua Dwire	b8170f0324	Support refunds from the admin UI	2016-04-23 16:40:19 -04:00
Hillel Coren	ad68d64dca	Changes for white label license	2016-04-21 22:01:17 +03:00
Hillel Coren	b27505f63c	Fix for saving invoice client with id/public_id	2016-04-21 13:01:36 +03:00
Hillel Coren	6711678fbe	Merge pull request #822 from joshuadwire/enterprise-plan ... Improve enterprise plan migration	2016-04-20 19:42:46 +03:00
Joshua Dwire	71b6b6eb87	More robust migration; avoids timeout failures	2016-04-20 11:47:38 -04:00
Joshua Dwire	b5b3fa56ac	Don't try to migrate nonexistent accounts	2016-04-20 09:50:13 -04:00
Hillel Coren	0dcee794b5	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop ... Conflicts: resources/lang/en/texts.php resources/views/accounts/invoice_design.blade.php resources/views/invoices/edit.blade.php	2016-04-19 22:48:03 +03:00
Joshua Dwire	b8ad27963e	Fix table name in migration	2016-04-19 10:30:25 -04:00
Hillel Coren	9f5fe33059	Added page size and live preview settings	2016-04-19 10:51:57 +03:00
Joshua Dwire	22f65e8108	Finalize multi-plan support ... * Allow admins to change plan * Check features instead of plans * Support linking/unlinking accounts * Support creating/deleting accounts	2016-04-18 22:35:18 -04:00
Joshua Dwire	089349b591	Complete companies migration	2016-04-16 20:15:17 -04:00