958 Commits

Author	SHA1	Message	Date
Hillel Coren	618ed868e6	Show WePay's fees	2016-07-18 23:10:04 +03:00
Hillel Coren	078964d297	Improve offsite payment checks	2016-07-18 21:45:32 +03:00
Hillel Coren	1e568dc408	Fixes for WePay	2016-07-16 23:51:18 +03:00
Hillel Coren	56f89ef3a0	Update zaps listed	2016-07-16 23:01:55 +03:00
Hillel Coren	86c08f3af5	Working on new pricing	2016-07-15 11:24:08 +03:00
Holger Lösken	39d8e3c7b8	Refactor Utils class	2016-07-14 21:57:13 +00:00
Hillel Coren	7438545aea	Bug fixes	2016-07-14 12:47:33 +03:00
Hillel Coren	8590f9ad17	Working on new pricing	2016-07-14 12:46:00 +03:00
Hillel Coren	2cdba1e4ed	Fixes #974	2016-07-14 11:42:10 +03:00
Hillel Coren	09e06703ea	Added dwolla to text files	2016-07-13 21:49:10 +03:00
Hillel Coren	f47b6dc5ac	Added dwolla to text files	2016-07-13 21:11:26 +03:00
Hillel Coren	92043afb9c	WePay fixes	2016-07-13 16:35:56 +03:00
Hillel Coren	b9f9c0807d	WePay fixes	2016-07-13 16:34:26 +03:00
Hillel Coren	f3a278b9b5	Moved buy now div id	2016-07-13 16:33:49 +03:00
Hillel Coren	fa9b0bf78b	Working on buy now buttons	2016-07-13 12:03:39 +03:00
Hillel Coren	401851e212	Working on buy now buttons	2016-07-12 23:46:41 +03:00
Hillel Coren	ca94f5053e	Prevent payments for deleted invoices from being included in export	2016-07-11 22:24:49 +03:00
Hillel Coren	6dba7f7153	Minor style change	2016-07-11 22:16:36 +03:00
Hillel Coren	986487b4c9	Working on new hosted pricing	2016-07-11 20:08:43 +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
Hillel Coren	fd2155d10a	Merge pull request #950 from codedge/#868-Configurable-start-of-week ... Adding configuration for first day of the week	2016-07-10 12:42:12 +03:00
Hillel Coren	386c606558	Added support for taxes to expenses	2016-07-07 19:54:06 +03:00
Hillel Coren	5f8ae65310	Working on expense category permissions	2016-07-07 11:44:15 +03:00
Hillel Coren	e6b60c6f1a	Working on expense categories	2016-07-07 11:03:43 +03:00
Hillel Coren	cd9aae1e22	Working on expense categories	2016-07-06 21:35:16 +03:00
Hillel Coren	d83f2dc246	Working on expense test	2016-07-06 10:31:06 +03:00
Hillel Coren	21a91ff0e1	Added expense category	2016-07-05 21:49:47 +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
Hillel Coren	f2cbfec926	Improved options when exporting data	2016-07-05 17:27:30 +03:00
Hillel Coren	979690d116	Improved options when exporting data	2016-07-05 16:09:52 +03:00
Hillel Coren	fdb2aefc66	Improved help for 2checkout.com	2016-07-04 22:26:41 +03:00
Hillel Coren	b5f606df47	Added and as email template variables	2016-07-04 21:47:05 +03:00
Hillel Coren	d051ae70ef	Make view client dashboard link open in new tab	2016-07-04 21:20:00 +03:00
Holger Lösken	f58b7f1559	Setting start day of week for jQuery date time picker	2016-07-04 19:38:45 +02: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	f0a52a1bf7	Shortening pro plan process	2016-07-04 11:22:10 +03:00
Hillel Coren	80d0d7693a	Change 'return to app' to return to account mgmt page	2016-07-04 11:01:26 +03:00
Hillel Coren	a56134050d	Fix search when session has expired	2016-07-04 10:59:30 +03:00
Hillel Coren	65d0e350d0	Fix for bold/modern designs on customize page	2016-07-04 10:46:41 +03:00
Hillel Coren	429aba9471	Remove customize save button if not pro	2016-07-04 10:43:04 +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	a114f60127	Adding translation support for languages ... - Languages can now be translated via texts.php	2016-07-04 01:02:38 +02:00
Hillel Coren	dc1bcfbd9e	Updates to white label marketing	2016-07-03 17:46:41 +03:00
Hillel Coren	d22d8f8d01	Fix for website link in client portal dashboard	2016-07-03 17:13:45 +03:00
Hillel Coren	03b696ac9e	Prevent downloading cloned invoice PDF before saving	2016-07-03 16:23:16 +03:00
vagrant	3e912db1cb	Resolve conflicts	2016-07-03 09:34:34 +00:00
Holger Lösken	1aa0110580	Return $LANG array for Transifex	2016-07-03 09:27:49 +00:00
Holger Lösken	337ed1c719	- Fix #426, closes #426 ... - Moved translations for industries, countries into texts.php - Removed nested arrays in texts.php	2016-07-03 09:26:08 +00:00
Holger Lösken	b13b9a2d7d	Fix hardcoded translations for industry, country and payment types ... - Fixes #426, resolves #426	2016-07-03 09:24:55 +00:00
Holger Lösken	da87f9342d	Return $LANG array for Transifex	2016-07-03 11:06:34 +02:00
Hillel Coren	f9aee23de8	Merge pull request #923 from vincentdh/develop ... Add Mailgun API in mail drivers	2016-07-03 11:58:24 +03:00
Holger Lösken	96d15ccb2d	- Fix #426, closes #426 ... - Moved translations for industries, countries into texts.php - Removed nested arrays in texts.php	2016-07-02 23:18:13 +02:00
Holger Lösken	fdb8c707e1	Fix hardcoded translations for industry, country and payment types ... - Fixes #426, resolves #426	2016-07-01 23:19:09 +02:00
Hillel Coren	ff911888ec	Merging tranlations from Transifex	2016-06-30 21:26:14 +03:00
Holger Lösken	ae78a177b0	Fix #562 ... Make „Manual entry“ translatable	2016-06-30 14:38:55 +02:00
Hillel Coren	9603439a33	Added additional designs	2016-06-29 22:48:56 +03:00
Hillel Coren	0449fe2515	Minor text/styling fixes	2016-06-28 21:22:16 +03:00
Hillel Coren	af4cb1dac8	Fix for client portal header navigation	2016-06-26 19:48:15 +03:00
Hillel Coren	d71cf4dd49	Payment fixes	2016-06-26 19:38:36 +03:00
Hillel Coren	7c0875841a	Fixed autobill message in emails	2016-06-26 12:59:42 +03:00
Hillel Coren	74e5b80f8c	Fix for add company link	2016-06-25 22:05:08 +03:00
Hillel Coren	6ad49cf281	Fixing payment hooks	2016-06-23 16:15:52 +03:00
Hillel Coren	dcdfb4f21c	Check to prevent duplicate gateways	2016-06-22 20:13:45 +03:00
Hillel Coren	e2ddabe95d	Minor fixes for payments	2016-06-22 12:22:38 +03:00
Hillel Coren	c9a19cbd76	Fixes for WePay	2016-06-21 19:10:22 +03:00
Hillel Coren	8a6227bf89	Fix for tests	2016-06-21 12:40:10 +03:00
Hillel Coren	5ff69c6f29	Payments refactor	2016-06-20 17:14:43 +03:00
vincentdh	5875b70496	Add Mailgun API as mail driver ... Add Mailgun API as a mail driver. Can be configured from the System Settings page.	2016-06-19 13:51:22 -04:00
Hillel Coren	1a9f7bf098	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-06-09 10:56:31 +03:00
Hillel Coren	ffa67cef3b	Refactoring payments code...	2016-06-09 10:56:22 +03:00
Hillel Coren	31fc4ad59c	Merge pull request #911 from haleksandre/invoice-subtotals ... Add custom labelling and style to multiple labels and amount in the subtotals table	2016-06-09 09:05:57 +03:00
Alexandre Villeneuve	eafdc12fa5	Add style to multiple subtotals labels	2016-06-08 14:00:44 -04:00
Hillel Coren	7a0ca450a8	Fix payments for clients w/o an email address	2016-06-08 08:43:21 +03:00
Hillel Coren	a91f257f01	Moved up handleDocumentUploaded counter	2016-06-07 21:46:07 +03:00
Hillel Coren	d5cb8b3abe	Minor fixes	2016-06-05 22:55:23 +03:00
Hillel Coren	706c26b4d5	Minor fixes	2016-06-05 21:05:11 +03:00
Hillel Coren	5c7a15ff83	Minor fixes	2016-06-05 19:10:15 +03:00
Hillel Coren	8b2f7eb39f	Check for blank api secret	2016-06-05 18:50:41 +03:00
Hillel Coren	37a92fc853	Fix for online payments page	2016-06-04 22:11:46 +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	e312f00b80	Don't refresh PDF after file uploaded	2016-06-01 17:32:51 +03:00
Hillel Coren	1bed3dbdf5	Display number of documents	2016-06-01 16:49:33 +03:00
Hillel Coren	901464380e	Prevent downloading PDF if this invoice hasn't been saved	2016-06-01 16:39:07 +03:00
Hillel Coren	42ac9507e5	Enabled importing products	2016-05-31 23:15:55 +03:00
Hillel Coren	e7caa58d75	Changed route to use plurarl 'documents'	2016-05-30 13:43:41 +03:00
Hillel Coren	2f3c309d41	Remove fallback support for dropzone	2016-05-30 11:51:41 +03:00
Hillel Coren	cc2364a989	Check company website is a valid url	2016-05-29 19:34:51 +03:00
Hillel Coren	d175fc872a	Don't render pdf if not attached and fix typo	2016-05-29 19:32:45 +03:00
Hillel Coren	a7f9847978	Fix for when document is too large	2016-05-29 18:42:36 +03:00
Hillel Coren	d174a2555b	Fix for max file size	2016-05-29 18:39:42 +03:00
Hillel Coren	b5a9656e3d	Fix for cloning quote	2016-05-29 16:45:16 +03:00
Hillel Coren	a9302d4d01	Fixes for is_quote	2016-05-29 15:34:44 +03:00
Hillel Coren	607fb58c29	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop ... Conflicts: app/Models/Account.php	2016-05-29 12:27:14 +03:00
Hillel Coren	0e75ddb5e6	Added setting to hide second tax rate	2016-05-29 12:26:02 +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
Hillel Coren	2043621ac9	Fix for deleting documents	2016-05-26 19:02:53 +03:00
Hillel Coren	c55d6510bf	Show permissions if not enabled	2016-05-26 16:04:53 +03:00