Commit graph

2088 commits

Author SHA1 Message Date
Naomi
faa6c7210c Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x 2013-10-02 11:25:08 -04:00
Naomi
4d01e3b11f CC-5347 : isScheduled doesn't work for webstreams 2013-10-02 11:24:48 -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
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
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
107263ae20 CC-5323: User's Timezone Can Improperly Edit Show 2013-09-25 16:22:30 -04:00
Daniel James
577bbf14b6 Remove swear words from source code 2013-09-23 16:16:51 +01:00
Naomi Aro
ae1c41e4ce CC-5333 : Rebroadcast Shows are not created 2013-09-23 12:20:10 +02:00
Naomi Aro
682a37894b Merge branch 'ryerson-history' into 2.5.x-saas
Conflicts:
	airtime_mvc/application/views/scripts/menu.phtml
2013-09-02 15:52:43 -04:00
Naomi Aro
60bf334aeb Merge branch '2.4.x' into 2.4.x-saas 2013-09-02 15:46:25 -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 Aro
15e27f8166 history records for a show have times validated within show range. 2013-08-30 00:43:43 -04:00
Naomi
8208f8596b ordering by show start time 2013-08-29 15:37:33 -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
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
drigato
c48f556b7d CC-5303: Interface freezes sometimes when using smart blocks 2013-08-13 16:41:32 -04:00
Naomi
27b079ace9 adding a label to the form fields (Datatables column headers) 2013-08-07 17:55:18 -04:00
Naomi
774027c9bd crlf 2013-08-02 15:30:35 -04:00
Naomi
c110b4b4df file summary table now starting to work with templates.need to change query around to be configurable still. 2013-08-02 15:29:39 -04:00
Naomi
7ca3048f36 can add a new list item using the template.
set a default item template

working on sql to get a table with unified columns for file md and manually entered metadata without a file.
2013-07-30 19:24:05 -04:00
Naomi
06e21029d0 saving a template to the DB. 2013-07-29 17:35:07 -04:00
Naomi
8eecbb18c0 propel rename done for template fields, template name input. 2013-07-29 17:21:46 -04:00
Naomi
16581088d9 working on configuring an item template UI.
modified db to have fields concept for templates.
2013-07-29 16:31:01 -04:00
Naomi
69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
Naomi Aro
ec44b81f6a clrf 2013-07-18 01:37:39 -04:00
Naomi Aro
29c8570ade editing in progress 2013-07-18 01:31:20 -04:00
Naomi
e63518f2da IM-733 Create Development timetable for Airtime Development
IM-777
Database structure for new History Feature

moving original functionality into the service.
2013-07-03 16:00:48 -04:00
Naomi
328c1f3cac IM-733 Create Development timetable for Airtime Development
IM-777
Database structure for new History Feature
2013-07-03 15:19:05 -04:00
Naomi Aro
f2d5fa96da Merge branch '2.4.x' into 2.4.x-saas
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
	utils/phone_home_stat.php
2013-06-26 01:25:26 -04:00
Naomi Aro
e0d2de642d CC-5254 : Listener Status for SHOUTcast doesn't work
clrf
2013-06-24 17:26:20 -04:00
Naomi Aro
c5221aae6a CC-5254 : Listener Status for SHOUTcast doesn't work 2013-06-24 17:24:43 -04:00
Naomi Aro
3858371b16 CC-5251 : clrf 2013-06-24 11:15:09 -04:00
Naomi Aro
a680421281 CC-5251 : Playlist length is not shown in Library 2013-06-24 11:09:03 -04:00
denise
3b353b47b1 CC-5216: Library length does not consider cue points 2013-06-07 14:19:46 -04:00
denise
c9b7deba52 CC-5213: Crossfades aren't properly applied in schedule table sometimes 2013-06-07 13:07:08 -04:00
Naomi
2c35a0416a clrf fix 2013-05-30 16:53:03 -04:00
Naomi
61427647d6 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 16:52:17 -04:00
Naomi
891cc80069 CC-5190 : Playlist: Copy playlist will lost cue in/out setting 2013-05-30 16:52:03 -04:00
denise
afda0c140b CC-5196: L10N: Smartblock only generate 1 file even multiple files are qualified, no matter which limitation is set. 2013-05-30 15:50:35 -04:00
denise
4728a90ce5 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 15:43:49 -04:00
denise
c1c90a4b9a Smart block fix 2013-05-30 15:43:31 -04:00
Naomi
5fbae77c1f Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-30 15:38:34 -04:00
Naomi
1fa0ee49d6 CC-5190 : Playlist: Copy playlist will lost cue in/out setting 2013-05-30 15:36:55 -04:00
denise
527b1eaf1d CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist 2013-05-30 15:05:57 -04:00
denise
91ea1f2240 CC-5184: Timeline -> Filter by show option doesn't work 2013-05-29 15:00:35 -04:00
Martin Konecny
2a2fd45567 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-29 13:48:01 -04:00
Martin Konecny
362eba60d5 CC-5181
Library -> Edit Metadata:Exception in zendphp.log if trying to set a really large number as track number

-fixed
2013-05-29 13:47:55 -04:00