Commit Graph

531 Commits

Author SHA1 Message Date
Hillel Coren b8f442a1e6 Merge pull request #91 from pierrefaure/patch-4
Update texts.php
2014-04-15 20:41:52 +03:00
pierrefaure 7a09d07ddd Update texts.php
// list pages => OK
2014-04-15 00:50:58 +02:00
Hillel Coren 4d1df9bdc3 Removing debug messages 2014-04-14 15:16:32 +03:00
Hillel Coren 45ed680c77 Bug fixes 2014-04-14 14:33:43 +03:00
blkmutt 55d1ec415c Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
Merged from parent.
2014-04-13 21:55:40 -04:00
blkmutt 33b90241a2 Updated validation to avoid saving masked fields. 2014-04-13 21:54:01 -04:00
Hillel Coren 8bbe164505 Merge pull request #89 from pierrefaure/patch-3
Update texts.php
2014-04-13 18:52:25 +03:00
pierrefaure 43a7e236f3 Update texts.php
// recurring invoices && // dashboard => OK
2014-04-13 17:48:56 +02:00
Hillel Coren 777c4a6240 Working on pro plan 2014-04-13 16:38:07 +03:00
Hillel Coren 3a50fd6aa2 Working on pro plan 2014-04-13 16:34:58 +03:00
blkmutt a7e0ca0d60 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
Received PHP-Payments directory from parent.
2014-04-13 07:06:24 -04:00
blkmutt bd73fa5b54 Updated validation to fail if values are all asterisks. 2014-04-13 07:05:29 -04:00
Hillel Coren c557276a6e Working on pro plan 2014-04-13 11:19:10 +03:00
Hillel Coren 1f64a81300 Adding php-payments library code 2014-04-13 09:39:55 +03:00
Hillel Coren 777c6621f0 Adding php-payments library code 2014-04-13 09:38:15 +03:00
Hillel Coren 75a1fd3240 Working on pro plan 2014-04-13 08:29:29 +03:00
Hillel Coren dfd4de33bd Working on pro plan 2014-04-13 08:28:16 +03:00
Hillel Coren 65c728b41c Merge pull request #87 from blkmutt/master
Fixed UI on Payments Page
2014-04-13 08:27:37 +03:00
blkmutt ebcbbf65ff Updated copy in 'other'option on payments page. 2014-04-12 19:01:38 -04:00
blkmutt 0143881732 Created 'other' option on payments page, showed and hid dropdown, accordingly. 2014-04-12 18:49:18 -04:00
Hillel Coren 40ee3c8b40 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-12 21:55:56 +03:00
Hillel Coren 944ef2ccd3 Working on pro plan 2014-04-12 21:55:40 +03:00
Hillel Coren df9e53c0f9 Merge pull request #86 from blkmutt/master
Made PHP-Payments Updates
2014-04-12 21:54:39 +03:00
blkmutt 381d2604b0 Updated Account Controller to work when no present payment libraries are in use. 2014-04-10 20:09:57 -04:00
blkmutt 7c39574720 Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja
Merged from parent.
2014-04-10 19:34:27 -04:00
Hillel Coren 3cfa9a5ce5 Merge branch 'master' of github.com:hillelcoren/invoice-ninja 2014-04-10 22:29:13 +03:00
Hillel Coren 7bf470b9b1 Bug fixes 2014-04-10 22:29:01 +03:00
blkmutt 008eb31643 Removed extra payment libraries 2014-04-10 13:39:23 -04:00
Hillel Coren b59b730c67 Merge pull request #83 from SergeyDruid/master
Update texts.php
2014-04-10 15:32:05 +03:00
Hillel Coren e7d626cf7d Merge pull request #85 from joellimberg/master
Fix "DEFAULT_LOCALE" constant spelling
2014-04-10 15:31:29 +03:00
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 fc65576fd5 Resolving issues settng up the site 2014-04-09 15:07:50 +03:00
Hillel Coren bd2ef0b7b6 Fixing some issues getting the site set up 2014-04-09 14:49:18 +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
Hillel Coren fc8550e39f Merge pull request #81 from seamofreality/patch-1
Update texts.php
2014-04-08 22:23:41 +03: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
Hillel Coren 676f2dc951 Merge pull request #80 from thiagoc/patch-1
Update texts.php
2014-04-08 09:36:57 +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