1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Commit Graph

96 Commits

Author SHA1 Message Date
Hillel Coren
b233aa0744 Merge branch 'release-2.6'
Conflicts:
	.travis.yml
	CONTRIBUTING.md
	README.md
	app/Http/Controllers/AccountController.php
	app/Http/Controllers/AppController.php
	app/Http/Controllers/BaseAPIController.php
	app/Http/Controllers/CreditController.php
	app/Http/Controllers/DashboardController.php
	app/Http/Controllers/DocumentController.php
	app/Http/Controllers/PaymentController.php
	app/Http/Controllers/QuoteApiController.php
	app/Http/Requests/EntityRequest.php
	app/Http/routes.php
	app/Listeners/AnalyticsListener.php
	app/Models/Account.php
	app/Models/Credit.php
	app/Models/Document.php
	app/Models/EntityModel.php
	app/Models/Expense.php
	app/Models/Invoice.php
	app/Models/Task.php
	app/Models/VendorContact.php
	app/Ninja/Notifications/PushFactory.php
	app/Ninja/Repositories/DocumentRepository.php
	app/Ninja/Repositories/ExpenseRepository.php
	app/Ninja/Repositories/InvoiceRepository.php
	app/Services/PushService.php
	composer.json
	composer.lock
	database/migrations/2014_05_17_175626_add_quotes.php
	database/seeds/UserTableSeeder.php
	resources/lang/en/texts.php
	resources/views/accounts/customize_design.blade.php
	resources/views/accounts/invoice_design.blade.php
	resources/views/accounts/management.blade.php
	resources/views/expenses/edit.blade.php
	resources/views/header.blade.php
	resources/views/invoices/edit.blade.php
	resources/views/master.blade.php
	resources/views/payments/payment.blade.php
	resources/views/users/edit.blade.php
2016-07-11 23:33:58 +03:00
Hillel Coren
1adffcae37 Updated reseller pricing to match develop 2016-07-05 15:08:42 +03:00
Holger Lösken
7ddb69919e Updating contribution guideline
- Adding more details on how to contribute
2016-07-04 19:53:36 +02:00
Hillel Coren
50b71b07cc Updated reseller sign up fee 2016-06-29 23:08:55 +03:00
Hillel Coren
0250fcec23 Updated app links in readme 2016-06-29 13:40:07 +03:00
Hillel Coren
3feaaac95a Updated readme 2016-06-07 22:03:15 +03:00
Hillel Coren
d9af83fd54 Updated readme 2016-06-07 22:03:07 +03:00
Hillel Coren
9ddb2f5680 Updated readme 2016-06-07 22:01:21 +03:00
Hillel Coren
aef501be39 Updated readme 2016-06-07 22:01:00 +03:00
Hillel Coren
dafb867dc3 Updated link in readme 2016-06-02 22:05:29 +03:00
Hillel Coren
4eab4b60de Updated the Transifex link 2016-05-22 22:01:30 +03:00
Hillel Coren
43defa270a readme changes 2016-05-18 10:21:14 +03:00
Hillel Coren
e45ef02b75 readme changes 2016-05-18 10:20:51 +03:00
Hillel Coren
26e4fadbec Updated readme 2016-05-17 23:45:00 +03:00
Hillel Coren
8e3fa428c0 Updated readme 2016-05-17 23:44:50 +03:00
Hillel Coren
29616b2927 Added initial CONTRIBUTING.md 2016-05-17 22:06:15 +03:00
Hillel Coren
5cb8c317fd Added initial CONTRIBUTING.md 2016-05-17 22:05:21 +03:00
root
872e9db581 Delete everything in prep for laravel 5. 2015-03-12 10:43:47 +10:00
Kristof Feys
88eb0cdc3f typo fix 2015-02-17 16:45:27 +01:00
Hillel Coren
2295a64bff Implemented setup page 2014-11-28 15:34:01 +02:00
Hillel Coren
58a64c9490 Text changes 2014-11-16 23:29:30 +02:00
Hillel Coren
454e0321ad Text changes 2014-11-16 23:28:28 +02:00
Hillel Coren
d71043a2ba Text changes 2014-11-16 23:27:02 +02:00
Hillel Coren
a767f84908 Minor fixes 2014-11-04 20:32:18 +02:00
Hillel Coren
b11a169de1 Changes to the readme 2014-11-02 15:06:16 +02:00
Hillel Coren
e8dad88d15 Minor fixes 2014-11-02 14:47:28 +02:00
Hillel Coren
dbbb4eb722 Minor fixes 2014-11-02 14:46:18 +02:00
Troels Liebe Bentsen
4c74c3e173 Fix bower config and rebuild artifacts 2014-10-30 18:56:37 +01:00
Hillel Coren
8d623db294 Updating language files 2014-10-25 20:32:28 +03:00
Hillel Coren
48064313cc Working on d3 viz 2014-10-05 12:35:51 +03:00
Hillel Coren
a9182e1c2b Added AMPPS to readme 2014-09-30 16:39:02 +03:00
Hillel Coren
8bc065cd74 Text changes 2014-09-06 23:43:47 +03:00
Hillel Coren
c7309d13a7 Text changes 2014-09-06 23:42:31 +03:00
Hillel Coren
f5b16c82ad Text changes 2014-09-06 23:40:51 +03:00
Hillel Coren
0c38339e98 Text changes 2014-08-26 14:18:22 +03:00
Hillel Coren
24e62a83df Text changes 2014-08-26 14:17:07 +03:00
Hillel Coren
9feb616f1b Added support for Zapier 2014-07-27 23:31:41 +03:00
Hillel Coren
6175f3fc27 Updated readme 2014-07-11 11:12:52 +03:00
Hillel Coren
5bcf726df4 Updated readme 2014-07-11 11:10:54 +03:00
Troels Liebe Bentsen
6a4fae2e2b Extend the documentation to be more detailed and add section on Ubuntu 2014-07-04 17:59:00 +02:00
Hillel Coren
ada7246b2b Bug fixes 2014-06-29 20:23:10 +03:00
Hillel Coren
a14e00d520 Text changes 2014-05-15 17:57:07 +03:00
Hillel Coren
6bdc9e9eb9 Working on advanced settings 2014-05-08 22:19:33 +03:00
Hillel Coren
3e26880561 Adding custom invoice colors 2014-04-29 23:46:40 +03:00
Hillel Coren
483e1602df Text changes 2014-04-29 12:27:02 +03:00
Hillel Coren
6e3aa9f603 Text changes 2014-04-29 12:26:34 +03:00
Hillel Coren
fc8c4610c7 Text changes 2014-04-25 12:11:20 +03:00
Hillel Coren
f7c41827bf Adding bower dependancies 2014-04-22 14:33:53 +03:00
Hillel Coren
c557276a6e Working on pro plan 2014-04-13 11:19:10 +03:00
Hillel Coren
944ef2ccd3 Working on pro plan 2014-04-12 21:55:40 +03:00