Troels Liebe Bentsen d5306ef1cd Merge branch 'master' of github.com:tlbdk/invoice-ninja ...

Conflicts:
	Gruntfile.js
	app/lang/en/texts.php
	bower.json
	public/built.css
	public/built.js

2014-10-30 18:42:26 +01:00

..

commands

Implement delete handling and do more checks to make sure we dont get corrupted ical files

2014-10-20 20:59:46 +02:00

config

Add ide helper and do composer update and fix reference for Former so it does not pull in too new version of laravel

2014-09-30 12:26:47 +02:00

controllers

Merge branch 'master' of github.com:tlbdk/invoice-ninja

2014-10-30 18:42:26 +01:00

database

Merge branch 'master' of github.com:tlbdk/invoice-ninja

2014-10-30 18:42:26 +01:00

handlers

Bug fixes

2014-03-23 21:38:03 +02:00

includes

Initial commit

2013-11-26 14:45:07 +02:00

lang

Merge branch 'master' of github.com:tlbdk/invoice-ninja

2014-10-30 18:42:26 +01:00

libraries

Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja

2014-10-20 19:10:04 +02:00

models

Merge branch 'master' of github.com:tlbdk/invoice-ninja

2014-10-30 18:42:26 +01:00

ninja

Merge branch 'master' of github.com:tlbdk/invoice-ninja

2014-10-30 18:42:26 +01:00

start

More work on the event importer and fix some module issues

2014-10-06 03:00:31 +02:00

storage

added empty directories

2014-01-15 14:04:45 +00:00

tests

Refactor code and do more work on import function

2014-10-06 20:42:07 +02:00

views

Merge branch 'master' of github.com:tlbdk/invoice-ninja

2014-10-30 18:42:26 +01:00

filters.php

Bug fixes

2014-10-26 22:13:50 +02:00

routes.php

Merge branch 'master' of github.com:tlbdk/invoice-ninja

2014-10-30 18:42:26 +01:00