Jeramy Simpson b51f889219 Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5 ...

Fixed Conflicts:
	resources/views/invoices/view.blade.php

2015-04-06 10:32:23 +10:00

..

accounts

Working on L5

2015-04-05 22:15:37 +03:00

auth

Working on L5

2015-03-31 21:50:58 +03:00

clients

Working on L5

2015-04-02 14:09:32 +10:00

credits

Working on L5

2015-04-01 18:44:55 +03:00

emails

Working on L5

2015-04-05 22:15:37 +03:00

invoices

Merge branch 'master' of github.com:hillelcoren/invoice-ninja into laravel-5

2015-04-06 10:32:23 +10:00

payments

L5 Updates

2015-04-06 10:28:43 +10:00

public

Working on users in L5

2015-03-30 22:45:10 +03:00

reports

Working on L5

2015-04-01 22:57:02 +03:00

timesheets

Add Files

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

users

Working on L5

2015-04-01 22:57:02 +03:00

vendor/chumper.datatable

Fixed creating invoices

2015-03-31 12:38:24 +03:00

client.blade.php

Working on L5

2015-04-01 18:44:55 +03:00

coming_soon.blade.php

Add Files

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

dashboard.blade.php

Working on L5

2015-04-02 16:06:16 +03:00

datatable.blade.php

Working on L5

2015-04-02 14:09:32 +10:00

error.blade.php

Add Files

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

header.blade.php

Working on L5

2015-04-05 22:15:37 +03:00

list.blade.php

Working on L5

2015-04-01 22:57:02 +03:00

master.blade.php

Working on L5

2015-04-02 14:09:32 +10:00

plans.blade.php

Working on L5

2015-04-05 22:15:37 +03:00

public_list.blade.php

Add Files

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

script.blade.php

Working on users in L5

2015-03-30 22:45:10 +03:00

secure_payment.blade.php

Add Files

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

setup.blade.php

Comment out JS Validation

2015-03-26 10:04:55 +10:00