1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 15:13:29 +01:00
Commit Graph

2138 Commits

Author SHA1 Message Date
Hillel Coren
7b6699c2bc Enabled grouping report by payments 2015-11-11 00:07:05 +02:00
Hillel Coren
5778f837b3 Merge pull request #517 from rafaelsisweb/master
PT_br to new strings text.
2015-11-10 15:15:55 +02:00
rafael.sisweb
1cfd782caa Fix 'Disabled' translate. 2015-11-10 08:01:27 -05:00
rafael.sisweb
00bd5925e3 PT_br to new strings. Adjust on System Settings view. 2015-11-10 07:59:02 -05:00
David Bomba
ec8389f320 Merge pull request #516 from turbo124/master
shift SITE_URL into user_accounts key path
2015-11-10 20:34:56 +11:00
David Bomba
36ccb4e331 shift SITE_URL into user_accounts key path 2015-11-10 20:32:45 +11:00
Hillel Coren
b47b383e19 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-10 09:13:50 +02:00
Hillel Coren
e26bf521e4 Working on the API 2015-11-10 09:13:40 +02:00
Hillel Coren
b1e553224d Merge pull request #514 from juanluisbaptiste/master
Add colombian currency
2015-11-10 09:09:49 +02:00
Juan Luis Baptiste
657e729ab7 Merge remote-tracking branch 'upstream/master' 2015-11-09 17:36:51 -05:00
Juan Luis Baptiste
60ee2d131d Added Colombian currency. 2015-11-09 17:30:57 -05:00
Hillel Coren
343d76744f Improved white label modal 2015-11-09 21:59:31 +02:00
Hillel Coren
b55a3226b7 Starting on stripejs 2015-11-09 21:24:22 +02:00
Hillel Coren
02aa10e41d Corrected form autocomplete behavior 2015-11-09 16:53:18 +02:00
Hillel Coren
7542cb479f Updated version 2015-11-09 14:13:17 +02:00
Hillel Coren
eed345cff6 Bug fixes 2015-11-09 13:46:53 +02:00
Hillel Coren
44f0e3f778 Moved Swagger to require. Fixes #512 2015-11-09 11:56:36 +02:00
Hillel Coren
efb3120e04 Merge pull request #513 from limenet/patch-2
The "Client" string isn't passed to the translation engine
2015-11-09 11:54:45 +02:00
Linus Metzler
6d83c57ea1 "Client" wasn't translated 2015-11-09 10:50:47 +01:00
Hillel Coren
be6b7fed7a Working on the API 2015-11-09 04:10:01 +02:00
Hillel Coren
0524f53850 Working on Swagger 2015-11-08 23:57:28 +02:00
Hillel Coren
5d3a24800e Working on Swagger 2015-11-08 23:53:13 +02:00
Hillel Coren
2f9dd707f7 Working on the API 2015-11-08 23:12:50 +02:00
Hillel Coren
57245211d8 Added Swagger 2015-11-08 22:34:26 +02:00
Hillel Coren
ed021347cf Working on Gmail actions 2015-11-08 17:01:41 +02:00
Hillel Coren
2f4ed99580 Fixed problem with PDF in Microsoft Edge 2015-11-08 17:01:29 +02:00
Hillel Coren
0a5e7c904f Removed Gitter chat 2015-11-08 11:50:18 +02:00
Hillel Coren
ba90eb45ad Working on the API 2015-11-08 11:43:32 +02:00
Hillel Coren
bef7454b73 Working on gmail actions 2015-11-08 10:43:49 +02:00
Hillel Coren
df8fb6f459 Merge pull request #510 from turbo124/api-mapping
Api mapping
2015-11-07 20:18:09 +02:00
Hillel Coren
156ca3cb86 Commenting out API command 2015-11-07 19:59:14 +02:00
Hillel Coren
1a527a610a Merge pull request #509 from juanluisbaptiste/master
Updated spanish translation for version 2.4.5.
2015-11-07 19:35:18 +02:00
David Bomba
81fc77d142 Mapped transformers 2015-11-07 23:15:37 +11:00
Juan Luis Baptiste
b5b3ce404c Updated spanish translation for version 2.4.5. 2015-11-06 22:20:35 -05:00
David Bomba
d49f2fe9c9 automerge 2015-11-07 08:49:14 +11:00
Hillel Coren
15b17dfeed Added view presenters 2015-11-06 12:59:53 +02:00
Hillel Coren
aa69a17232 Check for duplicate invoice number when approving a quote 2015-11-06 10:21:45 +02:00
Hillel Coren
a30b9039de Bug fixes 2015-11-06 09:54:29 +02:00
Hillel Coren
c79ee49c1d Merge pull request #507 from adamgoose/patch-1
Allow zero-costs
2015-11-06 08:52:07 +02:00
David Bomba
76f90b7ff3 Merge remote-tracking branch 'upstream/master' 2015-11-06 17:16:38 +11:00
Hillel Coren
002c994c0b Refactoring datatable code 2015-11-06 01:14:00 +02:00
Hillel Coren
d147dba542 Refactoring datatable code 2015-11-06 00:46:02 +02:00
Hillel Coren
436b8be8d9 Refactoring datatable code 2015-11-06 00:37:04 +02:00
Adam Engebretson
303de7a0b6 Allow zero-costs
Currently, the `parepareItem` method checks to see if the cost and notes evaluate to false. If so, it checks from the product list.

However, we need the ability to set cost to zero explicitly through the API. This allows a user to pass null, which will use the default. Otherwise, passing 0 will persist.
2015-11-05 12:39:33 -06:00
David Bomba
a6201bb503 Merge branch 'master' of github.com:turbo124/invoice-ninja 2015-11-05 21:36:38 +11:00
Hillel Coren
0953fbe7cd Added Quill to email signature 2015-11-05 12:02:14 +02:00
Hillel Coren
e18ae1aac0 Working on the API 2015-11-05 10:50:35 +02:00
Hillel Coren
cb243fec0a Working on the API 2015-11-05 10:44:48 +02:00
Hillel Coren
d0f8ee7797 Added HTML editor for client emails 2015-11-04 23:52:12 +02:00
David Bomba
a7f2103a88 merge 2015-11-05 07:18:03 +11:00