Commit Graph

3403 Commits

Author SHA1 Message Date
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
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
Albert Santoni 99669c78a0 Fixed CC-5045 and Now Playing time remaining style improvements 2013-09-25 16:40:20 -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
Naomi Aro 0d089b787d Merge branch '2.4.x' into ryerson-history 2013-09-07 16:41:57 +02: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
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
Naomi 653a6384b9 creating a separate controller for playouthistory templates. 2013-08-28 18:25:46 -04:00
Naomi 5aa983be36 adding an instance id to the playout history table. 2013-08-28 17:15:36 -04:00
Naomi e6b09308a5 IM-932 : File Metadata Distinction/Template Design 2013-08-28 15:40:10 -04:00
Naomi 969889859b improper naming of propel tables in php caused cc_mount_name to not get any generated files, double declaration of some variables for cc_timestamp. 2013-08-28 13:07:55 -04:00
Naomi Aro 6d5531f341 CC-5310 : Playlist -> Crash happens on draging a song after a webstream into a playlist 2013-08-27 19:30:17 -04:00
Naomi c2b9bb01ac crlf 2013-08-23 15:53:18 -04:00
Naomi dbe160c5d9 beginning of displaying form errors, need to keep working on this. 2013-08-23 15:52:49 -04:00
cliff.wang 12a62a3827 CC-5309:Calendar-> Recording Show: Fail to open context menu
Better error msg, also add more information in show-record.log
2013-08-23 14:23:47 -04:00
Naomi Aro af822bb5b9 showing time first for endtime box. 2013-08-22 21:39:46 -04:00
Naomi Aro 01370c2124 reverting back to the bootstrap datetime picker since it's nicer to use. 2013-08-22 20:23:17 -04:00
Naomi fa6de28bcf not allowing double file metadata to be added to avoid query problems. 2013-08-22 14:15:40 -04:00
Naomi 84efdfd64a crlf 2013-08-20 17:23:48 -04:00
Naomi 007a7ee7ef casting non mandatory types from "", to avoid database query problems. 2013-08-20 17:23:15 -04:00
Naomi 2e572c652c creating a random string for field names to work for all languages. 2013-08-20 15:31:13 -04:00
Naomi 6d5febe4f7 getting rid of characters from a field name that may cause problems. 2013-08-20 15:18:05 -04:00