Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-22 09:21:34 +02:00
Code Issues Releases Activity
3,599 Commits 7 Branches 902 Tags 2 GiB
7438545aea
Commit Graph

2202 Commits

Author SHA1 Message Date
Hillel Coren
7438545aea Bug fixes 2016-07-14 12:47:33 +03:00
Hillel Coren
92043afb9c WePay fixes 2016-07-13 16:35:56 +03:00
Hillel Coren
a32e372d40 Bug fix 2016-07-12 08:05:26 +03:00
Hillel Coren
316284b7e2 Bug fixes 2016-07-11 23:36:51 +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
abe5a8368d Bumped version number to 2.6 2016-07-11 22:59:16 +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
6756fde908 Merge pull request #955 from codedge/#583-Add-Task-creating-editing-to-activity-stream 
#583 add task creating editing to activity stream
 2016-07-10 12:42:29 +03:00
Hillel Coren
fd2155d10a Merge pull request #950 from codedge/#868-Configurable-start-of-week 
Adding configuration for first day of the week
 2016-07-10 12:42:12 +03:00
Hillel Coren
386c606558 Added support for taxes to expenses 2016-07-07 19:54:06 +03:00
Hillel Coren
3498d28d3f Check expense category name is unique 2016-07-07 15:32:31 +03:00
Hillel Coren
5f8ae65310 Working on expense category permissions 2016-07-07 11:44:15 +03:00
Hillel Coren
e6b60c6f1a Working on expense categories 2016-07-07 11:03:43 +03:00
Hillel Coren
cd9aae1e22 Working on expense categories 2016-07-06 21:35:16 +03:00
Hillel Coren
21a91ff0e1 Added expense category 2016-07-05 21:49:47 +03:00
Holger Lösken
d1dc1a7e5b Added tasks to activity on dashboard 
- Fixes #583 and resolves #583
- Creating and updating tasks creates an activity now
- Each has its own event
- The activity is shown on the dashboard
 2016-07-05 16:31:57 +00:00
Hillel Coren
979690d116 Improved options when exporting data 2016-07-05 16:09:52 +03:00
Hillel Coren
3c66c0166b Fixed bug preventing switching back to subdomain from website 2016-07-05 12:49:09 +03:00
Hillel Coren
1fe671bffb Trim trailing slash from APP_URL 2016-07-05 12:28:28 +03:00
Hillel Coren
fdb2aefc66 Improved help for 2checkout.com 2016-07-04 22:26:41 +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
0dc9b3fceb Made 'viewable' scope default behavior 2016-07-04 19:49:01 +03:00
Holger Lösken
fcc8cac7b5 Adding configuration for first day of the week 
- Fix #868 and resolves #868
- The first day of the week can be configured in localization settings,
which affects the Bootstrap date picker
 2016-07-04 16:20:22 +02:00
Hillel Coren
637f298818 Fix for approving quote 2016-07-04 13:21:40 +03:00
Hillel Coren
6217419a2f Fix for upgrading directly after signing up 2016-07-04 13:03:09 +03:00
Hillel Coren
4a6673b25e Enbled specifying latest self host version 2016-07-04 12:57:14 +03:00
Hillel Coren
8b14161d0a Fix for expense test 2016-07-04 12:41:44 +03:00
Hillel Coren
9dffc95eab Fixes for refactor 2016-07-04 10:02:18 +03:00
Hillel Coren
463f1dd444 Fixes for refactor 2016-07-04 10:00:00 +03:00
Hillel Coren
6f1776004a Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-04 09:40:06 +03:00
Hillel Coren
5d7f7ec02c Merge pull request #946 from codedge/#942-Refactoring-dead-code-unused-uses 
#942 refactoring dead code unused uses
 2016-07-04 09:38:50 +03:00
Holger Lösken
a114f60127 Adding translation support for languages 
- Languages can now be translated via texts.php
 2016-07-04 01:02:38 +02: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
710200ef3f Fix for client portal when payments are disabled 2016-07-03 17:09:39 +03:00
Hillel Coren
d2c0003ec9 Fix for should be invoiced option on expense 2016-07-03 16:20:10 +03:00
Hillel Coren
19b443d641 Fix for #917 2016-07-03 15:56:01 +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
f9aee23de8 Merge pull request #923 from vincentdh/develop 
Add Mailgun API in mail drivers
 2016-07-03 11:58:24 +03:00
Hillel Coren
3f974d0344 Optimized send recurring invoices command 2016-07-01 10:29:24 +03:00
Hillel Coren
fbdabdee64 Minor formatting change 2016-06-30 21:05:02 +03:00
Hillel Coren
6dfd50bddd Fix for enabling autobilling 2016-06-30 20:53:06 +03:00
Hillel Coren
2438fa4fda Merge pull request #931 from codedge/#203-Use-database-prefix-dashboard 
Fix #203
 2016-06-30 17:44:40 +03:00
Holger Lösken
3d3aab41e0 Fixed wrong translation name, need to include the file "texts." 2016-06-30 15:23:45 +02:00