Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-23 01:41:34 +02:00
Code Issues Releases Activity
4,111 Commits 7 Branches 902 Tags 2 GiB
4ac566f3fb
Commit Graph

4111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Holger Lösken
1e0e6f5397 Merge remote-tracking branch 'upstream/master' 2016-07-12 09:59:47 +00:00
Shaikh Mohammed Mudasir
5efc58079c Added mcrypt, gmp and gd extension, also declare PHP minimum requirement. 2016-07-12 12:55:05 +05:30
Hillel Coren
a32e372d40 Bug fix 2016-07-12 08:05:26 +03:00
Hillel Coren
e68e213237 Bug fixes 2016-07-11 23:38:06 +03:00
Hillel Coren
316284b7e2 Bug fixes 2016-07-11 23:36:51 +03:00
Hillel Coren
ad65b61a80 Merge branch 'release-2.6' into develop 2016-07-11 23:34:19 +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
ca94f5053e Prevent payments for deleted invoices from being included in export 2016-07-11 22:24:49 +03:00
Hillel Coren
6dba7f7153 Minor style change 2016-07-11 22:16:36 +03:00
Hillel Coren
c8573df879 Disabled user test 2016-07-11 22:16:06 +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
28d8e53764 Updated plan price field name 2016-07-10 16:53:01 +03:00
Hillel Coren
bf8ab297f9 Updated plan price field name 2016-07-10 16:49:48 +03:00
Hillel Coren
5fbae548e2 Updated plan price field name 2016-07-10 16:47:22 +03:00
Hillel Coren
afb34d1de6 Fix saving task without a client 2016-07-10 13:20:22 +03:00
Hillel Coren
3ae8df3fdf Merge migrations 2016-07-10 12:45:42 +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
b128f027c3 Migration for new pricing 2016-07-10 12:39:34 +03:00
Holger Lösken
d00408b2e9 Make the command work for one/multiple accounts 2016-07-10 11:16:40 +02:00
Holger Lösken
5146fab45d - Added account selection by passing a parameter to the command 
- Added an success message
 2016-07-09 23:54:59 +02:00
Holger Lösken
790766c028 Reset the invoice schema counter 
- Fix #585 and resolve #585
- Reset the invoice schema counter back to „1“ at the turn of the year
- Implemented as command the also call it manually
 2016-07-09 23:38:33 +02: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
Holger Lösken
42c51ea94a Create virtual display_name field on client 
- Create virtual display_name field on client
- Create accessor for it
 2016-07-06 19:42:36 +02:00
codedge
08f234e776 Merge pull request #2 from abbyarmada/master 
Update .codeclimate.yml
 2016-07-06 18:32:49 +02:00
Holger Lösken
f091cbd060 Show client name next to invoice no. on dashboard 
- Fix #949 and resolves #949
- Display client name next to invoice number on dashboard
 2016-07-06 18:30:23 +02:00
Hillel Coren
965ff2e252 Working on expense test 2016-07-06 10:44:05 +03:00
Hillel Coren
d83f2dc246 Working on expense test 2016-07-06 10:31:06 +03:00
Hillel Coren
894cac4657 Working on expense test 2016-07-06 10:04:59 +03:00
Hillel Coren
19b8212e32 Working on expense test 2016-07-06 09:56:39 +03:00
Abby Armada
6d3d7c725b Update .codeclimate.yml 
- add more exclusions.
 2016-07-05 15:42:06 -04:00
Abby Armada
3afc29a571 Update .codeclimate.yml 
Testing ESLint
 2016-07-05 15:22:40 -04:00
Hillel Coren
21a91ff0e1 Added expense category 2016-07-05 21:49:47 +03:00
Abby Armada
af41cc2cb5 Update .codeclimate.yml 
- Duplication engine time out test
 2016-07-05 14:43:35 -04:00
Abby Armada
9aa140011a Update .codeclimate.yml 
- Add nodes for engines and ratings
- Fix spacing
 2016-07-05 14:24:44 -04:00
Holger Lösken
c787c2c150 Merge branch '#583-Add-Task-creating-editing-to-activity-stream' of github.com:codedge/invoiceninja into #583-Add-Task-creating-editing-to-activity-stream 2016-07-05 16:32:56 +00: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
Holger Lösken
9095d90842 Added tasks to activity on dashboard 
- Creating and updating tasks creates an activity now
- Each has its own event
- The activity is shown on the dashboard
 2016-07-05 18:30:29 +02:00
Hillel Coren
f2cbfec926 Improved options when exporting data 2016-07-05 17:27:30 +03:00
Hillel Coren
979690d116 Improved options when exporting data 2016-07-05 16:09:52 +03:00
Hillel Coren
81898338e0 Added back laravelcollective/bus to support maatwebsite/excel 2016-07-05 16:02:28 +03:00
Hillel Coren
1adffcae37 Updated reseller pricing to match develop 2016-07-05 15:08:42 +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