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

2210 Commits

Author SHA1 Message Date
Hillel Coren
d1dd02644b Added 'overdue' status to invoice list 2016-02-11 21:12:50 +02:00
Hillel Coren
0a2a97d89a Fixed an API issue when only setting product_key in an invoice 2016-02-11 19:24:41 +02:00
Hillel Coren
a30153cabe Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-11 17:12:34 +02:00
Hillel Coren
1794811f9b Added two week trial for hosted pro plan 2016-02-11 17:12:27 +02:00
David Bomba
0e5ca1fd28 Merge pull request #711 from turbo124/master
Jump over duplicate checks if request comes from API
2016-02-10 13:49:29 +11:00
David Bomba
a8cff1db95 Jump over duplicate checks if request comes from API 2016-02-10 13:05:32 +11:00
David Bomba
f428e2e213 Merge pull request #710 from invoiceninja/revert-709-master
Revert "Table locking for public_id integrity"
2016-02-10 12:33:46 +11:00
David Bomba
498d7cbca9 Revert "Table locking for public_id integrity" 2016-02-10 12:32:12 +11:00
David Bomba
3b1bfe1013 Merge pull request #709 from turbo124/master
Table locking for public_id integrity
2016-02-10 11:32:30 +11:00
David Bomba
67b74b2a34 Table locking for public_id integrity 2016-02-10 11:26:21 +11:00
David Bomba
04807bccc6 Merge pull request #708 from turbo124/master
Validation rule realignment
2016-02-10 08:51:43 +11:00
David Bomba
3878fe9324 Validation rule realignment 2016-02-10 08:51:08 +11:00
Hillel Coren
f8d605df31 Merge pull request #706 from ridgarou/master
Fix datetomepicker and search box traslations (issue #705)
2016-02-09 13:48:18 +02:00
ridgarou
60530d3cbc Update AccountRepository.php 2016-02-09 12:37:23 +01:00
ridgarou
55f26c9ea5 Update jquery.datetimepicker.js 2016-02-09 11:12:23 +01:00
ridgarou
9ab8069de1 Update master.blade.php 2016-02-09 10:57:25 +01:00
ridgarou
0766f77713 Merge pull request #1 from invoiceninja/master
Actualizacion desde proyecto original
2016-02-09 10:56:16 +01:00
David Bomba
01dcc14740 Merge pull request #700 from turbo124/master
Delete Client from API
2016-02-08 15:28:20 +11:00
David Bomba
ce58c581ef Delete Client from API 2016-02-08 15:27:42 +11:00
David Bomba
dbf1877421 Merge pull request #699 from turbo124/master
Bug in Client API not paginating all results
2016-02-08 10:38:30 +11:00
David Bomba
d401a6fb93 Bug in Client API not paginating all results 2016-02-08 10:37:38 +11:00
Hillel Coren
1b740d77fc Made word shorter 2016-02-07 21:16:47 +02:00
David Bomba
e2fd1180ad Merge pull request #698 from turbo124/master
Bug fixes
2016-02-07 22:30:53 +11:00
David Bomba
391d721180 Bug fixes 2016-02-07 22:30:36 +11:00
David Bomba
cb3ff4d083 Merge pull request #697 from turbo124/master
Working on payments API
2016-02-07 22:02:32 +11:00
David Bomba
ccaabe2926 working on payments API 2016-02-07 22:01:39 +11:00
David Bomba
a745f1d507 Merge pull request #696 from turbo124/master
Delete a payment from the API
2016-02-07 21:25:10 +11:00
David Bomba
42f3cffca8 Delete a payment from the API 2016-02-07 21:24:21 +11:00
David Bomba
765a1484f0 Merge pull request #695 from turbo124/master
Payment API Bug Fixes
2016-02-07 20:22:14 +11:00
David Bomba
b3346011bc api bug fixes 2016-02-07 20:20:38 +11:00
David Bomba
7d2f635272 testing payment api 2016-02-07 19:39:51 +11:00
David Bomba
0c251392eb testing payment api 2016-02-07 19:32:43 +11:00
David Bomba
95e1baed29 testing payment api 2016-02-07 19:30:47 +11:00
Hillel Coren
9c9527b611 Merge pull request #694 from ridgarou/patch-6
Fix es_ES traslations
2016-02-07 09:31:11 +02:00
ridgarou
502135a977 Fix es_ES traslations 2016-02-07 03:51:40 +01:00
David Bomba
d9095ff840 Merge pull request #692 from turbo124/master
Update payment from API
2016-02-06 14:43:23 +11:00
David Bomba
138749ce6f update payment from API 2016-02-06 14:42:21 +11:00
Hillel Coren
ce1717cf53 Fix for issue updating 2016-02-05 10:48:10 +02:00
Hillel Coren
7b5cd4f31c Fix for fonts seeder 2016-02-04 23:09:03 +02:00
Hillel Coren
024e1eb046 Fix for issues when updating 2016-02-04 22:58:34 +02:00
Hillel Coren
e619bacf66 Fix for renewel logic 2016-02-04 22:50:30 +02:00
Hillel Coren
88b9046ac7 Added users to the API 2016-02-04 22:35:28 +02:00
Hillel Coren
60a3f3ca28 Removed duplicate recurring invoice status 2016-02-04 21:01:17 +02:00
Hillel Coren
db4ec4fb62 Added statust to client view page 2016-02-04 20:36:39 +02:00
Hillel Coren
8a9eb97134 Working on enabling showing currency code 2016-02-04 16:19:49 +02:00
Hillel Coren
8d69d4334b Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2016-02-04 16:12:29 +02:00
Hillel Coren
2b3e35687a Bug fixes 2016-02-04 16:12:22 +02:00
Hillel Coren
69026ca395 Merge pull request #688 from ridgarou/patch-5
Update new es_ES texts translations
2016-02-04 11:42:13 +02:00
ridgarou
e5138120d9 Update new texts translations 2016-02-04 10:39:00 +01:00
Hillel Coren
5f709f76a8 Bug fix: notification emails have the wrong entity type 2016-02-03 22:53:18 +02:00