1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 05:02:36 +01:00
Commit Graph

494 Commits

Author SHA1 Message Date
Razi KAntorp
80f0a17eea Features page added 2014-03-31 17:43:43 +02:00
Hillel Coren
62eccc338c Merge pull request #65 from raziraz/master
Faq page added
2014-03-31 18:09:17 +03:00
Razi KAntorp
008cca025f Faq page added 2014-03-31 17:06:44 +02:00
Hillel Coren
64f7a7678b Merge pull request #64 from raziraz/master
Updated login page
2014-03-31 16:43:26 +03:00
Razi KAntorp
bdd4fa18b4 Updated login page. 2014-03-31 15:40:19 +02:00
Razi KAntorp
7a2c17fe50 Merge remote-tracking branch 'upstream/master' 2014-03-31 13:52:58 +02:00
Hillel Coren
6377d2a91b Bug fixes 2014-03-31 13:52:03 +03:00
blkmutt
227282a8cf Made changes to include PHP-Payments. Added Recommended Gateways to the Company/Payments UI. 2014-03-29 20:21:57 -04:00
blkmutt
33d54abb1e Made some styling updates. 2014-03-29 20:21:37 -04:00
blkmutt
5bd1aff573 Updated payment logic with config settings. 2014-03-29 19:42:37 -04:00
Razi KAntorp
7acb1a92c1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	app/views/clients/edit.blade.php
2014-03-28 13:53:19 +01:00
Razi KAntorp
6f58d1c63f test 2014-03-28 13:46:19 +01:00
Hillel Coren
2e299aa83f Working on multi-language support 2014-03-27 14:25:31 +02:00
Hillel Coren
e1cb685456 Merge pull request #58 from seamofreality/patch-1
Update fields.php
2014-03-26 21:22:47 +02:00
seamofreality
f0dcd5d17c Update fields.php 2014-03-26 20:07:22 +01:00
Hillel Coren
3d65b25a61 Merge pull request #56 from oinak/spanish
using https://github.com/caouecs/Laravel4-lang/tree/master/es
2014-03-26 18:09:32 +02:00
Fernando Martínez
0e39488fd4 using https://github.com/caouecs/Laravel4-lang/tree/master/es 'official' translations 2014-03-26 09:33:29 -03:00
Hillel Coren
abd7d6b3d8 Merge pull request #55 from oinak/spanish
Amazing, thank you!

I'm working now on refactoring the rest of the site texts.
2014-03-26 11:02:08 +02:00
blkmutt
d20f6d3055 Added extra payment gateways that had not been previously considered. 2014-03-25 21:58:42 -04:00
blkmutt
3ca03eb2b4 Merge branch 'master' into Dev_PHP-Payments
Merged changes from master.
2014-03-25 21:21:23 -04:00
blkmutt
7485c01de6 Removed some of the data attributes that I was not using. 2014-03-25 21:07:43 -04:00
blkmutt
33ff8e1d60 Updated account controller, data objects, and logos for recommended gateways. 2014-03-25 20:59:33 -04:00
Fernando Martínez
938dc5d4c0 first draft of spanish translations 2014-03-26 00:16:16 +01:00
Hillel Coren
53f9eef3ca Bug fixes 2014-03-23 22:56:19 +02:00
Hillel Coren
499b92ac87 Updating readme 2014-03-23 22:18:13 +02:00
Hillel Coren
56e3e7dbd0 Updating readme 2014-03-23 22:17:53 +02:00
Hillel Coren
e77db4137e Updating readme 2014-03-23 22:16:46 +02:00
Hillel Coren
684d856278 Bug fixes 2014-03-23 21:39:18 +02:00
Hillel Coren
b99427b05c Bug fixes 2014-03-23 21:38:03 +02:00
Hillel Coren
db3a6abad3 Bug fixes 2014-03-23 21:17:45 +02:00
Hillel Coren
a09b898cb1 Bug fixes 2014-03-23 20:19:03 +02:00
Hillel Coren
bb6815ba13 Bug fixes 2014-03-23 20:01:00 +02:00
Hillel Coren
2efde97a4e Bug fixes 2014-03-23 19:59:15 +02:00
Hillel Coren
94f5047d46 Bug fixes 2014-03-23 19:55:29 +02:00
Hillel Coren
271f6262fb Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-03-23 19:54:34 +02:00
Hillel Coren
9a592753b2 Bug fixes 2014-03-23 19:54:02 +02:00
Hillel Coren
18cd5e5431 Merge pull request #54 from pierrefaure/patch-1
Update fields.php
2014-03-23 19:50:03 +02:00
pierrefaure
e748ea7cc2 Update fields.php
Hi,

I'm not sure for line 42 :)
2014-03-23 18:48:00 +01:00
Hillel Coren
f9bec51b30 Bug fixes 2014-03-23 18:02:33 +02:00
Hillel Coren
c08a46a7da Bug fixes 2014-03-23 17:59:30 +02:00
Hillel Coren
cae88df6d4 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-03-23 17:49:29 +02:00
Hillel Coren
3bbb156124 Bug fixes 2014-03-23 17:49:14 +02:00
blkmutt
af7ba0b7b1 Merge branch 'master' into Dev_PHP-Payments
Merged changes from master.
2014-03-23 11:41:21 -04:00
Hillel Coren
a053d7cc07 Merge pull request #53 from S3NS4Ti0N/patch-1
Update fields.php
2014-03-23 16:31:32 +02:00
S3NS4Ti0N
951cc78c76 Update fields.php
added german translation
2014-03-23 15:28:14 +01:00
blkmutt
6c286b9648 Merge branch 'master' into Dev_PHP-Payments
Merged changes from master.
2014-03-23 10:23:55 -04:00
Hillel Coren
c4665f84f0 Bug fixes 2014-03-23 16:23:53 +02:00
blkmutt
b1a525a7f4 Added code for PHP-Payments to payment controller and to JSON for Composer. 2014-03-23 10:22:56 -04:00
Hillel Coren
631cdef345 Bug fixes 2014-03-23 15:36:18 +02:00
Hillel Coren
6e532063fd Working on multi-language support 2014-03-23 14:53:16 +02:00