Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 15:13:29 +01:00
Code Issues Releases Activity
3,685 Commits 9 Branches 923 Tags 2 GiB
a0ccfd65b4
Commit Graph

73 Commits

Author SHA1 Message Date
Hillel Coren
f42e8158c2 Merge branch 'release-2.6.4' 
Conflicts:
	app/Http/Controllers/AccountController.php
	app/Http/routes.php
	app/Models/User.php
	resources/lang/en/texts.php
 2016-07-19 19:18:24 +03:00
Hillel Coren
7c303e514f Temp fix for automated test 2016-07-13 20:16:45 +03:00
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
c8573df879 Disabled user test 2016-07-11 22:16:06 +03:00
Hillel Coren
46ad320962 Fix for go pro test 2016-06-28 21:21:01 +03:00
Hillel Coren
6836ed849b Fix for test 2016-06-21 12:31:38 +03:00
Hillel Coren
b06b437e27 Fix for tests 2016-06-20 22:26:48 +03:00
Hillel Coren
c5e4707ef5 Fix for tests 2016-06-09 11:27:22 +03:00
Hillel Coren
ffa67cef3b Refactoring payments code... 2016-06-09 10:56:22 +03:00
Hillel Coren
cc55cdc1b5 Working on tests 2016-06-07 17:29:26 +03:00
Hillel Coren
6b7542085a Working on tests 2016-06-07 17:18:52 +03:00
Hillel Coren
a1f0461e02 Working on tests 2016-06-07 17:07:28 +03:00
Hillel Coren
3b9b4a049e Fix for online payment test 2016-06-06 21:59:27 +03:00
Hillel Coren
02b0840215 Fix for online payment test 2016-05-13 10:38:42 +03:00
Hillel Coren
a00a86a578 Fix for travis 2016-05-05 10:23:09 +03:00
Hillel Coren
3b508f656b Fix for travis test 2016-05-05 09:35:39 +03:00
Hillel Coren
db9d75ceff Changed vendorcontacts to vendor_contacts 2016-05-04 15:16:49 +03:00
Hillel Coren
dfa6c518ab Fix for travis test 2016-05-03 23:15:41 +03:00
Hillel Coren
871456d402 Fix for travis test 2016-05-03 11:40:17 +03:00
Hillel Coren
0645cdddb1 Fix for travis tests 2016-05-03 09:47:47 +03:00
Hillel Coren
95fdda6e1b Fix for travis tests 2016-05-02 23:11:16 +03:00
Hillel Coren
f74b30cdde Added automated tests for API 2016-05-02 22:51:22 +03:00
Hillel Coren
29a03179a9 Fix for travis tests 2016-05-02 22:34:30 +03:00
Hillel Coren
a9e10985a1 Fix for tests 2016-04-30 21:52:53 +03:00
Hillel Coren
a24ae57b4e Fix for travis tests 2016-04-30 21:41:05 +03:00
Hillel Coren
fb9a2de240 Working on TaxRates test 2016-04-15 10:25:26 +03:00
Hillel Coren
27f72a4730 Fix for tax rates test 2016-04-11 11:48:46 +03:00
Hillel Coren
f32a497d0d Fix for tax rates test 2016-03-15 16:55:23 +02:00
Hillel Coren
ad12557c78 Fix for tax rates test 2016-03-15 15:25:00 +02:00
Hillel Coren
b076ed07ea Working on Travis tests 2016-03-15 13:50:33 +02:00
Hillel Coren
8f99fc0b87 Working on Travis tests 2016-03-15 13:13:46 +02:00
Hillel Coren
3a39da55fd Added test for quotes 2016-03-13 17:38:55 +02:00
Hillel Coren
be922725cd Fix for taxes test 2016-03-09 17:02:16 +02:00
Hillel Coren
bc3096f800 Fix for tax rate test 2016-03-08 23:39:05 +02:00
Hillel Coren
bfe3262024 Fix for tax test 2016-03-08 22:05:56 +02:00
Hillel Coren
cc03b4456c Working on tests 2016-03-02 19:23:20 +02:00
Hillel Coren
3f11969c7c Fix for tests after product_key change 2016-02-29 20:08:09 +02:00
Hillel Coren
4463030865 Added test for vendors and expenses 2016-02-26 13:36:50 +02:00
Hillel Coren
ce2e8c149a Added test for vendors and expenses 2016-02-26 11:47:39 +02:00
Hillel Coren
1cb199f491 Working on taxes test 2016-02-19 08:42:46 +02:00
Hillel Coren
fed9078c42 Travis... 2016-02-18 23:05:30 +02:00
Hillel Coren
fcc1d62d9b Fixing test payment in Travis 2016-02-18 16:59:50 +02:00
Hillel Coren
dffe4a1b55 Working on TravisCI 2016-02-18 14:48:24 +02:00
Hillel Coren
5c8b4f4ba3 Changed dataviz to red/green 2016-02-17 22:59:06 +02:00
Hillel Coren
f5d008a607 Working on TravisCI 2016-02-17 22:08:57 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
Hillel Coren
e9cacf2fdf Added tax rates and localization to the API 2016-02-03 16:03:56 +02:00
Hillel Coren
efc9ab4f9e Working on OFX support 2016-01-26 22:22:33 +02:00
Hillel Coren
79ab9f9c48 Working on acceptance test for tax rates 2016-01-18 15:11:37 +02:00
Hillel Coren
cbe2b2905e Added autolink to emails and fixed checkout.com integration 2016-01-18 10:30:42 +02:00