1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Commit Graph

218 Commits

Author SHA1 Message Date
Hillel Coren
86816cbb66 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2017-02-17 09:48:50 +02:00
Hillel Coren
0d379fc648 Fix deleting logo 2017-02-16 12:13:26 +02:00
Joshua Dwire
770e3090af Fix saving of custom client view CSS
I noticed that I wasn’t able to change the custom CSS for the client
view. This fixes the issue.
2017-02-15 22:27:41 -05:00
Hillel Coren
80ccd4f924 Working on #1234 2017-02-05 14:48:26 +02:00
Hillel Coren
a33b088a93 Support editing reminders when they're not automatically sent 2017-02-02 22:07:17 +02:00
Hillel Coren
30515c69f3 php-cs-fixer 2017-01-30 21:49:42 +02:00
Hillel Coren
c0fbaf1e89 php-cs-fixer cleanup 2017-01-30 21:40:43 +02:00
Hillel Coren
1eb83a2642 php-cs-fixer clean up 2017-01-30 18:05:31 +02:00
Hillel Coren
602c8e81e5 Fix invoice link if user has multiple companies #578 2017-01-29 22:07:44 +02:00
Hillel Coren
0095cdf7dd Add secondary domain choice 2017-01-12 15:12:02 +02:00
Hillel Coren
b6527cddc3 Refactor client portal and email settings requests 2017-01-12 13:52:37 +02:00
Hillel Coren
01439a0f43 Enable non-admins to set notification preferences 2017-01-08 17:43:56 +02:00
Hillel Coren
c8345e8fc1 BCC email 2017-01-06 15:24:53 +02:00
Hillel Coren
9fc53c8b13 Support canceling pro trial 2017-01-04 13:20:56 +02:00
Hillel Coren
69369619af Support automatic client ids 2017-01-03 21:48:40 +02:00
Hillel Coren
076a458567 Remove inclusive from account default list 2017-01-02 13:44:33 +02:00
Hillel Coren
c26bebd063 Add plan deadline logging 2016-12-25 11:49:33 +02:00
Hillel Coren
db26b169cd Clarify sample values in invoice design page 2016-12-19 20:30:27 +02:00
Hillel Coren
cc8959626f Support pro plan discounts 2016-12-14 16:19:16 +02:00
Hillel Coren
25a95e8e25 Don't apply subdomain rules to self host 2016-12-05 21:54:10 +02:00
Hillel Coren
f739976de2 Fix for gateway type in buy now buttons 2016-12-04 11:47:58 +02:00
Hillel Coren
d7f22041ab Added UI setting to enable JS PDF renderer 2016-12-01 21:39:00 +02:00
Hillel Coren
ccecb65f58 Working on status selector 2016-11-20 16:08:36 +02:00
Hillel Coren
23c098014a Improved status selection 2016-11-18 15:31:43 +02:00
Hillel Coren
3ccb33ec21 Support signing for invoice 2016-11-04 15:34:15 +02:00
Hillel Coren
eca4d7ce6a Add financial year start setting for dashboard 2016-10-31 11:11:30 +02:00
Hillel Coren
185958ba2c Fix for logos in production 2016-10-27 12:03:25 +03:00
Hillel Coren
5b80e32fa7 Add ability to enable\disable modules 2016-10-27 11:57:51 +03:00
Hillel Coren
7c0eea08cd Added new upgrade modal 2016-10-16 09:38:04 -04:00
Hillel Coren
249c89dbfd Added products to main navigation 2016-09-23 17:00:47 +03:00
Hillel Coren
e743af4d24 Merged #1062 2016-09-15 13:41:09 +03:00
Hillel Coren
d14cf5f9ed Working on invoice fields 2016-09-05 15:28:59 +03:00
Hillel Coren
08590a4b6f Working on invoice fields 2016-09-05 08:10:39 +03:00
Hillel Coren
188486641a Working on design 2016-09-02 17:53:16 +03:00
Hillel Coren
e535750127 Working on history sidebar 2016-09-01 18:52:26 +03:00
Hillel Coren
d55cdd7619 Working on sidebar 2016-08-23 23:20:03 +03:00
Hillel Coren
de602283c1 Added 'tax' as custom label 2016-08-21 18:39:43 +03:00
Hillel Coren
6675814f8d Added docs to the subdomain exclude list 2016-08-17 13:08:46 +03:00
Hillel Coren
e65fdd54b0 Fix for online payments page 2016-08-08 21:21:43 +03:00
Hillel Coren
498578cefc Rollback to 2.6.5 2016-07-21 15:35:23 +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
7cb797fcc2 Fix for cancel account 2016-07-18 22:07:23 +03:00
Hillel Coren
86c08f3af5 Working on new pricing 2016-07-15 11:24:08 +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
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
e68e213237 Bug fixes 2016-07-11 23:38:06 +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
986487b4c9 Working on new hosted pricing 2016-07-11 20:08:43 +03:00