Commit graph

3578 commits

Author SHA1 Message Date
denise
1e59ab836d CC-5277: Selecting weekly repeat without selecting days fails silently
- added a check in the 'when' form since the validation there relies on the repeat form being valid
- added validation for this in the 'repeat' form
2013-10-01 14:19:02 -04:00
denise
3d9bc85fa0 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-01 08:49:10 -04:00
Naomi
1fa13eed13 CRLF 2013-09-30 13:59:08 -04:00
Naomi
0dd5458269 Merge branch '2.5.x' into CC-5293-calendar-pref 2013-09-30 13:57:23 -04:00
Naomi
7d739a0f66 CC-5316 : Playout History: Doesn't support webstream
adding the webstream metadata to the history table.
2013-09-30 13:56:27 -04:00
Albert Santoni
11ae76beb8 Fix SAAS-349 by preventing password changes in demo mode.
* Added a NotDemoValidate validator class to ensure no changes to a field in demo mode.
* Prevent the user from changing the password of any user in demo mode.
* Fixes SAAS-349.
2013-09-26 16:23:22 -04:00
Albert Santoni
28a032388b Start of bugfixing for SAAS-349.
* Also identity verification for erry on Freenode.
2013-09-26 15:18:41 -04:00
denise
a8a02704f3 Merge branch '2.5.x' into cc-5232-show-timezone 2013-09-25 17:24:44 -04:00
denise
34e2344100 CC-5323: User's Timezone Can Improperly Edit Show
Sometimes show form would populate the start/end time with wrong timezone
2013-09-25 17:18:23 -04:00
Albert Santoni
a1f3309cf7 Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-09-25 16:41:35 -04:00
denise
3e5a6b2a3d CC-5323: User's Timezone Can Improperly Edit Show
Edit show from was displaying rebroadcast dates in user's timezone
instead of in the show's timezone
2013-09-25 16:40:55 -04:00
Albert Santoni
99669c78a0 Fixed CC-5045 and Now Playing time remaining style improvements 2013-09-25 16:40:20 -04:00
denise
e8dc1c5729 CC-5323: User's Timezone Can Improperly Edit Show
- fixed to use show's timezone instead of user's timezone when updating a show's
  start and end time after a show has been edited
2013-09-25 16:22:30 -04:00
denise
2114383519 CC-5323: User's Timezone Can Improperly Edit Show
-overlapping show check was using the user's local timezone to compare new
 shows instead of the show's timezone
2013-09-25 16:22:30 -04:00
denise
af03502592 CC-5323: User's Timezone Can Improperly Edit Show
-added comments to timezone getters and setters in Prefences model
 to reduce confusion on station timezone and user timezone
2013-09-25 16:22:30 -04:00
denise
6aa6d576cd CC-5323: User's Timezone Can Improperly Edit Show
-made localizeDate a static function in ShowFormService
2013-09-25 16:22:30 -04:00
denise
8ddb2974f1 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
denise
107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
Naomi Aro
24861545ce crlf fix 2013-09-24 12:24:13 +02:00
Naomi Aro
7e96828cdd CC-5317 : Guest user can't see Now playing page
removed the library module completely from page if the user does not have permission to view it.
2013-09-24 12:21:04 +02:00
Naomi Aro
53341d40f7 CC-5334 : Localize Ryerson History Feature 2013-09-24 09:56:04 +02:00
Daniel James
577bbf14b6 Remove swear words from source code 2013-09-23 16:16:51 +01:00
Naomi Aro
9de8b6634c CC-5334 : Localize Ryerson History Feature
crlf
2013-09-23 14:58:56 +02:00
Naomi Aro
9ec6156c92 CC-5334 : Localize Ryerson History Feature 2013-09-23 14:57:44 +02:00
Naomi Aro
ee45f10aeb CC-5334 : Localize Ryerson History Feature 2013-09-23 14:42:35 +02:00
Naomi Aro
ae1c41e4ce CC-5333 : Rebroadcast Shows are not created 2013-09-23 12:20:10 +02:00
Naomi Aro
4c6d96e062 CC-5333 : Rebroadcast Shows are not created 2013-09-20 16:35:46 +02:00
Jamie Connor
1c6d7725ca Modified weekInfo from ApiController to display current week and next, changed widget to display extra days. 2013-09-18 17:35:32 +12:00
Naomi Aro
0d089b787d Merge branch '2.4.x' into ryerson-history 2013-09-07 16:41:57 +02:00
Jamie Connor
f7f2cdc51c Follow up changes relating to adding in new show repeat options 2013-09-07 14:54:03 +12:00
Jamie Connor
6da9b6bf42 Removed repeated code 2013-09-07 14:52:45 +12:00
Naomi Aro
5a85fce89d CC-5321 : Changing Timezone after Creating shows creates Problems 2013-09-06 12:35:31 +02:00
Naomi Aro
0734a4a98c CC-5320 : UTC not included in Timezone List 2013-09-05 11:54:25 +02:00
Jamie Connor
03f383f764 added more options for show repeats 2013-09-03 12:25:22 +12:00
Naomi Aro
4a4ef2767e CC-5318 : Playout History: The last song of the show will display wrong end time. 2013-09-01 17:59:47 -04:00
Naomi Aro
619dbf7bbf format/json to prevent zend errors. 2013-09-01 13:38:18 -04:00
Naomi Aro
9c0bee3877 adding show instance to the create form if it's already set. 2013-08-31 23:34:37 -04:00
Naomi
075342c637 don't delete a history item if a show instance is removed from the database. 2013-08-30 16:43:05 -04:00
Naomi
4fd37a4fa0 Merge branch '2.4.x' into ryerson-history 2013-08-30 16:07:41 -04:00
Naomi
0c379ef840 a working show instance select. 2013-08-30 15:03:43 -04:00
Naomi Aro
0e017374b7 change default text to "No Show" 2013-08-30 01:30:23 -04:00
Naomi Aro
15e27f8166 history records for a show have times validated within show range. 2013-08-30 00:43:43 -04:00
Naomi Aro
5a8957273f removing choice for show instance if in shows tab. 2013-08-29 18:52:40 -04:00
Naomi Aro
0f0958ee6b changing the query to only filter by instance id not starts/ends if instance id is set. 2013-08-29 18:32:42 -04:00
Naomi
d50cdd16c2 starting association of a show instance. 2013-08-29 17:40:08 -04:00
Naomi
f97069bd0b displaying show list in proper time zone. 2013-08-29 15:58:24 -04:00
Naomi
8208f8596b ordering by show start time 2013-08-29 15:37:33 -04:00
Naomi
5780eb5bbe show tables filtering by instance id. 2013-08-29 15:17:24 -04:00
Naomi Aro
a4c97479b6 using an accordian to display per show logs. 2013-08-28 23:30:15 -04:00
Naomi
429cdeeffb filtering by a host's show so they can edit their own playout history. 2013-08-28 19:37:46 -04:00