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

..

accounts

Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

2016-04-19 22:48:03 +03:00

auth

Changed /forgot to /recover_password

2016-04-15 13:25:58 +03:00

clientauth

Changed /forgot to /recover_password

2016-04-15 13:25:58 +03:00

clients

Finalize multi-plan support

2016-04-18 22:35:18 -04:00

credits

API improvements

2015-09-07 12:07:55 +03:00

emails

Improved HTML email margins

2016-04-18 10:28:30 +03:00

errors

Bug fixes

2015-06-07 11:05:30 +03:00

expenses

Finalize multi-plan support

2016-04-18 22:35:18 -04:00

export

Improvements to data export

2016-02-25 11:25:19 +02:00

invited

Migrate logos to use Laravel Filesystem

2016-03-22 16:19:55 -04:00

invoices

Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop

2016-04-19 22:48:03 +03:00

partials

Fix for checkouit.com integration

2016-03-09 20:31:54 +02:00

payments

Added client side card check with StripeJS

2016-03-14 12:12:09 +02:00

public

Add client portal documents tab

2016-03-24 11:58:30 -04:00

reports

Finalize multi-plan support

2016-04-18 22:35:18 -04:00

tasks

Fix for #751

2016-03-03 22:24:27 +02:00

timesheets

Add Files

2015-03-17 07:45:25 +10:00

users

Finalize multi-plan support

2016-04-18 22:35:18 -04:00

vendor

Bug fixes

2015-11-09 13:46:53 +02:00

vendors

Finalize multi-plan support

2016-04-18 22:35:18 -04:00

client.blade.php

Finalize multi-plan support

2016-04-18 22:35:18 -04:00

coming_soon.blade.php

Add Files

2015-03-17 07:45:25 +10:00

dashboard.blade.php

Fix invoice links on dashboard

2016-03-19 21:57:20 -04:00

datatable.blade.php

Upgrade to Laravel 5.2

2016-03-02 15:36:42 +02:00

error.blade.php

Bug fixes

2015-12-31 13:31:50 +02:00

export.blade.php

Improvements to data export

2016-02-25 11:25:07 +02:00

header.blade.php

Finalize multi-plan support

2016-04-18 22:35:18 -04:00

list.blade.php

Finalize multi-plan support

2016-04-18 22:35:18 -04:00

master.blade.php

Track JS errors as analytics events

2016-04-14 10:32:48 +03:00

money_script.blade.php

Show currency code after amount

2016-01-18 16:35:05 +02:00

plans.blade.php

Bug fixes

2015-04-27 15:28:40 +03:00

public_list.blade.php

Minor improvements to client portal styling

2016-03-21 22:34:30 +02:00

secure_payment.blade.php

Add Files

2015-03-17 07:45:25 +10:00

setup.blade.php

Updated PHP version check to 5.5.9

2016-02-28 14:09:42 +02:00

user_account.blade.php

Migrate logos to use Laravel Filesystem

2016-03-22 16:19:55 -04:00

vendor.blade.php

Vendor

2016-01-07 16:21:13 +01:00