151 Commits

Author	SHA1	Message	Date
Hillel Coren	2a8b25b208	Merge pull request #90 from blkmutt/master ... Added validation to prevent saving of masked fields.	2014-04-22 18:09:37 +03:00
Hillel Coren	9683f1d1b5	Custom fields	2014-04-22 00:39:42 +03:00
Hillel Coren	01ec2cb838	Working on custom fields for pro plan	2014-04-18 11:57:31 +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	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	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
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
blkmutt	381d2604b0	Updated Account Controller to work when no present payment libraries are in use.	2014-04-10 20:09:57 -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
blkmutt	f613caec07	Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja ... Merging files from parent.	2014-04-07 09:53:26 -04:00
blkmutt	fabfb14470	Updated Payment Library checks to use global variables.	2014-04-06 14:24:56 -04: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	e36e5b4247	Bug fixes	2014-04-06 12:41:35 +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
Hillel Coren	5b323e04d7	Adding ability to remove ninja logo	2014-04-04 12:24:56 +03:00
Hillel Coren	8e3f602e3a	Working on pro plan	2014-04-04 00:12:38 +03:00
Hillel Coren	7c92ed8530	Bug fixes	2014-04-03 23:01:03 +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	f1f6d67af1	Working on multi-language support	2014-04-02 15:28:23 +03:00
Hillel Coren	673c30456b	Working on multi-language support	2014-04-01 13:30:43 +03:00
Razi KAntorp	008cca025f	Faq page added	2014-03-31 17:06:44 +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	5bd1aff573	Updated payment logic with config settings.	2014-03-29 19:42:37 -04:00
Hillel Coren	2e299aa83f	Working on multi-language support	2014-03-27 14:25:31 +02: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
Hillel Coren	53f9eef3ca	Bug fixes	2014-03-23 22:56:19 +02:00
Hillel Coren	b99427b05c	Bug fixes	2014-03-23 21:38:03 +02:00
blkmutt	6c286b9648	Merge branch 'master' into Dev_PHP-Payments ... Merged changes from master.	2014-03-23 10:23:55 -04: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	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