drigato 2fadc8f8f1 Merge branch '2.5.x' into saas ... Conflicts: CREDITS		2015-01-20 11:44:53 -05:00
..
CalendarService.php	CC-5634: Can add/remove content to a linked show while one instance is currently playing	2014-06-09 12:07:27 -04:00
HistoryService.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
SchedulerService.php	Fixed a bug where we weren't checking if a variable was empty before using it	2014-09-08 13:14:23 -04:00
ShowFormService.php	Merged 2.5.x into saas	2014-11-05 17:36:58 -05:00
ShowService.php	Merge branch '2.5.x' into saas	2015-01-20 11:44:53 -05:00
UserService.php	history records for a show have times validated within show range.	2013-08-30 00:43:43 -04:00