1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-23 18:01:35 +02:00
Commit Graph

11 Commits

Author SHA1 Message Date
Jeramy Simpson
b356c61505 Fix merge from master
Moving migration file
2015-04-06 15:59:00 +10:00
Jeramy Simpson
b8c1d49e30 Remove last mentions of PHP-Payments
Closes #257
2015-04-06 15:55:17 +10:00
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
Hillel Coren
b8f2f59b5b Working on L5 2015-04-05 22:15:37 +03:00
Hillel Coren
58746d9eec Working on users in L5 2015-03-30 18:20:53 +03:00
Jeramy Simpson
c6d8b6f8e1 Merge Master Changes
Had to manually resolve conflict issues
2015-03-26 10:10:22 +10:00
Hillel Coren
d773c72970 Working on setup page 2015-03-25 21:56:31 +02:00
Jeramy Simpson
7718d8b8cb L5 Namespacing Update 2015-03-24 17:34:27 +10:00
Jeramy Simpson
04c392136e Add Files 2015-03-17 07:45:25 +10:00
root
2c696666df Initial Progress.
- Moved most files
- fixed composer dependencies
- Started fixing issues.
2015-03-12 13:39:52 +10:00
root
32e78ef3da Bring in Laravel5 framework. 2015-03-12 10:44:39 +10:00