Hillel Coren
cc46f1fa60
Merge branch 'master' of git://github.com/fabianmarz/invoice-ninja into fabianmarz-master
...
Conflicts:
app/lang/de/texts.php
2015-02-26 15:10:44 +02:00
Hillel Coren
ef49e970a7
Removed deleted and added archived records to the chart builder
2015-02-26 15:06:44 +02:00
Hillel Coren
3c5a3897cc
Fixed incorrect create_at activity timestamps
2015-02-26 15:06:24 +02:00
Hillel Coren
9d240480cc
Bug fixes and check-data script
2015-02-26 00:11:00 +02:00
Hillel Coren
82172751dd
Added years to the expiration select
2015-02-23 21:17:45 +02:00
Hillel Coren
3a06647336
Fixed issue when deleting recurring invoice
2015-02-23 21:17:15 +02:00
Hillel Coren
ca3abb3e56
Changed payment page to charge invoice balance rather than full amount
2015-02-22 23:07:38 +02:00
Hillel Coren
1f47acb8ae
Style fixes
2015-02-19 12:42:13 +02:00
Hillel Coren
4cc885b20f
Style fixes
2015-02-19 12:40:29 +02:00
Hillel Coren
5f6cb53837
Style fixes
2015-02-19 12:35:46 +02:00
Hillel Coren
c94c60c33e
Restyled client pages
2015-02-19 00:42:12 +02:00
Hillel Coren
b55678b0ba
Restyled client pages
2015-02-19 00:34:36 +02:00
Fabian Marz
6e9fe96f8f
Merge branch 'master' of https://github.com/fabianmarz/invoice-ninja
...
Conflicts:
app/views/clients/show.blade.php
2015-02-18 23:00:37 +01:00
Fabian Marz
53111d7584
Merge conflict
2015-02-18 22:59:46 +01:00
Fabian Marz
897277831a
Added translation string and fixed german string
2015-02-18 22:58:17 +01:00
Fabian Marz
073cd4e926
Added translation string and fixed german string
2015-02-18 22:28:37 +01:00
Hillel Coren
3c7fefc5d8
Minor tweaks
2015-02-18 15:46:46 +02:00
Hillel Coren
c1bc3f5a3f
Added Swiss Franc
2015-02-18 14:59:25 +02:00
Hillel Coren
ffebf2eb26
Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
2015-02-18 00:22:18 +02:00
Hillel Coren
7f27abace2
Added support for Stripe token billing
2015-02-18 00:22:12 +02:00
Hillel Coren
f50baf2a6b
Merge pull request #239 from quietkillah/master
...
typo fix in README
2015-02-17 23:01:56 +02:00
Kristof Feys
88eb0cdc3f
typo fix
2015-02-17 16:45:27 +01:00
Hillel Coren
fbf7c235e8
Resolved conflict
2015-02-16 18:15:56 +02:00
Hillel Coren
89269f4bd7
Added ability for clients to approve a quote, converting it to an invoice
2015-02-16 18:15:05 +02:00
Hillel Coren
59e50a1136
Merge pull request #237 from paviro/master
...
Added new German translations
2015-02-13 14:23:25 +02:00
Paul-Vincent Roll
16089f1ab3
Added new German translations
...
Added new German translations
2015-02-13 13:00:21 +01:00
Paul-Vincent Roll
5062f73054
Merge pull request #3 from hillelcoren/master
...
Update from master
2015-02-13 12:50:42 +01:00
Hillel Coren
2a297e3d3f
Added ability to customize emails
2015-02-12 22:50:05 +02:00
Hillel Coren
2c6cce1707
Enable restoring users and re-sending invitations
2015-02-11 14:39:00 +02:00
Hillel Coren
276b23da95
Added 'convert to quote' option to quote list actions
2015-02-10 15:50:38 +02:00
Hillel Coren
24b2e851bb
Fixed CSS styling of checkboxes
2015-02-10 15:29:03 +02:00
Hillel Coren
dc23bad422
Added ability to edit payments
2015-02-10 13:29:13 +02:00
Hillel Coren
d57fe62c49
Removed possible duplicates from the payment list
2015-02-10 12:40:12 +02:00
Hillel Coren
1aea4d83a2
Improved logged JavaScript error message
2015-02-10 12:37:28 +02:00
Hillel Coren
2af014dad2
Prevented issue sending invoice when contact or user is deleted
2015-02-10 12:00:59 +02:00
Hillel Coren
99568e4cee
Fix problem with quote labels on PDF
2015-02-09 15:29:11 +02:00
Hillel Coren
29fc9db9b7
Merge pull request #236 from paviro/master
...
Improved German translation
2015-02-09 12:42:21 +02:00
Hillel Coren
45ed61423c
Setting default environment back to 'production'
2015-02-09 12:41:11 +02:00
Hillel Coren
ea8f875cae
Merge pull request #234 from lbr88/enhancement/negativepayments
...
Negative Payments
2015-02-09 12:30:40 +02:00
Hillel Coren
b43bea4a6e
Merge pull request #233 from lbr88/danishlanguageupdates
...
Danish Language Updates
2015-02-09 12:26:42 +02:00
Paul-Vincent Roll
2cec89e7f5
Merge pull request #2 from hillelcoren/master
...
Update
2015-02-09 10:39:13 +01:00
Paul-Vincent Roll
5d37077c92
Improved German translation
...
Impolite to use "Dein" when talking to a client.
Other small fixes in wording.
2015-02-09 10:36:45 +01:00
Lars Bo Rasmussen
439edffe20
Made it possible to add negative payments.
...
Needed when making an invoice with a negative amount.
The usecase for this is that in denmark you are not allowed to change an invoice once
it has been filed.
So to change an invoice or cancel it, it is required to create a creditnote.
The system allows this but does not let you enter a negative payment for an invoice(creditnote in this case)
which is a mistake.
2015-02-09 03:16:21 +01:00
Lars Bo Rasmussen
07ee613a44
the missing public.php was added partially translated.
2015-02-09 03:00:31 +01:00
root
fb7cdfdc31
updated danish translation
2015-02-09 02:40:42 +01:00
Hillel Coren
2f80865cd4
Fixed issue with production database config not being used
2015-02-08 22:28:51 +02:00
Hillel Coren
dd718387ed
Fixed issue with production database config not being used
2015-02-08 20:04:36 +02:00
Hillel Coren
65eb8c540c
Merge pull request #231 from paviro/master
...
Improved German translation
2015-02-07 21:23:26 +02:00
Paul-Vincent Roll
6ab8997cbf
Improved German translation
...
Added new translations and fixed old ones.
2015-02-07 20:21:00 +01:00
Hillel Coren
d7e93a076b
Merge pull request #227 from fabianmarz/patch-1
...
Fix German translation
2015-02-07 20:37:40 +02:00
