1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-15 07:33:04 +01:00
Commit Graph

86 Commits

Author SHA1 Message Date
Hillel Coren
93ba0cb201 Merge branch 'release-3.1.0' 2017-02-27 21:19:31 +02:00
Hillel Coren
6ae4e63184 Re-enable queue code 2017-02-19 14:05:38 +02:00
Hillel Coren
c0fbaf1e89 php-cs-fixer cleanup 2017-01-30 21:40:43 +02:00
Hillel Coren
4da2a7125f php-cs-fixer cleanup 2017-01-30 21:17:56 +02:00
Hillel Coren
1eb83a2642 php-cs-fixer clean up 2017-01-30 18:05:31 +02:00
Hillel Coren
e624fb8ea8 Disabled support for queues 2017-01-24 16:17:57 +02:00
Hillel Coren
87eb9e1216 Disabled support for queues 2017-01-24 16:16:06 +02:00
Hillel Coren
457dcf67bc Use queues for notifications 2017-01-11 15:40:13 +02:00
Hillel Coren
71694d108d Support queues for payment emails 2017-01-11 14:06:15 +02:00
Hillel Coren
83d2935573 Capture snapshot of invoice when payment is entered 2017-01-08 23:34:44 +02:00
Hillel Coren
84ac76cff1 Clean up invoice activity records 2017-01-06 12:36:46 +02:00
Hillel Coren
6ff1c79db3 Label reminder activity records 2017-01-05 12:46:03 +02:00
Hillel Coren
fbb5a8bbc8 Fix for tests 2017-01-01 20:54:43 +02:00
Hillel Coren
396db1dec4 Changes to product description aren't logged in invoice history #1219 2017-01-01 20:11:38 +02:00
Hillel Coren
e313a32c6a Show app link when logging in on iOS device 2016-12-29 21:49:55 +02:00
Hillel Coren
2f8344df66 Added deletedQuote subscription 2016-12-19 20:06:30 +02:00
Hillel Coren
f8d95e1a31 Merge pull request #1184 from justkidding96/develop
Added new event listeners for Zapier
2016-12-16 15:17:30 +02:00
Hillel Coren
dbdb9a0b4a Don't notify when paid invoices are viewed 2016-12-07 12:10:17 +02:00
Hillel Coren
7c4d0a2af5 Label credits created by deleting payments 2016-12-06 12:04:30 +02:00
Rowdy Klijnsmit
bb2eea035a Added new event listeners for Zapier
* Add updated quote listener
* Add updated invoice listener
* Add deleted invoice listener
2016-12-05 15:39:27 +01:00
Hillel Coren
fc683784fc Remove duplicate activity records for expenses and tasks 2016-10-21 09:54:28 +03:00
Hillel Coren
83b66c880b Track changes to expenses in activities 2016-10-20 23:17:37 +03:00
Hillel Coren
147df1ef91 Standardize archive/deleted behaviors 2016-10-10 11:40:04 +03:00
Hillel Coren
e535750127 Working on history sidebar 2016-09-01 18:52:26 +03:00
Hillel Coren
2a195db798 Fix adjustment when deleting failed payment 2016-08-28 14:55:53 +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
498578cefc Rollback to 2.6.5 2016-07-21 15:35:23 +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
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
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
5ff69c6f29 Payments refactor 2016-06-20 17:14:43 +03:00
Hillel Coren
d9a20ca445 Fix for analytics 2016-06-08 16:07:08 +03:00
Hillel Coren
08c01f59d6 Fix for analytics 2016-06-08 16:06:48 +03:00
Hillel Coren
0acf4ff1fc Support importing JSON file 2016-06-02 22:03:59 +03:00
Hillel Coren
e5e65c0349 Added getCompletedAmount to payments 2016-05-17 14:55:53 +03:00
Joshua Dwire
919aec2192 Better refund handling 2016-05-14 23:03:39 -04:00
Joshua Dwire
41f4c98e08 Merge remote-tracking branch 'upstream/develop' into payments-changes 2016-05-10 10:25:42 -04:00
Hillel Coren
594b0e1bef Implemented server-side analytics tracking for revenue 2016-05-08 16:54:16 +03:00
Joshua Dwire
cf98c37f40 Better Braintree support 2016-05-06 17:05:42 -04:00
Hillel Coren
05bd8d9318 Moving permissions to form requests 2016-05-01 14:31:10 +03:00
Joshua Dwire
ed1f2b6044 Handle failed payments 2016-04-30 17:54:56 -04:00
Joshua Dwire
b8170f0324 Support refunds from the admin UI 2016-04-23 16:40:19 -04:00
Joshua Dwire
22f65e8108 Finalize multi-plan support
* Allow admins to change plan
* Check features instead of plans
* Support linking/unlinking accounts
* Support creating/deleting accounts
2016-04-18 22:35:18 -04:00
Hillel Coren
528ab00901 Fix for Zapier triggers 2016-03-14 17:32:29 +02:00
Hillel Coren
b13e79ad85 Fix for Zapier notifications 2016-03-09 20:42:02 +02:00
Hillel Coren
eb6cd45913 Minor fixes 2016-03-03 21:39:15 +02:00
David Bomba
c1b9d6febc Bug Fix 2016-03-02 12:13:57 +11:00
David Bomba
f6be1041b7 iOS Push Notifications 2016-02-29 22:21:15 +11:00