Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Code Issues Releases Activity
3,656 Commits 9 Branches 921 Tags 2 GiB
97a56fac13
Commit Graph

516 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
e7c8ca50db API optimization 2016-07-19 10:07:56 +03:00
Hillel Coren
109c97dc55 Fix for is_system setting in actvities 2016-07-19 09:57:17 +03:00
Hillel Coren
6cc84ddfab Add link to WePAY TOS 2016-07-18 22:58:56 +03:00
Hillel Coren
ce6068f924 Additional online payment checks 2016-07-18 22:03:28 +03:00
Hillel Coren
078964d297 Improve offsite payment checks 2016-07-18 21:45:32 +03:00
Hillel Coren
0d58e6da94 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-16 23:51:30 +03:00
Hillel Coren
1e568dc408 Fixes for WePay 2016-07-16 23:51:18 +03:00
David Bomba
20c9d661ac Merge pull request #985 from turbo124/develop 
Fix typo
 2016-07-16 07:52:58 +10:00
David Bomba
cfb32f244a Fix typo 2016-07-16 07:52:00 +10:00
Hillel Coren
36e50e7bcb Fixes for the API 2016-07-15 16:47:18 +03:00
Hillel Coren
2440070376 Fix for token billing 2016-07-15 11:25:22 +03:00
Hillel Coren
cf3465b5e2 Fix for token billing 2016-07-15 11:23:19 +03:00
Hillel Coren
c6bf1d5fcc Fix for wepay fee 2016-07-15 10:41:16 +03:00
Hillel Coren
431f596d1d Working on new pricing 2016-07-14 22:58:48 +03:00
Hillel Coren
8590f9ad17 Working on new pricing 2016-07-14 12:46:00 +03:00
Hillel Coren
92043afb9c WePay fixes 2016-07-13 16:35:56 +03:00
Hillel Coren
b9f9c0807d WePay fixes 2016-07-13 16:34:26 +03:00
Hillel Coren
fa9b0bf78b Working on buy now buttons 2016-07-13 12:03:39 +03:00
Hillel Coren
401851e212 Working on buy now buttons 2016-07-12 23:46:41 +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
243005b667 Prevent expense or task invoice item from creating a product 2016-07-11 20:17:41 +03:00
Hillel Coren
986487b4c9 Working on new hosted pricing 2016-07-11 20:08:43 +03:00
Hillel Coren
afb34d1de6 Fix saving task without a client 2016-07-10 13:20:22 +03:00
Hillel Coren
5f8ae65310 Working on expense category permissions 2016-07-07 11:44:15 +03:00
Hillel Coren
cd9aae1e22 Working on expense categories 2016-07-06 21:35:16 +03:00
Hillel Coren
b5f606df47 Added and as email template variables 2016-07-04 21:47:05 +03:00
Hillel Coren
aba50f66dc Added website field to client CSV import 2016-07-04 21:33:50 +03:00
Hillel Coren
251438dc41 Fix for expenseCategories 2016-07-04 20:19:22 +03:00
Hillel Coren
8b14161d0a Fix for expense test 2016-07-04 12:41:44 +03:00
Hillel Coren
6f1776004a Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-04 09:40:06 +03:00
Holger Lösken
0fbda85a59 Code Refactoring 
- Removed unused uses
- Type hinting for method parameters
- Removed commented code
- Introduced comments for classes and methods
- Short array syntax
 2016-07-03 16:19:22 +00:00
Hillel Coren
d2c0003ec9 Fix for should be invoiced option on expense 2016-07-03 16:20:10 +03:00
Hillel Coren
3025fb3f0b Merge pull request #938 from codedge/#426-Translate-hardcoded-string 
Fix hardcoded translations for industry, country and payment types
 2016-07-03 13:16:20 +03:00
Hillel Coren
32a2f6cdc7 Fix for #920 2016-07-03 12:33:35 +03:00
Holger Lösken
337ed1c719 - Fix #426, closes #426 
- Moved translations for industries, countries into texts.php
- Removed nested arrays in texts.php
 2016-07-03 09:26:08 +00:00
Holger Lösken
b13b9a2d7d Fix hardcoded translations for industry, country and payment types 
- Fixes #426, resolves #426
 2016-07-03 09:24:55 +00:00
Hillel Coren
fbdabdee64 Minor formatting change 2016-06-30 21:05:02 +03:00
Holger Lösken
3d3aab41e0 Fixed wrong translation name, need to include the file "texts." 2016-06-30 15:23:45 +02:00
Holger Lösken
1717028d36 Fixed wrong translation name, need to include the file "texts." 2016-06-30 15:21:03 +02:00
Holger Lösken
ae78a177b0 Fix #562 
Make „Manual entry“ translatable
 2016-06-30 14:38:55 +02:00
Hillel Coren
c1713c190c Fix for go pro process 2016-06-28 21:21:54 +03:00
Hillel Coren
d71cf4dd49 Payment fixes 2016-06-26 19:38:36 +03:00
Hillel Coren
15781ff895 Payment token fixes 2016-06-26 13:45:50 +03:00
Hillel Coren
7c0875841a Fixed autobill message in emails 2016-06-26 12:59:42 +03:00
Hillel Coren
45fce3bfe9 Payment webhook fixes 2016-06-24 18:15:51 +03:00
Hillel Coren
406249ef95 Payment webhook fixes 2016-06-24 15:40:10 +03:00
Hillel Coren
d71017e203 Payment webhook bug fixes 2016-06-23 20:17:02 +03:00
Hillel Coren
74a0deb07e Web hook bug fixes 2016-06-23 16:27:54 +03:00
Hillel Coren
6ad49cf281 Fixing payment hooks 2016-06-23 16:15:52 +03:00