4 Commits

Author	SHA1	Message	Date
Sebastian Grewe	96d096f669	[MERGE] Fix merge conflict	2013-12-30 08:19:13 +01:00
Ryan Loomba	6fb82ae999	fix typo in error message	2013-12-23 13:27:29 -08:00
Sebastian Grewe	0d6ee6d821	[IMPROVED] Auto/Manual Payout Disabled ... This will re-add the ability to disable auto or manual payouts. Option to disable the entire cronjob is left intact. Fixes #1034 when merged.	2013-12-19 15:17:29 +01:00
Sebastian Grewe	afb5fc6c0d	[CHANGED] Merge payout crons ... * Merge manual and auto-payout into single cronjob * Update template/code to reflect single payout cron * Update monitoring page * Update disable payouts option in admin panel settings * Update account payout page to use new option This will fix #967 once merged.	2013-12-12 11:45:33 +01:00