1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 15:13:29 +01:00
Commit Graph

4615 Commits

Author SHA1 Message Date
Hillel Coren
0267b84b73 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-09-13 11:49:06 +03:00
Hillel Coren
99b5046fc2 Removed self host version flag 2016-09-13 11:48:27 +03:00
Hillel Coren
0301c3a97c Support default invoice tax with buy now buttons 2016-09-13 11:48:05 +03:00
Hillel Coren
5a0f8edbb9 Merge pull request #1069 from davidsivocha/#1068_Editing-Expenses-Broken-No-Presenter
Adds an Entity Presenter to ExpenseCategory
2016-09-12 20:52:51 +03:00
David Sivocha
63ea0a00d4 Adds an Entity Presenter to ExpenseCategory
Without the presentable trait and at the basic level a default
EntityPresenter, adding Expense Categories breaks when trying to view
the edit page for the expense.
2016-09-12 16:01:14 +01:00
Hillel Coren
552dec105d Fix for tests 2016-09-12 14:17:21 +03:00
Hillel Coren
5888a287bc Fix for tests 2016-09-12 14:17:10 +03:00
Hillel Coren
9713b3283b Merge branch 'release-2.7.0' into develop 2016-09-12 13:37:21 +03:00
Hillel Coren
ebd258d655 Merge branch 'release-2.7.0'
Conflicts:
	app/Http/Controllers/DashboardController.php
	app/Http/Requests/UpdateInvoiceRequest.php
	app/Http/routes.php
	composer.lock
	resources/views/payments/credit_card.blade.php
2016-09-12 13:36:53 +03:00
Hillel Coren
4d1e4f0d43 Bumped version number to 2.7.0 2016-09-12 13:15:04 +03:00
Hillel Coren
8cfcb93179 Added Albanian 2016-09-12 13:08:32 +03:00
Hillel Coren
b2074ae004 Updated lanuguages and added Albaninan 2016-09-12 13:04:47 +03:00
Hillel Coren
e4f914f65d Updated lanuguages and added Albaninan 2016-09-12 13:03:34 +03:00
Hillel Coren
c1d41d6f85 Set allowOutsideClick for sweet alert 2016-09-12 12:51:24 +03:00
Hillel Coren
d6774fed60 Warn leaving page after invoice item changes 2016-09-12 09:44:26 +03:00
Hillel Coren
359271d6c8 Fix undefined on playful quote 2016-09-12 09:38:02 +03:00
Hillel Coren
db35d70494 Improve initial display 2016-09-12 09:37:49 +03:00
Hillel Coren
74d0973978 Fix for claiming white label license 2016-09-12 09:30:31 +03:00
Hillel Coren
710c6593ea Updated readme 2016-09-12 08:57:06 +03:00
Hillel Coren
1276aa19bf Updated readme 2016-09-12 08:56:53 +03:00
Hillel Coren
623c27c307 Updated readme 2016-09-12 08:56:06 +03:00
Hillel Coren
44e91140f2 Updated readme 2016-09-12 08:55:56 +03:00
Hillel Coren
8efcf71c73 Updated readme 2016-09-12 08:55:23 +03:00
Hillel Coren
db4dbdc87e Cleaning up errors from the logs 2016-09-12 08:51:41 +03:00
Hillel Coren
ef81549694 Working on the dashboard 2016-09-11 20:05:59 +03:00
Hillel Coren
ce3a510037 Working on the dashboard 2016-09-11 17:30:23 +03:00
Joshua Dwire
7b203c11f1 Revert "GoCardless only accepts bank transfers, not credit cards"
This reverts commit ed07439de2.
2016-09-09 17:31:47 -04:00
Joshua Dwire
73fde9e26c Allow adding ACH to WePay after gateway creation 2016-09-09 17:31:33 -04:00
Joshua Dwire
4c1f96e740 Use numeric ID for gateway_types table 2016-09-09 17:19:32 -04:00
Joshua Dwire
2fc0265d06 Revert change to string ID for gateway types 2016-09-09 16:47:08 -04:00
Joshua Dwire
286f9e8902 Prevent users from changing the url to access a payment method whose limits don't support the current invoice 2016-09-08 22:19:51 -04:00
Joshua Dwire
ca71ea5622 Restrict payments based on gateway type limits 2016-09-08 22:12:51 -04:00
Joshua Dwire
3c4ad52463 Switch to string-based ID for gateway types; associate gateway type with payment type 2016-09-08 22:12:32 -04:00
Joshua Dwire
30fcf0e363 Merge remote-tracking branch 'upstream/develop' into 2016-09-payments-changes 2016-09-08 20:55:53 -04:00
Joshua Dwire
ed07439de2 GoCardless only accepts bank transfers, not credit cards 2016-09-08 20:52:32 -04:00
Hillel Coren
c895cb2bbd Added expense docs 2016-09-08 09:28:07 +03:00
Hillel Coren
9543336b31 Show 'Unnamed Client' for clients w/o a name 2016-09-06 14:55:31 +03:00
Hillel Coren
9e082ef274 Load recent edited tasks with history 2016-09-06 14:55:15 +03:00
Hillel Coren
2f54d1dfa3 Enable iframe feature for self host users 2016-09-06 14:54:53 +03:00
Hillel Coren
49095c30a1 Timeout after inactivity 2016-09-06 12:24:25 +03:00
Hillel Coren
c45a3b030c Check if confirmed to show portal link 2016-09-06 12:12:36 +03:00
Hillel Coren
657f5c066c Change label to Partial/Deposit 2016-09-06 12:12:23 +03:00
Hillel Coren
4841ec38ce Prevent bots from using buy now buttons 2016-09-06 12:03:42 +03:00
Hillel Coren
b57deab66e Clarify white label message 2016-09-06 11:13:31 +03:00
Hillel Coren
8f65817dc5 Added fb/twtr to notifications page 2016-09-06 11:02:21 +03:00
Hillel Coren
88227b0359 Updated readme 2016-09-06 10:27:59 +03:00
Hillel Coren
9a34d49ea7 Updated readme 2016-09-06 10:27:46 +03:00
Hillel Coren
aee75551b8 Tweak styling 2016-09-06 10:20:51 +03:00
Joshua Dwire
620e93084f Allow admin to set min/max amount for each payment type 2016-09-05 18:16:56 -04:00
Hillel Coren
f49827d4ad Tweaking UI colors 2016-09-05 22:18:35 +03:00