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

377 Commits

Author SHA1 Message Date
blkmutt
ba13c105ed Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
Merged from parent
2014-04-09 22:33:41 -04:00
blkmutt
a952d90c24 Updated Payments and routes to support additional PHP-Payments gateways. Masked account info on payments page. 2014-04-09 22:33:32 -04:00
Joel Limberg
bd0e2ffe55 Fix "DEFAULT_LOCALE" constant spelling
Was “DEFUALT_LOCALE”
2014-04-10 00:53:09 +03:00
Hillel Coren
ecec87668a Working on issues when setting up the site 2014-04-09 19:49:18 +03:00
SergeyDruid
50f4df54b3 Update texts.php 2014-04-09 15:15:43 +02:00
Hillel Coren
c61a572314 Resolving issues settng up the site 2014-04-09 15:23:00 +03:00
Hillel Coren
b6353d30aa Merge pull request #82 from SergeyDruid/master
Update texts.php
2014-04-09 15:12:00 +03:00
Hillel Coren
e609b49b2c Fixing some issues getting the site set up 2014-04-09 14:47:25 +03:00
SergeyDruid
b38face3f3 Update texts.php 2014-04-09 09:52:52 +02:00
blkmutt
57c588c3bc Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
Merged from parent.
2014-04-08 16:32:25 -04:00
seamofreality
e9bee61cb8 Update texts.php 2014-04-08 18:46:30 +02:00
Hillel Coren
29e83ed0be Merge pull request #79 from pierrefaure/patch-2
// navigation -> OK
2014-04-08 09:38:10 +03:00
Thiago Coutinho
16a56c1664 Update texts.php 2014-04-07 22:47:11 -03:00
pierrefaure
c15db27c4c // navigation -> OK 2014-04-08 01:02:23 +02:00
blkmutt
f613caec07 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
Merging files from parent.
2014-04-07 09:53:26 -04:00
Hillel Coren
7a359d6db3 Merge pull request #75 from chrisderouck/master
Updates for dutch text
2014-04-06 21:29:10 +03:00
blkmutt
fabfb14470 Updated Payment Library checks to use global variables. 2014-04-06 14:24:56 -04:00
Razi KAntorp
7a368e9533 New about page 2014-04-06 19:48:34 +02:00
Chris De Rouck
f5a1af9522 Revision of some texts 2014-04-06 19:30:12 +02:00
Chris De Rouck
ba1d05e950 Dutch update for new text 2014-04-06 18:27:04 +02:00
blkmutt
3c99bebae9 merged from parent 2014-04-06 11:47:22 -04:00
Hillel Coren
cb0444f339 Bug fixes 2014-04-06 13:18:34 +03:00
Hillel Coren
c3b7902e6b Bug fixes 2014-04-06 12:45:39 +03:00
Hillel Coren
e36e5b4247 Bug fixes 2014-04-06 12:41:35 +03:00
Hillel Coren
7fd844de31 Bug fixes 2014-04-06 12:21:59 +03:00
Hillel Coren
6710eba329 Bug fixes 2014-04-06 12:02:04 +03:00
Hillel Coren
bd5472994b Bug fixes 2014-04-06 10:49:32 +03:00
blkmutt
638d26adb8 Updated code to fix issues with BeanStream payments. 2014-04-05 21:49:21 -04:00
Chris De Rouck
8886007edb Minor update 2014-04-05 22:56:02 +02:00
Chris De Rouck
b87daa4cb2 Dutch translation added + fix in english translation 2014-04-05 22:31:25 +02:00
Hillel Coren
5b323e04d7 Adding ability to remove ninja logo 2014-04-04 12:24:56 +03:00
Hillel Coren
8fdb122224 Working on pro plan 2014-04-04 00:13:11 +03:00
Hillel Coren
8e3f602e3a Working on pro plan 2014-04-04 00:12:38 +03:00
Hillel Coren
c49da09f8a Adding language file 2014-04-03 23:05:24 +03:00
Hillel Coren
424f292c66 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-03 23:01:34 +03:00
Hillel Coren
7c92ed8530 Bug fixes 2014-04-03 23:01:03 +03:00
seamofreality
d04739c7a4 Update texts.php
Well, I didn't translate everything, but most of it, and I guess a few could be better.

I was wondering what polite form of address invoice ninja is aiming at?
And also if you'd rather like to use "Kredit" than "Gutschrift" for credit.
2014-04-03 21:11:06 +02:00
Hillel Coren
3d6530e83f Bug fixes 2014-04-03 20:54:06 +03:00
Hillel Coren
4c1b33f601 Working on multi-language support 2014-04-02 22:03:01 +03:00
Hillel Coren
1b7c885367 Working on multi-language support 2014-04-02 21:20:01 +03:00
Hillel Coren
06edfdd8e5 Working on multi-language support 2014-04-02 16:10:00 +03:00
Hillel Coren
f1f6d67af1 Working on multi-language support 2014-04-02 15:28:23 +03:00
Razi KAntorp
e88712e42f Removed about link and added features and faq to header and footer. 2014-04-02 11:54:25 +02:00
Razi KAntorp
43198e47f7 Merge remote-tracking branch 'upstream/master' 2014-04-02 11:45:52 +02:00
Hillel Coren
673c30456b Working on multi-language support 2014-04-01 13:30:43 +03:00
Razi KAntorp
7747943136 Updated hero for contact page 2014-03-31 17:54:21 +02:00
Razi KAntorp
80f0a17eea Features page added 2014-03-31 17:43:43 +02:00
Razi KAntorp
008cca025f Faq page added 2014-03-31 17:06:44 +02: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
seamofreality
f0dcd5d17c Update fields.php 2014-03-26 20:07:22 +01: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
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
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
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
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
Hillel Coren
58f6c0ff97 Working on multi-language support 2014-03-23 14:21:40 +02:00
Hillel Coren
6d6084728d Working on multi-language support 2014-03-23 14:19:54 +02:00
Hillel Coren
b7061222e8 Bug fixes 2014-03-23 13:11:04 +02:00
Hillel Coren
308a75099a Bug fixes 2014-03-23 11:30:48 +02:00
blkmutt
11c6cff7ca Merge branch 'master' into Dev_PHP-Payments
Merging master into PHP-Payments branch.
2014-03-21 08:17:51 -04:00
blkmutt
433c51886e Updated migration, seeder, and model files. 2014-03-21 08:16:37 -04:00
blkmutt
c4e629c84f Created database migratioin, updated models, updated .gitignore to ignore a .project file. 2014-03-21 08:15:53 -04:00
Hillel Coren
45a8689bf0 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-03-21 00:12:23 +02:00
Hillel Coren
bb06e31403 Reworking public pages and bug fixes 2014-03-21 00:12:07 +02:00
Thiago Coutinho
33e69f132a Update validation.php 2014-03-20 13:12:53 -03:00
Thiago Coutinho
2ca7259840 Create validation.php 2014-03-20 11:03:06 -03:00
Thiago Coutinho
8bd629e939 Create reminders.php 2014-03-20 10:51:12 -03:00
Thiago Coutinho
3e645b4766 Create pagination.php 2014-03-20 10:46:58 -03:00
Thiago Coutinho
03a0a07347 Update texts.php 2014-03-20 10:45:59 -03:00