1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 07:02:34 +01:00
Commit Graph

4607 Commits

Author SHA1 Message Date
Hillel Coren
fbf618a226 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-11-04 11:48:37 +02:00
Hillel Coren
5c9b435b97 Fix for contact sorting when saving 2016-11-04 11:48:27 +02:00
Joshua Dwire
5713561261 Add UI for BlueVine signup 2016-11-03 16:54:33 -04:00
David Bomba
9d4a121662 Merge pull request #1139 from turbo124/develop
Dashboard bug fix
2016-11-03 22:41:48 +11:00
David Bomba
d466a1bf5a bug fixes 2016-11-03 22:39:29 +11:00
David Bomba
88f9cea3bb Add show() resource route for ClientApiController (#1138)
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories

* Change expense categories into a resource route

* add expenses, contacts, tasks and is_system to activity transformer

* add show() Client
2016-11-03 21:39:33 +11:00
David Bomba
06150ce30a add show() Client 2016-11-03 21:36:05 +11:00
Hillel Coren
50c63329f2 Add additional fields to client CSV export #1136 2016-11-03 10:49:17 +02:00
David Bomba
293811d5ca Merge remote-tracking branch 'upstream/develop' into develop 2016-11-03 19:40:25 +11:00
Hillel Coren
89390e27ee Disable save button on new payment page once clicked 2016-11-02 13:15:02 +02:00
Hillel Coren
9769f206f2 Fix for outstanding amount on dashboard 2016-11-02 09:43:57 +02:00
Hillel Coren
c1197bb245 Require confirming account before upgrading 2016-11-02 08:49:02 +02:00
Hillel Coren
75cdaba2d5 Disable Excel autosize columns feature 2016-11-02 08:41:12 +02:00
Hillel Coren
e677569351 Support importing VAT number with client CSV 2016-11-01 13:19:35 +02:00
Hillel Coren
5d2e9568d7 Fix for WePay prefill adress 2016-11-01 13:14:01 +02:00
Hillel Coren
6353ad05ff Remove 'unamed client' label 2016-10-31 16:08:00 +02:00
Hillel Coren
bf6fd23aea Show 'Pro' label when on trial 2016-10-31 12:59:48 +02:00
Hillel Coren
eca4d7ce6a Add financial year start setting for dashboard 2016-10-31 11:11:30 +02:00
Hillel Coren
b39f2f4ba5 Ensure invoice always has an invitation 2016-10-31 09:06:55 +02:00
Hillel Coren
e6266b3b10 Change ‘Balance Due’ to ‘Total’ on quotes 2016-10-30 20:24:47 +02:00
Hillel Coren
16940fd690 Fix translations in client portal 2016-10-30 20:12:02 +02:00
Hillel Coren
85786afce8 Hide PDF is live preview is disabled 2016-10-30 19:46:52 +02:00
Hillel Coren
752e674a34 Remove branding if white labeled 2016-10-30 18:09:22 +02:00
Hillel Coren
ad6e5cc29d Prevent textarea height from shrinking 2016-10-30 13:28:01 +02:00
Hillel Coren
7e7b727422 Updated readme 2016-10-30 13:07:14 +02:00
Hillel Coren
5e4c66d117 Updated readme 2016-10-30 13:04:56 +02:00
Hillel Coren
02c300e9f9 Prevent session history from showing as blank 2016-10-30 11:23:36 +02:00
Hillel Coren
2a97fc5456 Prevent deleted invoice from being paid 2016-10-30 11:04:08 +02:00
Hillel Coren
7b5cd9e4c1 Eager load contact with activities 2016-10-30 08:50:58 +02:00
David Bomba
147a1b1a94 Add in additional fields for activities transformer (#1129)
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories

* Change expense categories into a resource route

* add expenses, contacts, tasks and is_system to activity transformer
2016-10-29 18:48:58 +11:00
Dustin Dauncey
f723621df8 Updated modern.js invoice template to fix width issues (#1128)
Updated modern.js invoice template to fix width issues. This is related to PR #1104. This time it should be put against the correct branch.
2016-10-29 18:27:30 +11:00
David Bomba
7a1072f8f2 add expenses, contacts, tasks and is_system to activity transformer 2016-10-29 16:01:25 +11:00
Hillel Coren
346dde8e97 Fix for parseCSV constructor error 2016-10-28 14:35:32 +03:00
David Bomba
0dc1a5f73f Merge remote-tracking branch 'upstream/develop' into develop 2016-10-28 20:07:46 +11:00
Hillel Coren
bd624710a8 Minor fixes 2016-10-28 12:01:35 +03:00
David Bomba
8f1a9a2e5d Expense Categories route (#1125)
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories

* Change expense categories into a resource route
2016-10-28 19:37:28 +11:00
David Bomba
b507254087 Change expense categories into a resource route 2016-10-28 19:36:26 +11:00
David Bomba
5cbfbda947 Merge remote-tracking branch 'upstream/develop' into develop 2016-10-28 19:34:03 +11:00
Hillel Coren
bb0ce2da38 Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop 2016-10-28 09:43:07 +03:00
Hillel Coren
522cabe0a1 Fix for permissions change 2016-10-28 09:42:49 +03:00
David Bomba
dedb85c8d6 Add / Update expense categories from API (#1124)
* Expense categories

* add dependencies

* expense categories

* expense categories

* expense categories
2016-10-28 12:59:57 +11:00
David Bomba
f647c6c48c expense categories 2016-10-28 08:49:40 +11:00
David Bomba
cd98ad43e0 expense categories 2016-10-28 08:48:57 +11:00
David Bomba
9cf55301e8 expense categories 2016-10-28 08:47:20 +11:00
David Bomba
06533b2430 add dependencies 2016-10-28 07:50:16 +11:00
David Bomba
301032c905 Expense categories 2016-10-28 07:48:34 +11:00
Hillel Coren
7465eb1631 Include taxes in expense amount 2016-10-27 17:26:42 +03:00
Hillel Coren
c3c0ece14a Round qty in product report 2016-10-27 16:45:06 +03:00
Hillel Coren
a4b919f188 Fix for tests 2016-10-27 12:56:21 +03:00
Hillel Coren
185958ba2c Fix for logos in production 2016-10-27 12:03:25 +03:00