Fabian Marz 6e9fe96f8f Merge branch 'master' of https://github.com/fabianmarz/invoice-ninja ...

Conflicts:
	app/views/clients/show.blade.php

2015-02-18 23:00:37 +01:00

..

commands

Minor bug fixes

2014-12-07 10:47:58 +02:00

config

Bug fixes

2015-01-11 13:56:58 +02:00

controllers

Added support for Stripe token billing

2015-02-18 00:22:12 +02:00

database

Added Swiss Franc

2015-02-18 14:59:25 +02:00

handlers

Bug fixes

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

includes

…

lang

Added translation string and fixed german string

2015-02-18 22:58:17 +01:00

libraries

Enabled fixed amount discounts

2014-12-04 00:05:38 +02:00

models

Added support for Stripe token billing

2015-02-18 00:22:12 +02:00

ninja

Added ability for clients to approve a quote, converting it to an invoice

2015-02-16 18:15:05 +02:00

start

Minor changes

2014-12-14 16:55:13 +02:00

storage

…

tests

Refactor code and do more work on import function

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

views

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

2015-02-18 23:00:37 +01:00

filters.php

Implemented setup page

2014-11-28 15:34:01 +02:00

routes.php

Added support for Stripe token billing

2015-02-18 00:22:12 +02:00