Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 13:12:50 +01:00
Code Issues Releases Activity
4,099 Commits 7 Branches 917 Tags 2 GiB
078527443f
Commit Graph

2444 Commits

Author SHA1 Message Date
Hillel Coren
26bf6725d7 Fix for expense categories 2016-08-23 13:42:02 +03:00
Hillel Coren
59451112fe Log OFX parsing errors 2016-08-22 13:32:10 +03:00
Hillel Coren
5389a5aa87 Merge branch 'Self-updater' of https://github.com/codedge/invoiceninja into codedge-Self-updater 
Conflicts:
	resources/lang/en/texts.php
 2016-08-21 19:39:31 +03:00
Hillel Coren
b405ed84da Prevent invoices with expenses from creating products 2016-08-21 18:47:56 +03:00
Hillel Coren
de602283c1 Added 'tax' as custom label 2016-08-21 18:39:43 +03:00
Hillel Coren
6c92a6a94a Enabled adding expense to open invoice 2016-08-21 18:25:35 +03:00
Holger Lösken
d2d64d2a63 Use self-updater package, initial commit 2016-08-19 13:13:55 +00:00
Hillel Coren
6485ab44cc Fix for #993 2016-08-19 15:43:25 +03:00
Hillel Coren
8bcae45b00 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-08-19 13:23:05 +03:00
Hillel Coren
3a7d21a0b0 Added basic product report 2016-08-18 12:17:02 +03:00
Hillel Coren
106cefd9c9 Updated hosted pricing 2016-08-18 11:54:56 +03:00
David Bomba
6d227968c0 type 2016-08-18 17:54:47 +10:00
David Bomba
62e1442a30 merge 2016-08-18 17:33:12 +10:00
Hillel Coren
6f6a475633 API changes 2016-08-17 17:29:25 +03:00
Hillel Coren
2f5235f1f0 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-08-17 17:15:25 +03:00
David Bomba
9dd170d698 adding new CSRF white list items 2016-08-17 21:29:48 +10:00
Hillel Coren
6675814f8d Added docs to the subdomain exclude list 2016-08-17 13:08:46 +03:00
Hillel Coren
60ce97fe79 Added JayBizzle/Laravel-Crawler-Detect to improve the error logs 2016-08-17 12:51:26 +03:00
David Bomba
05340d3e4a Add updated_at into Activity Transformer 2016-08-17 18:56:31 +10:00
Hillel Coren
ad5b185c7c Add key for activities 2016-08-17 10:55:50 +03:00
Hillel Coren
ef4c0c4237 Fixed PayFast integration 2016-08-15 23:14:08 +03:00
Hillel Coren
f7e499da4d Disable date validation 2016-08-15 22:57:05 +03:00
Hillel Coren
b35c44b1e8 Fixes for JSON import 2016-08-15 21:37:47 +03:00
Hillel Coren
c01e42ac87 Added option to include line item taxes in line total 2016-08-15 18:08:06 +03:00
Hillel Coren
d94974db59 Added activities to API dashboard data 2016-08-15 16:43:59 +03:00
Hillel Coren
2ebd40f46e Added activities to API dashboard data 2016-08-15 16:43:26 +03:00
Hillel Coren
8262e40942 Working on dashboard API 2016-08-15 06:46:47 +03:00
Hillel Coren
3d9b712fb7 Improve test data 2016-08-14 22:29:34 +03:00
Hillel Coren
918d58e0b6 Bot fixes 2016-08-14 13:33:22 +03:00
Hillel Coren
698c1d088d Fixes for the bot 2016-08-14 12:31:11 +03:00
Hillel Coren
bfae5018e0 Fixes for the bot 2016-08-14 12:30:16 +03:00
Hillel Coren
54a00f7bea Fix for invoice item model 2016-08-14 09:50:41 +03:00
Hillel Coren
e3d9ac9724 Updated version 2016-08-14 09:08:41 +03:00
Hillel Coren
ce2c71843c Working on the bot 2016-08-13 22:19:37 +03:00
Hillel Coren
e4929c1008 Fix for cancelled mollie payments 2016-08-11 13:17:01 +03:00
Hillel Coren
1f537c77af Change for tests 2016-08-10 21:07:02 +03:00
Hillel Coren
73574fbd14 Workign on the bot 2016-08-10 20:48:24 +03:00
Hillel Coren
e7e3ce6e5c Working on the bot 2016-08-10 17:04:33 +03:00
Hillel Coren
0a7381294e Working on the bot 2016-08-10 17:04:17 +03:00
Hillel Coren
815c3991a6 Working on the bot 2016-08-10 15:57:34 +03:00
Hillel Coren
d374843e50 Working on the bot 2016-08-09 23:06:24 +03:00
Hillel Coren
5a4f705c8b working on the bot 2016-08-09 17:14:26 +03:00
Hillel Coren
8256e88286 Fix for user permissions 2016-08-09 09:48:41 +03:00
Hillel Coren
e36db657cc Fix for applying multiple credits 2016-08-09 09:39:20 +03:00
Hillel Coren
e85517c4a8 Permission fix for saving invoice 2016-08-08 23:47:09 +03:00
Hillel Coren
e65fdd54b0 Fix for online payments page 2016-08-08 21:21:43 +03:00
Hillel Coren
472ba842eb Working on the bot 2016-08-08 17:45:37 +03:00
Hillel Coren
f8fda5f241 Working on the bot 2016-08-07 22:42:32 +03:00
Hillel Coren
325aaa3272 Added back error method 2016-08-07 22:42:24 +03:00
Hillel Coren
045c25d3a7 Set grandfathered id 2016-08-07 11:10:59 +03:00
Hillel Coren
b8a124dc0f Working on our bot 2016-08-07 09:10:36 +03:00
Hillel Coren
f1a278e4ff Working on our bot 2016-08-06 20:54:56 +03:00
Hillel Coren
0746500c1a Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-08-04 20:02:55 +03:00
Hillel Coren
7f3bd44d9a Working on bots 2016-08-04 20:01:30 +03:00
Hillel Coren
845e25df2d Remove seeder from migration to prevent class not found errors 2016-08-04 20:00:50 +03:00
David Bomba
ef8d2615f4 improve error handling for document downloads 2016-08-03 23:03:14 +10:00
David Bomba
e393b891bd improve error handling for document downloads 2016-08-03 23:02:42 +10:00
Hillel Coren
d64f18ef99 Looking into bots... 2016-08-03 12:40:40 +03:00
Hillel Coren
8dc1786eb2 Fix for archiving API token 2016-08-02 17:38:51 +03:00
Hillel Coren
293e7cbb61 Support saving credit card and paypal tokens for the same client 2016-08-02 13:40:20 +03:00
Hillel Coren
60ce0716a9 Fix refunding payment for archived gateway 2016-08-02 13:06:04 +03:00
Hillel Coren
bf5d6ac1ee Set last entered payment method as the default 2016-08-01 15:00:47 +03:00
Hillel Coren
948a3e8911 Archive previous payment methods 2016-08-01 14:53:10 +03:00
Hillel Coren
cb9a67063d Fix for grandfathered check 2016-08-01 11:07:44 +03:00
Hillel Coren
8eda3badb8 Check invoices aren't double billed 2016-08-01 10:50:18 +03:00
Hillel Coren
e4058f9203 Fix for auto-billing delayed invoices 2016-07-31 21:27:11 +03:00
Hillel Coren
af78a3dd2d Test Stripe credentials when adding gateway 2016-07-29 14:58:26 +03:00
Hillel Coren
a26cb74170 Don't require expense date 2016-07-28 22:51:32 +03:00
Hillel Coren
718fd928a4 Updated version 2016-07-28 12:20:36 +03:00
Hillel Coren
52fb4ae7c2 Improvements to analytics 2016-07-28 12:10:57 +03:00
Hillel Coren
6fd4f85b11 Fix for GA ecommerce 2016-07-27 21:52:42 +03:00
Hillel Coren
00bf526636 Fix ecommerce analytics 2016-07-27 16:31:52 +03:00
Hillel Coren
aa53a96b5d Verify that invoice number is unique using JS 2016-07-27 15:46:05 +03:00
Hillel Coren
f9c8b7eb9b Updated version number 2016-07-27 14:46:11 +03:00
Hillel Coren
903036c02c Fix for removing payment method 2016-07-27 14:37:36 +03:00
Hillel Coren
d44213bce9 Fix display of expense exchange rates 2016-07-27 13:54:00 +03:00
Hillel Coren
05a92fea8d Fix for report checkboxes 2016-07-27 13:40:54 +03:00
Hillel Coren
7c314347db Fix for upgrading Stripe accounts 2016-07-27 12:53:11 +03:00
Hillel Coren
d51c437c3c Fix for asdf 2016-07-24 14:40:03 +03:00
Hillel Coren
8c15e2a735 Fix for payment gateway failing validation 2016-07-21 20:09:33 +03:00
Hillel Coren
4795f33067 Adding back fixes 2016-07-21 16:04:23 +03:00
Hillel Coren
498578cefc Rollback to 2.6.5 2016-07-21 15:35:23 +03:00
Hillel Coren
ee937d9994 Fixes from refactor 2016-07-21 14:28:06 +03:00
Hillel Coren
fa18feb8e5 Handle deleted account when charging renewals 2016-07-20 22:53:54 +03:00
Hillel Coren
f4f13d3119 Fix for attaching files 2016-07-20 20:09:03 +03:00
Hillel Coren
61d3adecff Merge pull request #957 from codedge/#949-Improve-activity-stream-invoices 
Show client name next to invoice no. on dashboard
 2016-07-20 11:54:17 +03:00
Hillel Coren
f83736478c Merge pull request #962 from codedge/#585-Reset-invoice-schema-counter-new-year 
Reset the invoice schema counter
 2016-07-20 11:10:19 +03:00
Hillel Coren
7b4b84cedd Merge pull request #979 from codedge/Refactoring-docblocks-dead-code-unused-uses 
Refactor docblocks, unused vars, unused uses
 2016-07-20 11:00:03 +03:00
Hillel Coren
24503ad53b Merge pull request #980 from codedge/Refactor-utils-helper-class 
Refactor Utils class
 2016-07-20 10:58:32 +03:00
Hillel Coren
7bb8f0ca4a Merge https://github.com/codedge/invoiceninja into codedge-#904-Unify-js-no-public-js 
Conflicts:
	app/Http/Controllers/AccountController.php
	resources/lang/en/texts.php
 2016-07-20 10:49:08 +03:00
Hillel Coren
a3271d6688 Merge pull request #994 from codedge/#705-set-app-language-for-templates 
Make app language available in templates
 2016-07-20 10:40:21 +03:00
Hillel Coren
55fb959d45 Update version 2016-07-20 10:23:12 +03:00
Hillel Coren
9bfe233c9f Fix for default payment method check 2016-07-20 10:19:39 +03:00
Hillel Coren
0caa865f7d Fix for approving quotes 2016-07-20 10:03:46 +03:00
Hillel Coren
a0817d8de3 Check for payment driver 2016-07-19 20:15:03 +03:00
Hillel Coren
96b4b19509 Fix for archiving credits 2016-07-19 20:12:45 +03:00
Hillel Coren
9d4c6a12dd Use credits when autobilling invoices 2016-07-19 20:12:28 +03:00
Holger Lösken
68a1a81748 Make app language available in templates 
- Fix #705
- $appLanguage can be fetched inside each template
 2016-07-19 19:04:31 +02:00
Hillel Coren
4348270c96 Bumped version number to 2.6.4 2016-07-19 19:15:30 +03:00
Hillel Coren
bd70b4596c Add batch limits for hosted imports 2016-07-19 18:57:01 +03:00
Hillel Coren
2e0129b279 Fix when adding a new user who is already logged in 2016-07-19 10:59:50 +03:00
Hillel Coren
cb4a2b6a49 Fix for app cipher setting 2016-07-19 10:38:54 +03:00
Hillel Coren
dcfea90781 Merge pull request #989 from codedge/Put-cipher-back-to-env 
Put APP_CIPHER back to .env
 2016-07-19 10:28:05 +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
7249b29bf6 Change settings navigation order 2016-07-18 23:28:30 +03:00
Hillel Coren
6cc84ddfab Add link to WePAY TOS 2016-07-18 22:58:56 +03:00
Hillel Coren
7cb797fcc2 Fix for cancel account 2016-07-18 22:07:23 +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
cef35a98e1 Prevent creating payment for a quote through the API 2016-07-18 21:12:18 +03:00
Hillel Coren
5e5207973f Prevent entering online payment for deleted invoice 2016-07-18 21:05:40 +03:00
Hillel Coren
fb28521160 Increase API page limit 2016-07-18 14:15:52 +03:00
Holger Lösken
3d7e412d24 Put APP_CIPHER back to .env 
- APP_CIPHER included in .env.example
- APP_CIPHER being included into .env when doing a fresh install
 2016-07-18 11:13:35 +02:00
Hillel Coren
59969a4677 Fix for API pagination 2016-07-17 13:31:31 +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
Hillel Coren
f8672e3feb Fix for buy now buttons 2016-07-16 23:51:05 +03:00
Hillel Coren
e41d47eb0d Prevent charging downgraded accounts 2016-07-16 23:19:43 +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
86c08f3af5 Working on new pricing 2016-07-15 11:24:08 +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
Holger Lösken
39d8e3c7b8 Refactor Utils class 2016-07-14 21:57:13 +00:00
Holger Lösken
33badc78b7 Fixed wrong overrides, added some more docblocks 2016-07-14 23:20:16 +02:00
Holger Lösken
71ab4dc3d8 Refactor docblocks, unused vars, unused uses 2016-07-14 22:37:04 +02:00
Hillel Coren
6d7b25bcf5 Merge branch 'develop' of github.com:hillelcoren/invoice-ninja into develop 2016-07-14 22:59:53 +03:00
Hillel Coren
431f596d1d Working on new pricing 2016-07-14 22:58:48 +03:00
Sebastian Klaus
235acb05a4 Fixed Request being statically called 
Signed-off-by: Sebastian Klaus <sebastian@klaus.com.au>
 2016-07-14 23:22:11 +08:00
Hillel Coren
8590f9ad17 Working on new pricing 2016-07-14 12:46:00 +03:00
Hillel Coren
dce90da0c6 Fix for code refactor 2016-07-14 12:01:05 +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
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
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
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