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

1640 Commits

Author SHA1 Message Date
Hillel Coren
436b8be8d9 Refactoring datatable code 2015-11-06 00:37:04 +02: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
Hillel Coren
5555000f83 Added additional OmniPay drivers 2015-11-04 20:13:15 +02:00
Hillel Coren
ffab252436 Working on the API 2015-11-04 17:23:22 +02:00
Hillel Coren
8abdc4a43f Merge pull request #505 from eduardocruz/patch-1
Update on AccountController.php - fix CSV Client import
2015-11-04 17:11:53 +02:00
Eduardo Cruz
1042c54077 Update on AccountController.php - fix CSV Client import
Fix CSV Client import
2015-11-04 11:35:42 -03:00
Hillel Coren
65e959e84d Added system settings page 2015-11-04 15:57:59 +02:00
Hillel Coren
4b935f5844 Fixed issue when user has single company 2015-11-04 15:10:41 +02:00
Hillel Coren
72c7cbb237 Added 'apply credit' action 2015-11-04 09:48:47 +02:00
Hillel Coren
029e740a6c Working on the API 2015-11-03 21:03:24 +02:00
Hillel Coren
ebd63f1805 Working on the API 2015-11-03 16:21:17 +02:00
Hillel Coren
26ec972819 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-11-03 13:20:55 +02:00
Hillel Coren
521fc107f1 Bug fixes 2015-11-03 13:20:49 +02:00
Hillel Coren
fd59d37285 Merge pull request #502 from turbo124/master
Api Changes
2015-11-03 10:33:56 +02:00
David Bomba
d0f8fca420 api 2015-11-03 19:13:15 +11:00
David Bomba
6f320aa624 merge 2015-11-03 19:09:52 +11:00
David Bomba
9b54113b9b Merge remote-tracking branch 'upstream/master' 2015-11-03 19:09:40 +11:00
David Bomba
ab930a2dbe fixed pr issues 2015-11-03 18:54:57 +11:00
David Bomba
38c3f14081 working on api 2015-11-03 13:02:15 +11:00
David Bomba
c3066c824f working on api 2015-11-03 10:55:31 +11:00
Hillel Coren
c3d43ab480 Bug fixes 2015-11-03 00:05:28 +02:00
David Bomba
d577a34675 fix conflicts 2015-11-03 08:47:32 +11:00
Hillel Coren
1ae35b853a Merge pull request #500 from rafaelsisweb/master
New texts on pt_br.
2015-11-02 23:06:08 +02:00
Rafael Almeida
71b66338e0 revert composer.lock to original of hillelcoren repo. 2015-11-02 15:52:53 -05:00
Rafael Almeida
2a61015e36 restore composer.lock file 2015-11-02 15:36:23 -05:00
Rafael Almeida
c8375ad983 Distinct text message when quote is converted or approved 2015-11-02 15:14:00 -05:00
Rafael Almeida
67a5d5d9cc Merge remote-tracking branch 'upstream/master' 2015-11-02 14:35:59 -05:00
Rafael Almeida
d35e57a3a1 Adjust some terms on pt_br texts 2015-11-02 14:30:53 -05:00
Rafael Almeida
191d002597 PT_br new text strings 2015-11-02 14:07:55 -05:00
Hillel Coren
6130626422 Working on the API 2015-11-02 20:43:22 +02:00
Rafael Almeida
db97fa9c95 solve merge conflits 2015-11-02 11:28:01 -05:00
Rafael Almeida
f3b40484db pt_br fixes 2015-11-02 10:53:12 -05:00
Hillel Coren
c130e67e54 Fixed problem with PayFast integration 2015-11-02 11:47:47 +02:00
Hillel Coren
bbc6d015e8 Fixed issue with recurring invoices 2015-11-02 08:53:01 +02:00
Hillel Coren
e08c80f23c Fixed issue with recurring invoices 2015-11-02 08:51:57 +02:00
David Bomba
09ccb88784 separate API logic 2015-11-02 15:29:38 +11:00
David Bomba
45eed7479c composer 2015-11-02 10:16:39 +11:00
Hillel Coren
3b6a4a6100 Added Fractal 2015-11-02 00:10:20 +02:00
Hillel Coren
9b840a24dd Enabled social login 2015-11-01 20:21:11 +02:00
Hillel Coren
d95ca5da2b Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2015-10-31 23:57:01 +02:00
Hillel Coren
11d9192a0f Fixes #492 2015-10-31 23:56:49 +02:00
Hillel Coren
abbc9b98e8 Merge pull request #495 from nerdoc/master
German language updates (activities, default_quote* etc.)
2015-10-30 16:29:49 +02:00
Hillel Coren
0e1f892f38 Merge pull request #494 from nerdoc/patch-10
German: versandt->versendet to be consistent
2015-10-30 16:29:35 +02:00
Hillel Coren
9c99d11966 Merge pull request #493 from nerdoc/patch-4
fixed German "Deppenleerzeichen"
2015-10-30 16:29:30 +02:00
Christian González
1203a78b75 German language update 2015-10-30 15:29:16 +01:00
Christian González
17eb28c43c German language updates (activities, default_quote* etc.) 2015-10-30 15:13:04 +01:00
Christian González
5a54ccf9b0 German: versandt->versendet to be consistent 2015-10-30 15:02:37 +01:00