Albert Santoni f0bad70cee Merge branch '2.5.x' into saas-pullreq77 ... Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/application/controllers/ApiController.php		2015-01-09 13:10:54 -05:00
..
CORSHelper.php	Fix logins from WHMCS by disabling CSRF token on login page for trusted	2014-11-20 19:33:11 -05:00
Database.php	CC-5121: fix some SQL statements not being escaped/prepared	2013-05-09 14:43:59 -04:00
DateHelper.php	cleanup new HTTP apiendpoints, added HTTPHelper and getStartEndFromRequest and updated all controllers that called their own versions of this function	2015-01-09 13:02:25 -05:00
HTTPHelper.php	cleanup new HTTP apiendpoints, added HTTPHelper and getStartEndFromRequest and updated all controllers that called their own versions of this function	2015-01-09 13:02:25 -05:00
LocaleHelper.php	Updated i18n to use multiple domains	2014-11-04 17:03:52 -05:00
OsPath.php	Added live-info-v2 and station metadata api calls	2014-10-24 15:11:27 -04:00
Timezone.php	CC-5320 : UTC not included in Timezone List	2013-09-05 11:54:25 +02:00