Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,716 Commits 9 Branches 1,055 Tags 4 GiB
Commit Graph

983 Commits

Author SHA1 Message Date
Hillel Coren 8c15e2a735 Fix for payment gateway failing validation 2016-07-21 20:09:33 +03:00
Hillel Coren 498578cefc Rollback to 2.6.5 2016-07-21 15:35:23 +03:00
Hillel Coren f4f13d3119 Fix for attaching files 2016-07-20 20:09:03 +03:00
Hillel Coren 7bb8f0ca4a Merge https://github.com/codedge/invoiceninja into codedge-#904-Unify-js-no-public-js 
Conflicts:
	app/Http/Controllers/AccountController.php
	resources/lang/en/texts.php
 2016-07-20 10:49:08 +03:00
Hillel Coren 2e0129b279 Fix when adding a new user who is already logged in 2016-07-19 10:59:50 +03:00
Hillel Coren cb4a2b6a49 Fix for app cipher setting 2016-07-19 10:38:54 +03:00
Hillel Coren dcfea90781 Merge pull request #989 from codedge/Put-cipher-back-to-env 
Put APP_CIPHER back to .env
 2016-07-19 10:28:05 +03:00
Hillel Coren 7cb797fcc2 Fix for cancel account 2016-07-18 22:07:23 +03:00
Hillel Coren ce6068f924 Additional online payment checks 2016-07-18 22:03:28 +03:00
Hillel Coren 5e5207973f Prevent entering online payment for deleted invoice 2016-07-18 21:05:40 +03:00
Holger Lösken 3d7e412d24 Put APP_CIPHER back to .env 
- APP_CIPHER included in .env.example
- APP_CIPHER being included into .env when doing a fresh install
 2016-07-18 11:13:35 +02:00
Hillel Coren 59969a4677 Fix for API pagination 2016-07-17 13:31:31 +03:00
Hillel Coren 1e568dc408 Fixes for WePay 2016-07-16 23:51:18 +03:00
Hillel Coren f8672e3feb Fix for buy now buttons 2016-07-16 23:51:05 +03:00
Hillel Coren 36e50e7bcb Fixes for the API 2016-07-15 16:47:18 +03:00
Hillel Coren 86c08f3af5 Working on new pricing 2016-07-15 11:24:08 +03:00
Hillel Coren 431f596d1d Working on new pricing 2016-07-14 22:58:48 +03: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 401851e212 Working on buy now buttons 2016-07-12 23:46:41 +03:00
Hillel Coren a32e372d40 Bug fix 2016-07-12 08:05:26 +03:00
Hillel Coren e68e213237 Bug fixes 2016-07-11 23:38:06 +03:00
Hillel Coren 316284b7e2 Bug fixes 2016-07-11 23:36:51 +03:00
Hillel Coren b233aa0744 Merge branch 'release-2.6' 
Conflicts:
	.travis.yml
	CONTRIBUTING.md
	README.md
	app/Http/Controllers/AccountController.php
	app/Http/Controllers/AppController.php
	app/Http/Controllers/BaseAPIController.php
	app/Http/Controllers/CreditController.php
	app/Http/Controllers/DashboardController.php
	app/Http/Controllers/DocumentController.php
	app/Http/Controllers/PaymentController.php
	app/Http/Controllers/QuoteApiController.php
	app/Http/Requests/EntityRequest.php
	app/Http/routes.php
	app/Listeners/AnalyticsListener.php
	app/Models/Account.php
	app/Models/Credit.php
	app/Models/Document.php
	app/Models/EntityModel.php
	app/Models/Expense.php
	app/Models/Invoice.php
	app/Models/Task.php
	app/Models/VendorContact.php
	app/Ninja/Notifications/PushFactory.php
	app/Ninja/Repositories/DocumentRepository.php
	app/Ninja/Repositories/ExpenseRepository.php
	app/Ninja/Repositories/InvoiceRepository.php
	app/Services/PushService.php
	composer.json
	composer.lock
	database/migrations/2014_05_17_175626_add_quotes.php
	database/seeds/UserTableSeeder.php
	resources/lang/en/texts.php
	resources/views/accounts/customize_design.blade.php
	resources/views/accounts/invoice_design.blade.php
	resources/views/accounts/management.blade.php
	resources/views/expenses/edit.blade.php
	resources/views/header.blade.php
	resources/views/invoices/edit.blade.php
	resources/views/master.blade.php
	resources/views/payments/payment.blade.php
	resources/views/users/edit.blade.php
 2016-07-11 23:33:58 +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 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 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 3c66c0166b Fixed bug preventing switching back to subdomain from website 2016-07-05 12:49:09 +03:00
Hillel Coren 0dc9b3fceb Made 'viewable' scope default behavior 2016-07-04 19:49:01 +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 6217419a2f Fix for upgrading directly after signing up 2016-07-04 13:03:09 +03:00
Hillel Coren 6f1776004a Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-04 09:40:06 +03:00
Hillel Coren 5d7f7ec02c Merge pull request #946 from codedge/#942-Refactoring-dead-code-unused-uses 
#942 refactoring dead code unused uses
 2016-07-04 09:38:50 +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
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 710200ef3f Fix for client portal when payments are disabled 2016-07-03 17:09:39 +03: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
Hillel Coren f9aee23de8 Merge pull request #923 from vincentdh/develop 
Add Mailgun API in mail drivers
 2016-07-03 11:58:24 +03:00
Hillel Coren 6dfd50bddd Fix for enabling autobilling 2016-06-30 20:53:06 +03:00
Hillel Coren 2438fa4fda Merge pull request #931 from codedge/#203-Use-database-prefix-dashboard 
Fix #203
 2016-06-30 17:44:40 +03:00
Holger Lösken 1717028d36 Fixed wrong translation name, need to include the file "texts." 2016-06-30 15:21:03 +02:00
Holger Lösken 8b486ddfcc Fix #203 2016-06-30 15:14:54 +02:00
Holger Lösken ae78a177b0 Fix #562 
Make „Manual entry“ translatable
 2016-06-30 14:38:55 +02:00
Hillel Coren c1713c190c Fix for go pro process 2016-06-28 21:21:54 +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 45fce3bfe9 Payment webhook fixes 2016-06-24 18:15:51 +03:00
Hillel Coren 406249ef95 Payment webhook fixes 2016-06-24 15:40:10 +03:00
Hillel Coren 718aa6a966 Web hook bug fixes 2016-06-23 17:05:50 +03:00
Hillel Coren 6ad49cf281 Fixing payment hooks 2016-06-23 16:15:52 +03:00
Hillel Coren 1fc1c11663 API changes for Zapier 2016-06-23 12:58:28 +03:00
Hillel Coren 4281a1c3b0 API changes for Zapier 2016-06-23 12:57:10 +03:00
Hillel Coren e36d23fcdc API changes for Zapier 2016-06-23 12:39:07 +03:00
Hillel Coren 725522ea21 API changes for Zapier 2016-06-23 12:38:06 +03:00
Hillel Coren 93c3521952 Improve check for duplicate gateways 2016-06-22 21:42:09 +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 fc0a7cfbf0 Merge fixes from develop 2016-06-21 21:02:01 +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 e2e629141b Refresh contacts after saving in API 2016-06-09 15:22:57 +03:00
Hillel Coren bcbb68372e Refresh contacts after saving in API 2016-06-09 15:21:33 +03:00
Hillel Coren 5e374b2859 Refresh contacts after saving in API 2016-06-09 15:20:15 +03: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 40241cbf38 Restrict client list 2016-06-08 17:56:48 +03:00
Hillel Coren f67990d636 Restrict client list 2016-06-08 17:56:13 +03:00
Hillel Coren 3c9e2769fb Merge fix for outstanding balance on dashboard 2016-06-08 17:21:02 +03:00
Hillel Coren de4e79f537 Fix for invoice report totals 2016-06-07 21:50:09 +03:00
Hillel Coren 13fbb880e1 Fix for invoice report totals 2016-06-07 21:49:20 +03:00
Hillel Coren 7730904bda Added back API route for quotes 2016-06-06 22:19:49 +03:00
Hillel Coren 1eb334f3b4 Added back API route for quotes 2016-06-06 22:18:15 +03:00
Hillel Coren a27b8173cb Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-06 19:31:56 +03:00
Joshua Dwire 0967ca65e8 Show "Credit Card" instead of "Stripe" as a payment option. 2016-06-05 15:07:02 -04:00
Hillel Coren d5669fdbf9 Minor fixes 2016-06-05 21:08:41 +03:00
Hillel Coren 706c26b4d5 Minor fixes 2016-06-05 21:05:11 +03:00
David Bomba d27219a6a0 refactoring documentAPI 2016-06-05 20:15:49 +10:00
David Bomba d5c2fc81bd refactoring documentAPI 2016-06-05 20:13:38 +10:00
David Bomba 8ff41dfc7e refactoring documentAPI 2016-06-05 20:12:21 +10:00
David Bomba 1617be2485 refactoring documentAPI 2016-06-05 20:00:21 +10:00
Hillel Coren e80af4a95d Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-03 11:23:07 +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 d3372680cf Include archived records in JSON export 2016-06-03 11:17:55 +03:00
Hillel Coren 619938bc72 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-06-02 22:04:12 +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
David Bomba 2a39fee1c6 Merge pull request #900 from turbo124/develop 
Develop
 2016-06-01 21:39:36 +10:00
David Bomba 86a2dec504 Bug Fixes 2016-06-01 21:38:35 +10:00
David Bomba 671b3ba02a test 2016-06-01 20:15:31 +10:00
David Bomba f239cfdfb4 bug fixes 2016-06-01 20:03:19 +10:00
Hillel Coren e08e8c1962 Support downloading PDF through the API 2016-06-01 12:56:59 +03:00
Hillel Coren 78bafbbf09 Support downloading PDF through the API 2016-06-01 12:56:15 +03:00
Hillel Coren 17eb2a7a79 Support saving invoice_id and expense_id with the document 2016-06-01 12:39:42 +03:00
David Bomba fc0d9f13a8 bug fixes 2016-05-31 20:04:30 +10:00
David Bomba 3a98f6ffdc bug fixes on API Dashboard 2016-05-31 20:03:52 +10:00
David Bomba 47d31b24fd testing 2016-05-31 20:02:41 +10:00
David Bomba 5422f182c2 testing 2016-05-31 20:00:23 +10:00
David Bomba 33a3ce2f39 testing 2016-05-31 19:59:04 +10:00
David Bomba 0659ce55ac testing 2016-05-31 19:58:01 +10:00
David Bomba b7c99335fd testing 2016-05-31 19:54:57 +10:00
David Bomba 30a281110f Logging Document uploads 2016-05-31 15:01:43 +10:00
Hillel Coren c061808677 Enabled uploading documents through the API 2016-05-30 13:44:49 +03:00
Hillel Coren ced3daf9c6 Added clear commands when updating 2016-05-29 17:49:09 +03:00
Hillel Coren 38cd6de8da Added clear commands when updating 2016-05-29 17:48:55 +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 145c394e6b Ensure all files are deleted with the account 2016-05-26 20:48:45 +03:00
Hillel Coren f233582ea8 Ensure all files are deleted with the account 2016-05-26 20:48:27 +03:00
Hillel Coren b32a9110c7 Fix for deleting documents 2016-05-26 19:04:43 +03:00
Hillel Coren 2043621ac9 Fix for deleting documents 2016-05-26 19:02:53 +03:00
Hillel Coren 26b0169ae9 Fix permission issue with quotes 2016-05-26 15:51:13 +03:00
Hillel Coren 29bccd650d Fix permission issue with quotes 2016-05-26 15:50:23 +03:00
Joshua Dwire acbc0e887f Support adding WePay ACH from payment page 2016-05-25 16:54:49 -04:00
Joshua Dwire c9f00274b1 Support storing WePay bank tokens 2016-05-25 15:04:58 -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
Joshua Dwire 1f11d88d6b Store ip addresses for payments and payment methods 2016-05-24 18:00:59 -04:00
Joshua Dwire 724f5738aa Add contact_key 2016-05-24 17:02:28 -04:00
David Bomba 5f928ecf01 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-24 14:26:19 +10:00
Hillel Coren e7bf0599db Separated out entity datatable classes 2016-05-23 19:52:20 +03:00
Hillel Coren 260b9212b9 Renamed PublicClientController to ClientPortalController 2016-05-23 11:31:49 +03:00
Hillel Coren f19058e35e Improved message after update 2016-05-23 09:18:39 +03:00
Hillel Coren 86240affab Show company name in client portal dashboard activities 2016-05-23 09:02:31 +03:00
Hillel Coren 371f224c24 Minor fixes for invoice export 2016-05-22 20:01:37 +03:00
Hillel Coren d0232e00f6 Hide outstanding on dashboard from non-admins 2016-05-22 15:31:41 +03:00
David Bomba 1e370d2cce Implement DocumentAPIController 2016-05-21 18:44:53 +10:00
David Bomba eb1d5be47c bugs in dashboardapicontroller 2016-05-21 09:17:53 +10:00
Hillel Coren ef65bb7d84 Merge pull request #879 from joshuadwire/wepay-integration 
Wepay integration - Part 3
 2016-05-18 19:22:44 +03:00
Joshua Dwire f0d276be4c Listen for WePay IPNs 2016-05-18 09:51:20 -04:00
Hillel Coren 2e1d340d27 Merge pull request #875 from joshuadwire/wepay-integration 
Wepay integration - Part 2
 2016-05-17 22:25:59 +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
Joshua Dwire 43fade2339 Support app fees and Canadian users 2016-05-17 11:32:17 -04:00
Hillel Coren 861672e9e9 Fix for deleting account 2016-05-17 15:05:07 +03:00
Hillel Coren faec0a2f04 Fix for deleting account 2016-05-17 15:03:17 +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
Hillel Coren 5e7cdddc3e Merge pull request #863 from joshuadwire/wepay-integration 
Wepay integration - Part 1
 2016-05-16 11:29:37 +03:00
David Bomba 1d05525ee3 typo 2016-05-16 12:30:24 +10:00
Joshua Dwire f6942a199f Merge remote-tracking branch 'upstream/develop' into wepay-integration 2016-05-15 21:21:59 -04:00
Joshua Dwire a482c63ee3 Payments bug fixes 2016-05-15 16:27:56 -04:00
Hillel Coren 3df6ad2529 Changes to support transifex.com 2016-05-15 23:16:08 +03:00
Hillel Coren b067697b1c Support manually importing OFX files 2016-05-15 13:58:11 +03:00
Joshua Dwire 9afd0741f7 Better WePay setup UI 2016-05-14 22:32:27 -04:00
Joshua Dwire 1524447cd4 WePay fixes; support account updater 2016-05-14 22:22:06 -04:00
Joshua Dwire 947cb4a6f7 Better WePay configuration support 2016-05-14 17:23:20 -04:00
Joshua Dwire ce04c994dd Support payments and storing cards via WePay. 2016-05-13 09:30:22 -04:00
Hillel Coren b111adaf17 Added and removed extra lables from activity messages 2016-05-13 15:35:59 +03:00
Hillel Coren fba37171ae Support query counter in webapp as well as API 2016-05-13 12:08:41 +03:00
Hillel Coren 2933ec97ca Fix for saving client portal setting in self host 2016-05-12 20:29:33 +03:00
Hillel Coren 3202d2480f Fix for saving client portal setting in self host 2016-05-12 20:26:36 +03:00
Joshua Dwire ba000546c4 Better WePay switching 2016-05-12 11:09:07 -04:00
Hillel Coren 6a86764dee Fix for #859 2016-05-12 12:45:36 +03:00
Hillel Coren 110af6f28b Fix for #859 2016-05-12 12:44:22 +03:00
Joshua Dwire 88c9fc1ac1 Add WePay configuration UI 2016-05-11 22:55:37 -04:00
David Bomba e738a58a42 Merge pull request #858 from turbo124/develop 
Permissions fields for Invoice Transformer
 2016-05-12 08:29:55 +10:00
David Bomba 7c0e2f4420 added in additional fields for Invoice Transformer 2016-05-12 08:28:49 +10:00
David Bomba 2b23a80fda rewind 2016-05-12 08:27:21 +10:00
Joshua Dwire 0d41d8aeb6 Payments bug fixes - Part 2 2016-05-11 12:53:43 -04:00
Joshua Dwire 258401715c Update billing address when adding payment method 2016-05-10 22:15:32 -04:00
Joshua Dwire 6138e1132f Make sure payments reference newly added payment methods 2016-05-10 19:18:12 -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
David Bomba e795ac28cd Merge remote-tracking branch 'upstream/develop' into develop 2016-05-10 09:26:15 +10:00
Joshua Dwire 20f6f32a06 Update UI for configuring auto bill 2016-05-09 16:29:02 -04:00
Hillel Coren 7317bfc8c9 Fixed issue with invoice history 2016-05-09 20:35:50 +03:00
Hillel Coren 8bd2e84bc8 Track plan start date when manually applying a license 2016-05-09 15:07:01 +03:00
David Bomba 5197db449e Merge remote-tracking branch 'upstream/develop' into develop 2016-05-09 09:03:39 +10: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 594b0e1bef Implemented server-side analytics tracking for revenue 2016-05-08 16:54:16 +03:00
Joshua Dwire 0fc44962d4 Add Braintree/PayPal support 2016-05-06 22:33:03 -04:00
David Bomba 1bef3b0791 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-07 08:44:39 +10:00
Joshua Dwire 9ed44bdfe4 Merge pull request #4 from joshuadwire/laravel-acl 
Laravel acl
 2016-05-06 14:17:16 -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 37f4430e62 Move payment methods to dashboard when enabled 2016-05-06 11:06:01 -04:00
Joshua Dwire 77bd6f7bc5 Restyle add bank account page 2016-05-06 10:50:50 -04:00
Hillel Coren 6971060049 Added preview for email templates 2016-05-05 19:25:26 +03:00
Hillel Coren bce4395f82 Added preview for email templates 2016-05-05 17:51:52 +03:00
Hillel Coren c79d9fe24c Added preview for email templates 2016-05-05 17:46:22 +03:00
Hillel Coren 501958cc1e Added language seeder 2016-05-05 11:55:09 +03:00
David Bomba dd4ea2ac17 Merge remote-tracking branch 'upstream/develop' into develop 2016-05-05 07:44:54 +10:00
Hillel Coren 5d00d18601 Added support for filtering API lists by updated_at 2016-05-05 00:26:39 +03:00
Hillel Coren 32bf47aacf Added support for filtering API lists by updated_at 2016-05-04 23:49:20 +03:00
Hillel Coren db9d75ceff Changed vendorcontacts to vendor_contacts 2016-05-04 15:16:49 +03:00
Hillel Coren 9ebb539cce API optimizations 2016-05-04 14:53:27 +03:00
Hillel Coren 2d878b6480 API optimizations 2016-05-03 23:02:29 +03:00
Hillel Coren c0a5084282 Added details to cybersource error 2016-05-03 19:06:38 +03:00
David Bomba b36be7646c Merge remote-tracking branch 'upstream/develop' into develop 2016-05-03 20:47:37 +10:00
Hillel Coren bf4c4d0ce5 Add user permissions to API delete 2016-05-03 11:53:00 +03:00
Hillel Coren be420ad1fc API optimizations 2016-05-03 11:39:10 +03:00
Hillel Coren 6cd4ff025e API optimizations 2016-05-03 09:46:24 +03:00
Hillel Coren 65d70c620e Enabled setting per_page for API results 2016-05-02 23:06:36 +03:00
Hillel Coren e6bcdb36b3 Removed extra entity load in the repos save function 2016-05-02 20:42:13 +03:00
Hillel Coren 6acddfc3c7 Working on permissions in the API 2016-05-02 16:45:12 +03:00
Hillel Coren e7f4368cbb Working on permissions in the API 2016-05-02 16:12:37 +03:00
David Bomba 7cac31e7a6 Fix for cloning invoices from API 2016-05-02 19:40:54 +10:00
Hillel Coren 1d6011caad Working on permissions in the API 2016-05-02 11:38:01 +03:00
Hillel Coren 1b92f66482 Adding permissions to the API 2016-05-02 09:33:48 +03:00
Hillel Coren 4db5a19885 Refactored API index methods 2016-05-01 23:55:13 +03:00
Hillel Coren e7296cf513 Working on form requests 2016-05-01 22:36:12 +03:00
Hillel Coren 7f168f87b9 Working on form requests 2016-05-01 22:33:01 +03:00
Hillel Coren 933f2968d6 Working on form requests 2016-05-01 22:30:39 +03:00
Hillel Coren 2efd419791 Moving permissions to form requests 2016-05-01 15:04:55 +03:00
Hillel Coren 05bd8d9318 Moving permissions to form requests 2016-05-01 14:31:10 +03:00
Joshua Dwire 059a23b612 Fix syntax error 2016-05-01 00:38:48 -04:00
Joshua Dwire 3e9dd7d8d1 Remove debug code 2016-05-01 00:37:14 -04:00
Joshua Dwire d78b874838 Add Plaid support 2016-04-30 22:45:51 -04:00
Joshua Dwire ed1f2b6044 Handle failed payments 2016-04-30 17:54:56 -04:00
Hillel Coren 50de2d757e Working on permissions 2016-04-30 21:55:15 +03:00
Joshua Dwire c536bd8569 Add basic ACH support 2016-04-29 17:50:21 -04:00
Joshua Dwire e5fb354643 Support configuring Stripe for ACH and Plaid 2016-04-28 16:38:01 -04:00
Hillel Coren 1a47598aea Working on custom route model binding 2016-04-28 15:20:34 +03:00
Hillel Coren 9979eba5d9 Working on custom route model binding 2016-04-28 15:16:33 +03:00
Joshua Dwire 1cb2b9dc25 Use existing PaymentType instead of CardType 2016-04-27 22:13:51 -04:00
Hillel Coren ce2392563d Removed checkSubPermissions flag 2016-04-27 23:56:14 +03:00
Hillel Coren df93ffaaf9 Fix for permissions in payment controller 2016-04-27 18:09:04 +03:00
Hillel Coren 4c48599175 Fix for permissions in payment controller 2016-04-27 17:22:50 +03:00
Hillel Coren 6f5a68e1f5 Fixed bug in vendor controller 2016-04-27 16:36:44 +03:00
Joshua Dwire 91efade7f7 Don't require new ucwords signature 2016-04-26 20:06:19 -04:00
Joshua Dwire fe2a1fe66a Add Braintree support 2016-04-26 19:59:52 -04:00
Joshua Dwire fc0d4d3edd Finish migrating to Laravel ACL 2016-04-25 21:53:39 -04:00
Joshua Dwire b57ebbf8aa Fix card expiration formatting; store card details from all payment triggers 2016-04-25 10:06:27 -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
Joshua Dwire fdf1b25b16 Begin adding authorization policies 2016-04-23 11:52:36 -04:00
Hillel Coren cf75a2c2d2 Merge pull request #823 from joshuadwire/enterprise-plan 
Fix refunds; support using stored card; change proPlanModel link
 2016-04-21 10:39:34 +03:00
Joshua Dwire 9d27b68fb6 Fix refunds; support using stored card; change proPlanModel link 2016-04-20 16:53:56 -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
Hillel Coren d07fec5d62 Fix for #816 preg_match() error on settings update 2016-04-19 21:46:18 +03:00
Hillel Coren fb975db1f2 Merge pull request #815 from joshuadwire/enterprise-plan 
Enterprise plan bug fixes
 2016-04-19 17:40:17 +03:00
Joshua Dwire 0fd39e5be0 Only allow pro trials 2016-04-19 10:28:27 -04:00
Hillel Coren 32d5a25f61 Enabled specifying invoice padding 2016-04-19 14:26:42 +03:00
Hillel Coren cd52faa3bf Automatically disable live preview when using a large font 2016-04-19 14:12:02 +03:00
Hillel Coren a805e2b8bb Merge pull request #814 from joshuadwire/enterprise-plan 
Enterprise plan
 2016-04-19 12:01:56 +03:00