513 Commits

Author	SHA1	Message	Date
Hillel Coren	1e568dc408	Fixes for WePay	2016-07-16 23:51:18 +03:00
Hillel Coren	86c08f3af5	Working on new pricing	2016-07-15 11:24:08 +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	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	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	cd9aae1e22	Working on expense categories	2016-07-06 21:35:16 +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	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
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	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
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
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	0449fe2515	Minor text/styling fixes	2016-06-28 21:22:16 +03:00
Hillel Coren	7c0875841a	Fixed autobill message in emails	2016-06-26 12:59:42 +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	5ff69c6f29	Payments refactor	2016-06-20 17:14:43 +03:00
Hillel Coren	ffa67cef3b	Refactoring payments code...	2016-06-09 10:56:22 +03:00
Hillel Coren	d5cb8b3abe	Minor fixes	2016-06-05 22:55:23 +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	42ac9507e5	Enabled importing products	2016-05-31 23:15:55 +03:00
Hillel Coren	0e75ddb5e6	Added setting to hide second tax rate	2016-05-29 12:26:02 +03:00
Hillel Coren	c55d6510bf	Show permissions if not enabled	2016-05-26 16:04:53 +03:00
Joshua Dwire	acbc0e887f	Support adding WePay ACH from payment page	2016-05-25 16:54:49 -04:00
Joshua Dwire	4dded687b5	Tweak payment settings page	2016-05-25 15:55:23 -04:00
Joshua Dwire	c9f00274b1	Support storing WePay bank tokens	2016-05-25 15:04:58 -04:00
Joshua Dwire	6ddbbbc64d	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-05-25 11:14:14 -04:00
Joshua Dwire	7d55ab033b	Merge branch 'wepay-ach' into wepay-integration	2016-05-25 11:11:47 -04:00
Joshua Dwire	d19a3715f9	Warn user when editing an ACH auto bill invoice	2016-05-25 11:07:20 -04:00
Joshua Dwire	c701c5563c	Add payment settings block	2016-05-25 10:36:40 -04:00
Hillel Coren	ba561c7d0d	Prevent clicking save while document is still uploading	2016-05-25 14:42:20 +03:00
Joshua Dwire	9d4b42a514	Mention in the invoice notification that the invoice will be auto billed on the due date	2016-05-24 23:14:19 -04:00
Joshua Dwire	724f5738aa	Add contact_key	2016-05-24 17:02:28 -04:00
Hillel Coren	f19058e35e	Improved message after update	2016-05-23 09:18:39 +03:00
Hillel Coren	cdfaae2700	Minor change to client portal settings page	2016-05-22 20:31:26 +03:00
Hillel Coren	ac09d86f68	Show warning when changing recurring invoice start date	2016-05-22 19:51:09 +03:00
Hillel Coren	6caf1ff30d	Minor fixes	2016-05-19 09:47:57 +03:00
Hillel Coren	2e1d340d27	Merge pull request #875 from joshuadwire/wepay-integration ... Wepay integration - Part 2	2016-05-17 22:25:59 +03:00
Hillel Coren	0dd55b4cf2	Merge pull request #873 from vincentdh/patch-3 ... use_card_on_file translation ambiguous	2016-05-17 22:19:51 +03:00
Joshua Dwire	4f3bb7eeb4	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-05-17 15:07:53 -04:00
Joshua Dwire	e905b29510	Partial WePay ACH support	2016-05-17 14:09:39 -04:00
Hillel Coren	a2998a8cfb	Added Croatian	2016-05-17 20:22:41 +03:00
vincentdh	f532639e3c	use_card_on_file translation ambiguous	2016-05-17 12:59:55 -04:00
Joshua Dwire	43fade2339	Support app fees and Canadian users	2016-05-17 11:32:17 -04: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	f6942a199f	Merge remote-tracking branch 'upstream/develop' into wepay-integration	2016-05-15 21:21:59 -04:00
Hillel Coren	3df6ad2529	Changes to support transifex.com	2016-05-15 23:16:08 +03:00
Hillel Coren	1faf0a477a	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-15 22:55:25 +03:00
Bartlomiej Szala	5eaa90fd05	Add new translations into texts file	2016-05-15 21:49:58 +02:00
Hillel Coren	b067697b1c	Support manually importing OFX files	2016-05-15 13:58:11 +03:00
Hillel Coren	52fe1b0dec	Added missing text value	2016-05-15 10:06:14 +03:00
Joshua Dwire	947cb4a6f7	Better WePay configuration support	2016-05-14 17:23:20 -04:00
Hillel Coren	df3a103825	Added missing report field	2016-05-13 15:26:22 +03:00
Joshua Dwire	ba000546c4	Better WePay switching	2016-05-12 11:09:07 -04:00
Joshua Dwire	88c9fc1ac1	Add WePay configuration UI	2016-05-11 22:55:37 -04:00
Hillel Coren	7ad81bdf5e	Merge pull request #856 from bSzala/translation ... Working on polish translations	2016-05-11 23:18:29 +03:00
Bartlomiej Szala	ae6d85bb49	Working on texts translations	2016-05-11 20:59:40 +02:00
Joshua Dwire	fc029a62e1	Merge remote-tracking branch 'upstream/develop' into payments-changes	2016-05-10 22:32:28 -04:00
Joshua Dwire	88ec714cd5	Store Stripe card summary locally	2016-05-10 18:46:32 -04:00
Hillel Coren	a503697152	Updated lang files	2016-05-10 21:25:57 +03:00
Hillel Coren	ee579f91f3	Added plan help text	2016-05-10 21:17:46 +03:00
Joshua Dwire	41f4c98e08	Merge remote-tracking branch 'upstream/develop' into payments-changes	2016-05-10 10:25:42 -04:00
Hillel Coren	d34441b039	Merge translation fix #796	2016-05-10 12:26:30 +03:00
Hillel Coren	e7e7476505	Merge translation fix #825	2016-05-10 12:24:21 +03:00
Hillel Coren	d56a75ca5e	Merge translation fix #832	2016-05-10 12:22:50 +03:00
Joshua Dwire	20f6f32a06	Update UI for configuring auto bill	2016-05-09 16:29:02 -04:00
Hillel Coren	eb814eec71	Added Czech #844	2016-05-08 18:57:32 +03:00
Hillel Coren	f2e651d53f	Added message if adding users insn't supported	2016-05-08 12:59:32 +03: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	70b9c9bba7	Require authorization for ACH	2016-05-06 11:21:06 -04:00
Joshua Dwire	77bd6f7bc5	Restyle add bank account page	2016-05-06 10:50:50 -04:00
Hillel Coren	47cd8a0a33	Added preview for email templates	2016-05-05 19:43:44 +03:00
Hillel Coren	c79d9fe24c	Added preview for email templates	2016-05-05 17:46:22 +03:00
Hillel Coren	7744c6c41c	White label changes	2016-05-05 09:58:14 +03:00
Hillel Coren	ef2bc3d811	White label changes	2016-05-05 09:52:59 +03:00
Hillel Coren	8972ceab62	Merge pull request #840 from bSzala/polishtranslations ... Add polish translations	2016-05-03 19:45:20 +03:00
emiliolodigiani	5295bf30fc	Revert typo fix	2016-05-03 15:11:34 +02:00
emiliolodigiani	fb473eeb3b	Update italian translation	2016-05-03 15:09:13 +02:00