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

2063 Commits

Author SHA1 Message Date
trigras
ba7cf8b3a9 Merge remote-tracking branch 'remotes/ninja/master' 2016-01-24 22:50:27 +02:00
Hillel Coren
e4a6effc60 Merge pull request #642 from sakalauskas/dev-api
Fixed ping route & added a way to find client by email address or if …
2016-01-24 19:54:01 +02:00
Laurynas Sakalauskas
2478ec59a4 Revert store() method 2016-01-24 17:06:34 +00:00
Laurynas Sakalauskas
68665d2972 Added filtering by email 2016-01-24 16:59:01 +00:00
Hillel Coren
c96c91ec88 Fix for #647 2016-01-24 09:21:20 +02:00
Hillel Coren
fbbc96b1aa Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-23 23:36:38 +02:00
Hillel Coren
74a3dcf9d2 Working on expenses 2016-01-23 23:36:31 +02:00
Hillel Coren
55f457d258 Merge pull request #646 from hannenijhuis/master
Fixed vendors table migration setting unique after filling values
2016-01-23 23:09:57 +02:00
Hanne Nijhuis
ccbdb68bb1 Fixed the vendors migration error dealing with unique values 2016-01-23 22:05:43 +01:00
Hanne Nijhuis
12d8659eef Merge remote-tracking branch 'upstream/master' 2016-01-23 22:01:30 +01:00
Hillel Coren
c55d23a071 Merge pull request #641 from ridgarou/patch-2
Update knockout.blade.php
2016-01-23 21:42:00 +02:00
Hillel Coren
91187eb06d Bug fixes 2016-01-23 20:36:11 +02:00
Hillel Coren
4b2b3617c4 Merge pull request #644 from hannenijhuis/master
Fixed typo in migration vendors table
2016-01-23 18:33:31 +02:00
Hanne Nijhuis
c7b8f39e9f Fixed typo in migration vendors table 2016-01-23 12:20:50 +01:00
Hillel Coren
bb4e6a184b Merge pull request #640 from ridgarou/patch-1
Update texts.php
2016-01-22 13:55:33 +02:00
Laurynas Sakalauskas
0d2025c834 Fixed ping route & added a way to find client by email address or if not exist - create a new 2016-01-22 10:33:38 +00:00
ridgarou
a5e08b3ab4 Update knockout.blade.php
Contabilizar correctamente Impuestos Negativos en el total de la Factura
2016-01-22 01:07:24 +01:00
ridgarou
61188623d4 Update texts.php
Se cambia "'tax' => 'IVA'," por "'tax' => 'Impuesto'," ya que este literal se usa para mas impuestos aparte del IVA
2016-01-22 00:56:48 +01:00
Hillel Coren
360b59baa0 Working on expenses 2016-01-22 00:29:10 +02:00
Hillel Coren
7a26dd610c Working on expenses 2016-01-21 22:36:49 +02:00
Hillel Coren
b24a6109ba Working on expenses 2016-01-21 21:15:30 +02:00
Hillel Coren
3bd636fedc Hiding expense fields for now 2016-01-21 11:04:38 +02:00
Hillel Coren
10aafda4e0 Hiding expense fields for now 2016-01-21 11:04:21 +02:00
Hillel Coren
dff7ad91c8 Merge: Bugfixed version of Vendor / Expense module (#635) 2016-01-21 00:09:10 +02:00
Hillel Coren
9287118cd0 Merging: Bugfixed version of Vendor / Expense module #635 2016-01-20 16:06:17 +02:00
Hillel Coren
19a5e85b8a Updated texts file 2016-01-20 11:49:08 +02:00
Hillel Coren
6166464003 Merge: Make automatic conversion of quote to invoice optional (#636) 2016-01-20 10:41:57 +02:00
Hillel Coren
bf778aa616 Initial work on OFX support 2016-01-20 01:07:31 +02:00
steenrabol
2525f68a39 Expense / Vendor module bug fix 2016-01-19 20:35:15 +01:00
steenrabol
e7a658aaf6 Expenses bug fix 2016-01-19 14:01:19 +01:00
Hillel Coren
3d790d29a1 Update gocardless omnipay version #630 2016-01-18 20:23:26 +02:00
Hillel Coren
332e4984c4 Show currency code after amount 2016-01-18 16:35:05 +02:00
Hillel Coren
96df91076d Hide invitation link for recurring invoices 2016-01-18 16:15:07 +02:00
Hillel Coren
86f1e13c87 Fix for #632 2016-01-18 16:09:06 +02:00
Hillel Coren
e4784035fe Bug fixes 2016-01-18 15:54:15 +02:00
Hillel Coren
b494633873 Bug fixes 2016-01-18 15:53:20 +02:00
Hillel Coren
79ab9f9c48 Working on acceptance test for tax rates 2016-01-18 15:11:37 +02:00
Hillel Coren
4d5aa1a712 Disabled autocomplete on self host system settings form 2016-01-18 12:53:26 +02:00
Hillel Coren
9f85f582e0 Added Aruban Florin currency 2016-01-18 12:41:15 +02:00
Hillel Coren
f1fa973833 Updated text file 2016-01-18 11:41:33 +02:00
Hillel Coren
89ff1be14f Manually merging PR #630 2016-01-18 11:13:39 +02:00
Hillel Coren
cbe2b2905e Added autolink to emails and fixed checkout.com integration 2016-01-18 10:30:42 +02:00
Hillel Coren
6e5237b7dd Updated version 2016-01-17 16:36:22 +02:00
Hillel Coren
e5c455fd5d Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-01-17 15:07:44 +02:00
Hillel Coren
32ff390fea Revert change to hide unsent invoices 2016-01-17 15:07:32 +02:00
David Bomba
78ed0dca97 Merge pull request #633 from turbo124/master
Added delete invoice functionality to API
2016-01-16 17:08:09 +11:00
David Bomba
eeb977bab3 Added delete invoice functionality 2016-01-16 17:07:29 +11:00
David Bomba
05ac060f1c Merge pull request #631 from turbo124/master
Include all invoices (including trashed) in GET invoices API Call
2016-01-16 09:23:54 +11:00
David Bomba
12d3444808 By default include trashed invoices 2016-01-16 09:22:22 +11:00
steenrabol
f550e3734f bug fix to expense module - was not able to add a contact to a new vendor 2016-01-15 11:31:12 +01:00