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
..
accounts	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-16 11:34:00 +03:00
auth
clientauth	Add basic ACH support	2016-04-29 17:50:21 -04:00
clients	Merge pull request #4 from joshuadwire/laravel-acl	2016-05-06 14:17:16 -04:00
credits
emails	Changes to support transifex.com	2016-05-15 23:16:08 +03:00
errors
expenses	Changes to support transifex.com	2016-05-15 23:16:08 +03:00
export
invited	Merge remote-tracking branch 'upstream/develop' into payments-changes	2016-05-10 10:25:42 -04:00
invoices	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-16 11:34:00 +03:00
partials
payments	Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop	2016-05-16 11:34:00 +03:00
public	Clean up diffs between branches	2016-05-10 22:41:30 +03:00
reports	Fix for data viz	2016-05-10 12:20:53 +03:00
tasks	Moving permissions to form requests	2016-05-01 15:35:51 +03:00
timesheets
users	Only show user’s own tokens	2016-05-08 21:50:35 +03:00
vendor
vendors	Changed vendorcontacts to vendor_contacts	2016-05-04 15:16:49 +03:00
client.blade.php	Finalize multi-plan support	2016-04-18 22:35:18 -04:00
coming_soon.blade.php
dashboard.blade.php	Finish migrating to Laravel ACL	2016-04-25 21:53:39 -04:00
datatable.blade.php
error.blade.php
export.blade.php
header.blade.php	Changes to support transifex.com	2016-05-15 23:16:08 +03:00
list.blade.php	Better refund handling	2016-05-14 23:03:39 -04:00
master.blade.php	Merge remote-tracking branch 'upstream/develop' into payments-changes	2016-05-10 10:25:42 -04:00
money_script.blade.php	Added Pakistani Rupee	2016-05-05 22:49:09 +03:00
plans.blade.php
public_list.blade.php	Update UI for configuring auto bill	2016-05-09 16:29:02 -04:00
secure_payment.blade.php
setup.blade.php
user_account.blade.php
vendor.blade.php