Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,160 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

1935 Commits

Author SHA1 Message Date
denise 0f2848be22 Delete old full calendar files not in use 
Update fullcalendar from 1.5.3 to 1.5.4
Apply custom timezone changes to fullcalendar 1.5.4
 2013-10-08 17:09:19 -04:00
denise 9be2ec2e99 Fixed small typo 2013-10-08 11:24:42 -04:00
denise 56db6e9386 Merge branch '2.5.x' of https://github.com/danielhjames/Airtime into 2.5.x 2013-10-08 11:19:05 -04:00
denise d248f0ca14 Merge branch '2.5.x' 2013-10-08 11:13:39 -04:00
denise 11e4f5a124 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-10-08 11:13:15 -04:00
Daniel James 3fdadf5b66 SAAS-351 Only hide day checkboxes when show repeat type is 2 or 3 2013-10-08 15:55:49 +01:00
denise 55254e88a5 UI text improvements for setting the station/user timezones 
Added info icon in the add-show form for timezone setting
 2013-10-07 14:49:52 -04:00
Naomi 4ca2554999 CC-5362 : In Calendar Week/Day view crappy JS for now playing show makes everything a record show 
fc-show-instance is now a class since agenda day/week are prerendered, thought only 1 was rendered at a time.
better handling of adding the now playing icon.
 2013-10-04 11:05:35 -04:00
denise 632b11c0ab CC-5331: Now Playing keeps refreshing sometimes 
- typo in GET request parameters causing overriding of data
 2013-10-01 16:49:08 -04:00
denise a8a02704f3 Merge branch '2.5.x' into cc-5232-show-timezone 2013-09-25 17:24:44 -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
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
denise 2ab5e6b26a CC-5344: Edit Recorded Show -> Rebroadcasts get deleted 
When editing a show the record option was getting posted with a false value
even if the value was true. This was caused because on show-edit action the
record form field is disabled
 2013-09-25 16:17:20 -04:00
Naomi Aro e47b446804 CC-5338 : Uncaught SyntaxError: audio resources unavailable for AudioContext construction 
creating a single global audio context to avoid resource problems.
 2013-09-24 18:50:41 +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 71001480d2 CC-5335 : I18N: Calendar picker strings are not translated. 
loading the same strings as the jquery calendar.
 2013-09-24 11:47:20 +02:00
Naomi Aro ee45f10aeb CC-5334 : Localize Ryerson History Feature 2013-09-23 14:42:35 +02:00
Naomi Aro 0e20e5b50b Merge branch '2.4.x' into ryerson-history 2013-09-07 16:51:22 +02:00
denise 0b66f62045 Removed old jquery syntax 2013-09-06 11:08:01 -04: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 614a8174d5 put "no show" at the end of the select by default. 2013-08-31 22:56:22 -04:00
Naomi d790dc63c2 taking the modified calendar from 2.4.1 2013-08-30 16:03:17 -04:00
Naomi 98412e59ff underscore templates updated 2013-08-30 15:25:57 -04:00
Naomi 8c66c5bb18 default no show option 2013-08-30 15:06:59 -04:00
Naomi 0c379ef840 a working show instance select. 2013-08-30 15:03:43 -04:00
Naomi Aro ab8cf60fe3 refreshing view on navigation. 2013-08-30 02:39:14 -04:00
Naomi Aro de225c589f restricting search properly for select all/none. 2013-08-30 02:31:23 -04:00
Naomi Aro ad531f9512 clearing internal selected items array. 2013-08-30 02:24:16 -04:00
Naomi Aro 846c90bc8f fixing select all/none button 2013-08-30 02:11:26 -04:00
Naomi Aro a4e9cd1add can research times in show summary now. 2013-08-30 01:51:33 -04:00
Naomi Aro 8971e6330a removing animation for smoother effect. 2013-08-30 01:39:51 -04:00
Naomi Aro 2c88d1e0a0 formating the date start/end of each show in the accordian. 2013-08-30 01:06:59 -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 d50cdd16c2 starting association of a show instance. 2013-08-29 17:40:08 -04:00
Naomi 91d4d1224e redoing accordian properly. 2013-08-29 15:52:24 -04:00
Naomi ec31fd50c9 deleteing items from the show table. 2013-08-29 15:34:34 -04:00
Naomi 5780eb5bbe show tables filtering by instance id. 2013-08-29 15:17:24 -04:00
Naomi Aro 803409f151 creating a show table beginning 2013-08-29 11:01:03 -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 5fbc3867f8 removing default button after pressing. 2013-08-28 15:57:29 -04:00
Naomi e6b09308a5 IM-932 : File Metadata Distinction/Template Design 2013-08-28 15:40:10 -04:00
Naomi f08a732c11 reinitialize form after error check. 2013-08-28 13:42:33 -04:00
Naomi dbe160c5d9 beginning of displaying form errors, need to keep working on this. 2013-08-23 15:52:49 -04:00
Naomi b2828d466d need delegation with delayed initialization. 2013-08-23 13:38:20 -04:00
Naomi f1b1352077 matching selected row colours to the library table. 2013-08-23 13:31:37 -04:00
Naomi 59ba938334 implementing select all/none etc 2013-08-23 13:18:17 -04:00
Naomi 63ce35b38d initializing only when viewed. fixes flash buttons, saves load time. 2013-08-23 12:28:37 -04:00
Naomi dd0115f573 proper showTimeFirst file 2013-08-23 11:53:31 -04:00
Naomi 5ec8665aec adding datetimepicker with showTimeFirst option 2013-08-23 11:48:26 -04:00
Naomi Aro fb37f371e2 changing enddate at all times now, problem with setting time otherwise. 2013-08-22 22:21:08 -04:00
Naomi Aro 3e8f49c00d only automatically set the end date if it is blank. 2013-08-22 21:46:17 -04:00
Naomi Aro af822bb5b9 showing time first for endtime box. 2013-08-22 21:39:46 -04:00
Naomi Aro 48e6ddbb04 set the end time to be the starttime on change. 2013-08-22 20:48:00 -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 ec7f4fa1ef default display length is 25. 2013-08-22 15:45:09 -04:00
Naomi 8ed3e23195 output columns are only the sortable columns (everything except checkbox pretty much) 
pdf output is default landscape now.
 2013-08-22 15:19:38 -04:00
Naomi f7531d5da2 remove sizing of history content div in JS. CSS to fix width and containing box problems. 2013-08-22 14:50:58 -04:00
Naomi 5c0ba2e79b clearing custom Label name after adding 2013-08-22 14:23:07 -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 Aro 17abb4ad9a need a better random field name generator to avoid problems 2013-08-21 21:44:52 -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
Naomi 10ef55b083 context menu just in the client now. works for both tables. 2013-08-20 14:58:22 -04:00
Naomi Aro 09693ef174 changing to context menu single edit/delete. 2013-08-19 23:19:13 -04:00
Naomi Aro 9b45b9dc72 converting to a jquery UI based datepicker. 2013-08-16 15:12:00 -04:00
Naomi 673c422015 replacing booleans in table with checkbox + column title 2013-08-14 16:38:59 -04:00
Naomi fdf18ec3ce upgrading table tools to version 2.1.5 2013-08-12 18:18:33 -04:00
Naomi d83c004fb9 subclassing the template types, files summary table is now fully configurable form wise. 2013-08-12 15:06:26 -04:00
Naomi 5676decd2d Using local copy of jquery UI 1.8.24 2013-08-09 17:11:34 -04:00
Naomi d201efbe49 crlf 2013-08-09 15:52:50 -04:00
Naomi 333ee7453e downgrading full calendar (too much to do the necessary updates at the moment) but still an upgrade from 2.4.x 2013-08-09 15:52:22 -04:00
denise 5bdc1a1e4b Update jplayer to 2.4.0 2013-08-09 13:04:33 -04:00
Naomi 27b079ace9 adding a label to the form fields (Datatables column headers) 2013-08-07 17:55:18 -04:00
Naomi aaf2e5c2f6 better casting on form checkbox, setting populate flag properly based on if id is set (for create/update) 2013-08-05 15:05:26 -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 a5a99da21e Editing templates, strictly typing metadata for datatables (for unions) 2013-08-01 16:36:18 -04:00
Naomi 7ca28fe81d history item datatable is set up with configurable columns now. 
should add a field when configuring template field for "display name"
 2013-07-31 17:38:48 -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 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 Aro c0206ff8f4 CRLF 2013-07-29 08:59:04 -04:00
Naomi Aro 7183396da5 needed to update jquery, fullcalendar needed updating for the new JS. 
working on configuring a template.
 2013-07-29 08:57:31 -04:00
Naomi 46ecdf393d dynamic form rendering for template 
bootstrap datetime widget.

jquery update is needed, testing with hosted jquery first.
 2013-07-26 17:33:17 -04:00
Naomi Aro c7b5592fa9 starting to populate with the template. 2013-07-26 11:36:58 -04:00
drigato b77b12c508 Merge branch '2.4.x' into 2.4.x-saas 2013-07-24 15:32:16 -04:00
Naomi ecb2f81211 creating an new row for edit/delete links in the datatable 
working on creating/editing records.
 2013-07-23 18:01:43 -04:00
Naomi 69afc715d1 creating templates for validation. 2013-07-22 18:11:44 -04:00
drigato f76bb5209e CC-5222: Calendar: Ends time of show is missed in Weekly view 2013-07-19 12:46:04 -04:00
Naomi Aro 29c8570ade editing in progress 2013-07-18 01:31:20 -04:00
Naomi c744d88f23 IM-784 : Create Editing Abilities For History 2013-07-08 18:00:02 -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
drigato 3f9e756912 CC-5245: It's able to edit contents for current ON AIR linked show 2013-06-20 12:56:05 -04:00
Martin Konecny 3391aa90c5 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-10 15:57:21 -04:00
Martin Konecny 93192853d5 CC-5221 
Don't refresh Calendar after closing add/remove popup
 2013-06-10 15:57:08 -04:00
Martin Konecny deecc9db7b CC-5220 
Cancelled show still appears on Dashboard
 2013-06-10 15:55:57 -04:00
Naomi fe0b0b9a65 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-10 15:54:32 -04:00
Naomi ee1cf64515 CC-4504 : Double scrollbars in Library view 2013-06-10 15:52:46 -04:00
Naomi 01f835c4c4 CC-4504 : Double scrollbars in Library view 2013-06-10 15:50:33 -04:00
Martin Konecny af595e0c8a CC-5217 
Calendar: "NaN..." appears at date field sometimes

fixed
 2013-06-10 14:52:43 -04:00
Martin Konecny b18495a79e CC-5210: "Linked" Icon is missing after adding contents into linked show 
-fixed
 2013-06-07 15:15:52 -04:00
denise 311e0c103d small fix 2013-06-07 14:44:21 -04:00
denise 8bc93fcba7 CC-5218: Provide show id and linked flag to calendar events 
Prefixed attribute names with "data"
 2013-06-07 14:36:52 -04:00
denise ede618b3ad Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-06-07 13:58:00 -04:00
denise ee41e13fe1 CC-5218: Provide show id and linked flag to calendar events 2013-06-07 13:57:48 -04:00
Martin Konecny ade1890acd CC-5210: 
"Linked" Icon is missing after adding contents into linked show

-fixed
 2013-06-07 13:52:13 -04:00
Martin Konecny 86f3985c03 CC-5206: 
Calender: "Empty show" icon doesn't change after filling contents unless manually refresh page

fixed
 2013-06-04 14:52:26 -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 527b1eaf1d CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist 2013-05-30 15:05:57 -04:00
Naomi Aro c5550d31fd Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 14:28:28 -04:00
Naomi Aro 4d1a15b7ca CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 14:27:59 -04:00
denise 8f418fb34c Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 14:18:38 -04:00
denise 950cc6d6b7 CC-5177: Create "?" icon beside linked show check box 2013-05-28 14:18:26 -04:00
Naomi Aro 51573d36c9 CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 13:30:47 -04:00
Naomi Aro 96eefee407 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 13:12:15 -04:00
Naomi Aro 5a2b9796ec CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2013-05-28 13:11:47 -04:00
Martin Konecny 951eeb0bbe CC-5178: 
Dashboard: Error happens after creating a show

-fixed
 2013-05-28 11:07:45 -04:00
Naomi 408ecc530d CC-3822 : NowPlaying-> Time filter is allowing Start_Time be greater than the End_Time 2013-05-27 14:37:16 -04:00
Naomi 4c791e573b Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-27 11:57:00 -04:00
Naomi 9ce3b0c043 small modifications to make the waveform enabled in firefox 21 (playout does not work though) 2013-05-27 11:55:57 -04:00
Naomi Aro 69f6295553 CC-5108 : Waveform Editor UI 
error check for if both tracks cannot be decoded.
 2013-05-24 11:27:56 -04:00
Naomi Aro f5e03db9fe CC-5108 : Waveform Editor UI 
making sure the correct li is activated when a track has a decoding error.
 2013-05-24 11:23:08 -04:00
drigato 46cc2d00b8 Removed CRLF 2013-05-24 10:30:37 -04:00
drigato 0e9c9e3946 Updating de_DE datatables and plupload language files. Thanks to Silvio Mende 2013-05-24 10:29:07 -04:00
Naomi 75e6f21ce0 CC-5108 : Waveform Editor UI 
putting on the timescale for time reference.

fade editor now has cursor playback info.
 2013-05-23 18:33:40 -04:00
Naomi c57de650e8 CC-5172 : errors from setting cues in waveform editor not handled properly 
Conflicts:
	airtime_mvc/application/models/Playlist.php
 2013-05-23 13:01:38 -04:00
Martin Konecny 5c11f5fc72 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
 2013-05-22 18:08:14 -04:00
Naomi d51139b615 Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-22 17:50:59 -04:00
Naomi 0bfcd32554 CC-5172 : errors from setting cues in waveform editor not handled properly 2013-05-22 17:50:34 -04:00
Martin Konecny 254d3b8950 Merge branch '2.4.x' into 2.4.x-saas 2013-05-22 16:09:02 -04:00
Martin Konecny 8e990e2bf9 CC-5170: 
Sometimes the dashboard does not show the current playing file

-fixed
 2013-05-22 16:03:24 -04:00
Daniel James 717cda984a Fixed 'steam' typo in stream settings tooltip 2013-05-22 10:21:27 +01:00
Naomi 3ad7c868e2 Merge branch 'SAAS-317-datatables-reorder' into 2.4.x 2013-05-21 17:44:25 -04:00
Naomi b720086a4b SAAS-317 : http://ryerson.airtime.pro/ is having issues with show/hide column in their library 
missing single quote problem, updating column visible plugin.
 2013-05-21 17:40:52 -04:00
Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout
 2013-05-21 16:40:10 -04:00
denise fb605ccb71 Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page 2013-05-21 09:30:35 -04:00
denise 0f1a94532e CC-5157: [Beta user reported]Linked Show: Multiple warnings after multiple check/uncheck action 
Fixed. Also had to prepare the warning message for localization.
 2013-05-17 14:47:34 -04:00
Martin Konecny 01d16348db Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-17 13:20:40 -04:00
Martin Konecny ae41a4f9ff more persistent links (won't be invalid if title changes) 2013-05-17 13:20:28 -04:00
denise 5bf91d513d CC-5127: Library -> Scheduled and Playlist columns needs better icon 
Changed icon
Renamed Playlist to Playlist / Block
 2013-05-17 11:42:48 -04:00
denise 3010d014b4 Hungarian translation 2013-05-16 12:47:40 -04:00
Martin Konecny ca6442f7f0 ensure we are parsing in base 10 2013-05-15 17:18:52 -04:00
Martin Konecny 05dc0b7dbc added comments, remove deprecated code, better var names... 2013-05-15 16:44:36 -04:00
Martin Konecny 018c88d12a CC-5063: 
"Nothing Scheduled" appears between 2 scheduled tracks

-fixed
 2013-05-15 16:43:58 -04:00
Naomi 10154ae724 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-15 15:39:07 -04:00
Naomi b0cdc606f8 CC-5096 : Add "i" (info) icon to stream output type 2013-05-15 15:38:46 -04:00
Martin Konecny b2c8cb0f9d Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 19:18:51 -04:00
Martin Konecny bb36556bb9 IM-629 
-filter by using instance id instead of show id

Conflicts:
	airtime_mvc/application/models/Schedule.php
 2013-05-14 19:18:08 -04:00
Naomi 393c8abb95 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 18:14:51 -04:00
Naomi 7d5177d77d CC-5096 : Add "i" (info) icon to stream output type 2013-05-14 18:14:38 -04:00
Martin Konecny af7b2d5347 IM-629 
-fix using instance id instead of show id
 2013-05-14 17:18:20 -04:00
Martin Konecny 992e3c37ef IM-629 
-add missing POST parameter
 2013-05-14 17:18:11 -04:00
Martin Konecny 22a12dd1a9 IM-629 
-show only single show at a time
 2013-05-14 17:18:03 -04:00
Martin Konecny 43e825fe49 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 16:57:28 -04:00
Martin Konecny 70a8d3d5dd CC-5146: 
Output Stream Settings: Please disable options opus and aac when streaming server is SHOUTcast

-fixed
 2013-05-14 16:16:58 -04:00
Naomi 809d5a35b9 CC-5108 : Waveform Editor UI 
changing colour to be less dark. can better see highlights/drawn fades.
 2013-05-14 15:49:13 -04:00
Naomi 0dd8138c2b CC-5131 : Please give user a message that Browser other than Chrome can't use waveform 2013-05-14 14:15:54 -04:00
Naomi d9b6a15fb6 CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block 2013-05-13 18:21:24 -04:00
Naomi 872f68505b CC-5108 Waveform Editor UI 2013-05-13 16:01:06 -04:00
denise ba82e3b3ae Added missing localization files for en_GB, and de_AT 2013-05-13 09:22:40 -04:00
denise 27b79c2e91 CC-5128: Library -> Do not auto sort by scheduled 2013-05-10 16:17:30 -04:00
denise 79bc927a30 CC-5130: Calendar -> Linked icon disappears if show is full 2013-05-10 16:07:54 -04:00
denise a3eda62bb2 CC-5113: Preferences -> Mail Server Config: Error present will cause web form read-only 2013-05-10 15:18:54 -04:00
denise 7b8a37065a CC-5080: Calendar -> Warn user a show cannot be linked again once it has been unlinked 2013-05-10 14:53:01 -04:00
denise fedf564090 CC-5081: Calendar -> Add a linked show icon 2013-05-09 12:14:49 -04:00
Martin Konecny d06b2f3f94 CC-5116: 
Please add opus into the file name filter

-fixed
 2013-05-08 17:06:50 -04:00
denise fe88e6249a CC-5093: Please disable link option for recording show 2013-05-08 15:08:56 -04:00
Naomi fe916ec043 CC-2301 : adding in crossfade durations to smart blocks. 2013-05-08 11:43:53 -04:00
Naomi f64e99176e CC-510: Cue Editor: Please enable to preview the current cue in/out settings. 2013-05-07 12:46:44 -04:00
Naomi 3a74bb7ca5 CC-2301 : removing shift buttons since it's disabled for this release. 2013-05-06 17:47:35 -04:00
Naomi ce81691743 CC-2301 : not allowing any sliding with only global crossfade durations. 2013-05-03 15:32:07 -04:00
Naomi 75e4e0c9b6 CC-2301 : only showing waveform buttons if the browser supports the audio api. 2013-05-03 14:42:42 -04:00
Naomi 92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
Naomi f82659d582 CC-2301 : stopping playlist editor to make sure audio isn't stuck playing in the background. 2013-04-30 17:03:40 -04:00
Naomi 2a1ac0ddb9 CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps. 2013-04-30 16:27:31 -04:00
Naomi 0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Naomi 410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist. 
changing default fade to be a separate default fade in/out
 2013-04-29 16:55:08 -04:00
denise 71526a94cc Merge branch 'cc-4961-show-linking' 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2013-04-29 15:35:16 -04:00
Naomi ef100f89f1 CC-2301 : not drawing fades of length zero. 2013-04-26 17:54:37 -04:00
Naomi 0169c01724 CC-2301 : updating waveform code for states 2013-04-26 16:23:46 -04:00
Naomi a4731d4af2 CC-2301 : automatically updating the fadein/fadeout for a track in the fadein/fadeout states. 
Can enable states on a per track basis.
 2013-04-26 15:57:02 -04:00
Naomi 628af95325 CC-2301 : needed to adjust cueout if length information is inaccurate. 2013-04-26 12:38:13 -04:00
Naomi 2b22828e85 CC-2301 : destorying dialogs instead of just closing to free up resources. 2013-04-25 17:48:35 -04:00
Naomi 8fea97d580 CC-2301 : fade editor now loads currently set fades. Fixing some bugs in the waveform editor. 2013-04-25 17:10:37 -04:00
Naomi 0deaee4d0e CC-2301 : disallowing movement of first track in fade editor. 2013-04-24 15:32:48 -04:00
Naomi 179621d687 CC-2301 : fades editor is loading now with a leftoffset for the second track and the cues for both tracks. 2013-04-24 14:15:07 -04:00
Naomi 956bcccd24 CC-2301 : creating different states for the fade editor: 
cursor, fadein, fadeout.
 2013-04-23 16:36:35 -04:00
denise a9b5d00d87 CC-4961: Show linking 2013-04-18 16:12:26 -04:00
Naomi 04a0d9c54e CC-2301 : waveform editor 
current cues being set.
 2013-04-17 18:00:16 -04:00
Naomi 0d3c0912ba CC-2301 : Waveform Editor 
Cue editor can save values to the playlist.
 2013-04-17 17:17:39 -04:00
Naomi 0385285741 CC-2301 : waveform editors are now in their own separate pop up. controls working for fades/cues. should add more specific states for fade editor. 2013-04-16 17:24:30 -04:00
Naomi 13c8e5f146 CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box. 2013-04-16 14:37:08 -04:00
Martin Konecny b82f4f0fa9 Merge branch '2.3.x' into 2.3.x-saas 2013-04-11 15:13:08 -04:00
Martin Konecny 984828ef36 SAAS-301: Calendar content indicator did not update automatically after adding content to a show 
-fixed
 2013-04-11 15:13:02 -04:00
Martin Konecny d46fef8eda SAAS-301: Calendar content indicator did not update automatically after adding content to a show 
-fixed
 2013-04-11 15:11:20 -04:00
Martin Konecny 3714f83757 Merge branch '2.3.x' 2013-04-11 15:06:21 -04:00
Martin Konecny a65be248bd Merge branch '2.3.x' into 2.3.x-saas 2013-04-11 15:05:08 -04:00
Martin Konecny 3000f543d8 SAAS-301: 
Calendar content indicator did not update automatically after adding content to a show

-fixed
 2013-04-11 15:04:16 -04:00
denise 418bf0b5ff Created calendar service and moved the context menu creation there 2013-03-26 16:03:53 -04:00
denise 5b69761833 CC-4961: Show linking 
Populate repeat show form correctly when a show is repeating monthly
on the same day of the week
 2013-03-25 13:48:11 -04:00
denise 327d0dd6c9 CC-4961: Show linking 
Add front-end for creating a show with monthly repeats on same day of week
 2013-03-22 15:57:15 -04:00
denise a7601d290f CC-4961: Show linking 
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
 2013-03-21 10:05:11 -04:00
Martin Konecny 43ffa2aece Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/SystemstatusController.php
 2013-03-06 13:47:21 -05:00
Martin Konecny 5ceeb88899 Merge branch '2.3.x' into devel 2013-03-06 13:46:01 -05:00
Martin Konecny 0ef1a5ffda CC-4976: Cannot select Ogg/Vorbis output stream after selecting SHOUTcast then selecting Icecast 
-fixed
 2013-03-05 18:19:08 -05:00
Martin Konecny 8bec9dea55 Merge branch '2.3.x' into 2.3.x-saas 2013-02-20 14:41:55 -05:00
denise 176e78632f Added a comment about referring to the wiki when adding a new datatable column 2013-02-19 16:43:47 -05:00
denise c8d7d23d62 CC-4963: Add cue in and cue out to smart block criteria list 
Done
 2013-02-19 16:38:58 -05:00
denise 959839e180 Renamed criteriaTypes to libraryColumnTypes for library advanced search 2013-02-19 15:09:24 -05:00
denise 32fc5eb758 CC-4951: Add cue in and cue out to library filter columns 
Configured advanced search for these columns
 2013-02-19 14:44:32 -05:00
denise 8bdf3508b0 CC-4951: Add cue in and cue out to library filter columns 
Done
 2013-02-19 13:38:35 -05:00
denise 49dc3140a8 CC-4962: Library -> Library and playlist editor have different heights sometimes 
Fixed: needed to set height when we open the playlist editor
 2013-02-19 11:59:17 -05:00
denise 14f1d5572f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-02-19 10:59:03 -05:00
denise d1301ff676 CC-4954: Please make Library page remember the status per user 
-done
 2013-02-19 10:58:48 -05:00
Naomi 542553bbc1 Merge branch '2.3.x' into devel 2013-02-15 17:05:36 -05:00
Naomi 9a2b8af7b1 Revert "CC-4955: Datatables saves its parameters twice on every page load" 
This reverts commit 39ec07e71c.
 2013-02-15 16:50:43 -05:00
Martin Konecny 09baf3a47d remove unecessary file + better error handling 2013-02-15 14:19:04 -05:00
Martin Konecny 39ec07e71c CC-4955: Datatables saves its parameters twice on every page load 
-fixed
 2013-02-15 14:18:32 -05:00
Martin Konecny 4f3ea3f406 Update ColReorder Datatables plugin 2013-02-14 17:48:32 -05:00
Martin Konecny b30f67b24b CC-4950: builder-feed is called twice on NowPlaying screen load 2013-02-14 15:49:38 -05:00
denise e2e45b0160 CC-4948: Library -> library loses have its width when window is resized 
-fixed
 2013-02-14 15:34:11 -05:00
denise 1a36953d82 CC-4898: Pressing "Enter" from anywhere on the edit metadata popup should automatically Save and close the popup 
-fixed
 2013-02-14 14:52:48 -05:00
Martin Konecny 58740d6b41 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-14 13:33:27 -05:00
Martin Konecny b3ab84db2e add minified datatables.js and upgrade from 1.9.1 to 1.9.4 2013-02-14 13:33:18 -05:00
denise 9e0d14a8a7 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-14 13:31:39 -05:00
denise 1b5b7ae1f7 Stopped refetching calendar events when calendar is resized 2013-02-14 13:31:22 -05:00
Martin Konecny bb7e56e39e CC-4943: Raspberry Pi optimization: don't create new background AJAX request until the previous one has returned 
-fixed
 2013-02-14 12:58:31 -05:00
denise cd5f1149af CC-4924: Calendar: "View Recorded File Metadata" for record show still uses old Metadata Editor 
-fixed
 2013-02-14 11:43:29 -05:00
denise 74291cc248 Merge branch 'cc-3627-close-playlist' into devel 2013-02-13 17:57:41 -05:00
denise ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise 6bbb603bcd CC-3627: PlaylistBuilder->Playlist Panel -> it would be very handy to have "Close playlist" functionality 2013-02-13 16:05:11 -05:00
denise 04ed640756 CC-3885: Deleted open playlist is not closed until a new item is added to it 
-fixed
 2013-02-13 15:44:52 -05:00
denise eb38503d6e CC-4946: Now Playing -> Apache error when empty show starts 
-we were trying to update the is_scheduled flag on a non-schedule item
 2013-02-13 11:51:25 -05:00
denise 4ff1e8e78a CC-4932: Library -> Update Scheduled column on 'Cancel current show' action 
-fixed
 2013-02-13 11:29:43 -05:00
denise 30c47df93d Audio preview wasn't working in Firefox when airtime is not in document root 2013-02-11 15:56:21 -05:00
denise 2315e3473d CC-4935: Smart Block -> Error when saving sometimes 
-fixed
 2013-02-07 17:33:11 -05:00
denise 93017b8477 Added Greek datatables and plupload language files 
Added Greek to locale db table
 2013-02-07 16:43:24 -05:00
denise 525b2dcb33 CC-4895: Remove all json die() statements from code 
- removed json_encode
 2013-02-07 15:41:47 -05:00
denise 969e34aba1 CC-4930: Calendar -> Recorded shows have 'show partially filled' icon 
-fixed
 2013-02-07 12:22:32 -05:00
denise 532ea09eed Added Polish datatables and plupload translation files 
Added Polish to upgrade script and default data
 2013-02-06 16:46:12 -05:00
Martin Konecny d028e00cdb Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-06 16:30:11 -05:00
Martin Konecny 38c75791f2 Merge branch 'devel' of https://github.com/sematuszewski/Airtime into 2.3.x 2013-02-06 16:29:20 -05:00
denise 634a6991ce CC-4865: Password reset -> Cancel -> url is missing base directory 
-removed extra '/'
 2013-02-06 13:44:10 -05:00
denise 0ed5d18e95 CC-4920: Now Playling js error 
-fixed
 2013-02-06 13:25:48 -05:00
denise 517a58bc43 CC-4919: Library -> Search: Exception happens when switching back to simple search with some illegal input in Advanced Search 
-fixed
 2013-02-06 12:36:04 -05:00
Martin Konecny 93ec4c001b Merge branch '2.3.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
 2013-02-02 21:07:34 -05:00
denise 8309593a0f CC-4904: Library -> Sort by status doesn't work 
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
 2013-02-01 17:47:07 -05:00
denise 384298f680 CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist 2013-02-01 12:06:01 -05:00
denise 3bc2876f27 CC-4903: Library -> Show/hide columns -> Status Column needs label 
-fixed
 2013-01-31 11:41:00 -05:00
denise e1c69ebca2 CC-4902: Library -> Status column does not update when you add a file to a show 
-fixed
 2013-01-31 11:28:54 -05:00
Martin Konecny 0a198ae424 Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/models/User.php
 2013-01-30 18:31:45 -05:00
denise cf2ed25bfb CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist 
-done
 2013-01-30 16:53:59 -05:00
denise 4f5d7869d8 Removed html from Library/contents-feed and StoredFile model 
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
 2013-01-30 15:38:25 -05:00
denise 043fbd1dfb CC-4886: Warn if track is part of a playlist when deleting from library. 
-done
 2013-01-30 10:55:24 -05:00
denise 9d99b8ae90 CC-4887: Show whether track is scheduled in the future on Library page 2013-01-30 10:33:26 -05:00
drigato c45440482a CC-4887: Show whether track is scheduled in the future on Library page 2013-01-30 08:57:59 -05:00
Martin Konecny b15c4569eb CC-4894: Need to filter output for potential XSS exploits 
-fixed few areas
 2013-01-29 15:17:29 -05:00
Martin Konecny 7c327e4c75 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 12:12:21 -05:00
denise 1873022a13 CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page? 
-fixed
 2013-01-25 11:21:34 -05:00
Martin Konecny 6f5ffdc1e7 Merge branch '2.3.x' into 2.3.x-saas 2013-01-24 17:49:08 -05:00
Martin Konecny 56c61d4ab7 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-minor cleanup of function init
 2013-01-24 14:09:14 -05:00
Martin Konecny 2f3a30b580 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-we know what month will be the initial view for the user.
-Provide this data ahead of time via ajax request
 2013-01-24 12:52:24 -05:00
Martin Konecny 091f5ff49f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
 2013-01-24 12:13:55 -05:00
Martin Konecny 548b73db42 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-remove an unnecessary roundtrip to server
 2013-01-23 18:31:45 -05:00
denise 1e57309e66 CC-4692: Update jquery.jplayer.min.js to version 2.2 2013-01-23 12:19:07 -05:00
drigato c13188d0e1 Added Czech and Brazilian Portuguese language options 2013-01-21 14:56:27 -05:00
Martin Konecny 210336d20a Merge branch 'devel' into 2.3.x-saas 2013-01-18 17:14:11 -05:00
denise b818f1d46e CC-4866: Library -> Edit metadata -> table does not redraw after 
-fixed
 2013-01-18 16:40:31 -05:00
denise c4b1346f4e CC-4865: Password reset -> Cancel -> url is missing base directory 
-fixed
 2013-01-18 15:54:56 -05:00
denise 2d76d76e2d Removed console.log 2013-01-18 14:49:13 -05:00
Martin Konecny 784cb390d3 Merge branch 'devel' into 2.3.x-saas 2013-01-17 10:56:18 -05:00
denise f7e8fd33fd CC-4848: Streaming server passwords should be hidden with dots, once entered 
-fixed
 2013-01-16 14:36:56 -05:00
Martin Konecny c57e19983c -fix merge mistakes from devel 2013-01-15 14:06:02 -05:00
Martin Konecny 8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
 2013-01-15 13:44:44 -05:00
Martin Konecny 4e0d644d8b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 17:16:01 -05:00
Martin Konecny e22a573d8a CC-2184: Hardcoded CSS path should be relative path instead 
-missed some paths
 2013-01-14 17:15:53 -05:00
denise 692c1a1c9e CC-4838: I18N: HTML contents of Print preview for Playout History need to be translated 
-fixed
 2013-01-14 17:01:50 -05:00
Martin Konecny 0dfd8acf7a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 16:00:46 -05:00
Martin Konecny fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead 
-Make '/' the default root
 2013-01-14 16:00:38 -05:00
James ed2e25fb29 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 14:49:22 -05:00
James 0eb5fb51b6 CC-4836: Playlist length is wrong because wrong cue out setting. 
- fixed
 2013-01-14 14:49:06 -05:00
Martin Konecny ba66746a00 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 14:07:55 -05:00
Martin Konecny 3a70a371be CC-4751: Calendar: Add/Remove contents won't trig status update of shows 
-fix problem when baseurl changed
 2013-01-14 14:07:32 -05:00
denise 1e6b0fe6ae CC-4833: I18N: Alert message "Please select a cursor posion from timeline." in Now playing page is not translated 
-fixed
 2013-01-14 13:47:41 -05:00
Martin Konecny 97eeafb142 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-11 15:38:06 -05:00
Martin Konecny 2bbdb01495 CC-4751: Calendar: Add/Remove contents won't trig status update of shows 
-fixed
 2013-01-11 15:37:58 -05:00
denise 224bcf0c2b CC-4793: System -> User: Sometimes the user type's tips turns out "undefined" 
-fixed
 2013-01-11 15:12:41 -05:00
denise 8362860904 Block expansion ajax url was missing baseUrl 2013-01-11 14:11:01 -05:00
denise f80f0dddd7 Listenerstat ajax call was missing baseUrl 2013-01-11 13:18:57 -05:00
Martin Konecny c11edea253 CC-4802: Preferences -> Soundcloud settings: Sub-options can be checked before major one 
-fixed
 2013-01-11 13:13:36 -05:00
denise a129b0b081 CC-4472: User password verify or clear text display. 
-done with password verify
 2013-01-10 17:51:25 -05:00
denise 86f57cb953 CC-4820: I18N: Date and Time picker of Record/rebroadcast show is not translated 
-fixed
 2013-01-10 16:30:04 -05:00
denise 4673f11d76 Default language to english when cookie is not set 2013-01-10 15:06:45 -05:00
denise 6fe8006612 Jquery cookie plugin 2013-01-10 14:57:47 -05:00
denise 9f857433fa CC-4817: I18N: "Playlist Shuffled" is not listed for translation 
-fixed
 2013-01-10 14:22:25 -05:00
denise dffe932223 Added missing base directory to urls 2013-01-10 13:58:11 -05:00
denise 2797809c74 CC-4786: Refresh page when language setting changes 
-done
 2013-01-10 13:55:52 -05:00
denise 1100baefbc CC-4823: Locale cookie doesn't get set after user logs in 
-fixed
 2013-01-10 10:37:30 -05:00
denise 20f7544552 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-09 18:03:39 -05:00
denise 1572955d07 CC-4810: Add language setting to login page 
-done
 2013-01-09 18:03:23 -05:00
Martin Konecny a5e7c0197f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-09 15:52:45 -05:00
Martin Konecny 58fc8ecee7 CC-4766: Invalid date appears during setting show's time and date 2013-01-09 15:52:35 -05:00
denise 26ab0fb468 CC-4809: Listen popup UI breaks with localization 
-added comment
 2013-01-08 17:56:05 -05:00
denise 3b2b275c30 CC-4809: Listen popup UI breaks with localization 
-fixed
 2013-01-08 17:51:42 -05:00
denise 9755ea6a20 CC-4814: System->Streams: Tool tips' content of output stream's admin user field is not listed in airtime.po file 
-fixed
 2013-01-08 16:47:00 -05:00
denise a7992c291e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:09:55 -05:00
denise 3de33bc3e3 CC-4811: Move the edit user form to its own page 
-done
 2013-01-08 15:09:35 -05:00
Martin Konecny c632ad00f9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 12:37:53 -05:00
Martin Konecny add51bd735 -update plupload from 1.5beta to 1.5.4 2013-01-08 12:37:37 -05:00
denise bf2e5c6f32 Fixed Typo in user rights 2013-01-08 11:57:05 -05:00
denise e9a86b7bcf CC-4799: Calendar -> Show empty and show partially filled icons need qtips 
-fixed
 2013-01-07 17:26:40 -05:00
denise 1f1b408c6e CC-4803: Calendar -> Soundcloud id is always null 
-fixed
 2013-01-07 17:21:35 -05:00
denise cffad91840 CC-4800: Soundcloud icon qtips do not work and have wrong colour scheme 
-fixed
 2013-01-07 15:23:51 -05:00
denise 251e1a52d6 Removed a function no longer in use 2013-01-07 14:12:31 -05:00
denise 82da4dcfe8 CC-4599: Calendar: Add an icon to indicate show is not fully booked 
-done but a new icon is needed
 2013-01-07 12:41:28 -05:00
denise 8142427668 Small formatting fix 2013-01-04 18:18:58 -05:00
denise 3c969b0aef Removed useless code 2013-01-04 18:16:47 -05:00
denise 495fd7da1a CC-4734: French - UI breaks in several places 
-fixed
 2013-01-04 17:19:09 -05:00
denise 7e1efe5d96 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-04 11:00:36 -05:00
denise 596e103d96 CC-4763: Alignment error for User settings UI in Firefox 
-fixed
 2013-01-04 11:00:21 -05:00
James 5d76bb2d17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-03 18:00:33 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page 
- done
 2013-01-03 17:58:50 -05:00
denise c11032111e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-03 16:19:20 -05:00
denise e2c87ed8b6 CC-4781: Store localization settings on a per-user basis 
-done
 2013-01-03 16:19:02 -05:00
James 0f4ddc904f CC-4756: System -> Streams: "Addtional Options" is not expandable when connection error happens 
- fixed
 2013-01-03 14:54:07 -05:00
Martin Konecny d41c248435 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:24:12 -05:00
Martin Konecny f7bcc8a4ed Merge branch 'patch-2' of https://github.com/havban/Airtime into devel 2013-01-02 16:24:04 -05:00
Martin Konecny 25df87d2e5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:09:39 -05:00
Martin Konecny d6eb043899 CC-4765: Webstream of AAC type can't be previewed 
-fixed
 2013-01-02 16:09:32 -05:00
denise 3f7a1189f4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:08:58 -05:00
denise 44ab27ad7d CC-4773: L10N: Some strings is not listed in airtime.po 
-added missing file extension error message to plupload language files
 2013-01-02 16:08:38 -05:00
denise 05eee37f20 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:04:37 -05:00
denise 88f2f1e4a7 CC-4773: L10N: Some strings is not listed in airtime.po 
-fixed
 2013-01-02 16:04:19 -05:00
cliff.wang cdb3ec468a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 12:15:05 -05:00
cliff.wang 306282521a Add Chinese pulp upload translation file 2013-01-02 12:14:22 -05:00
denise a725148832 CC-4775: Add option for Italian language in preferences 
-done
 2013-01-02 12:10:16 -05:00
denise 93ea912d54 CC-4774: Add option for Chinese in preferences 
-done
 2013-01-02 11:50:10 -05:00
James f26778ee72 CC-4757: Duplicate playlist 
- done
- we still need a icon for context menu
 2012-12-28 16:17:58 -05:00
james cf38e2c596 CC-4754: Replay gain modifier 
- done
 2012-12-27 22:58:41 -05:00
james c0665e4748 CC-4754: Replay gain modifier 
- Initial commit
 2012-12-27 00:36:11 -05:00
denise a4008aaef3 CC-4721: Library -> Context Menu -> 'Add to smart block' option only takes affect once the open smart block has been saved 2012-12-19 15:01:53 -05:00
denise 854537f387 CC-4745: Add Russian language option to preferences 2012-12-17 14:33:14 -05:00
denise bd18039785 CC-4744: Edit user form needs styling 
-done
 2012-12-17 14:12:27 -05:00
denise 8b76bd0373 CC-2258: Describe rights for each user type on the user page 
Modified user rights descriptions
 2012-12-13 15:29:29 -05:00
denise 8125337c4a Changed the opacity of user rights tipsy tooltip 2012-12-13 12:58:26 -05:00
denise 076a1c56cb CC-2258: Describe rights for each user type on the user page 2012-12-13 12:29:02 -05:00
denise 854eccfb76 CC-4736: Let non-admin users update their user info 
Adding jquery tipsy plugin
 2012-12-11 11:30:59 -05:00
denise dd5882984e CC-4736: Let non-admin users update their user info 
-done but needs design
 2012-12-10 16:55:44 -05:00
Febiansyah Hidayat 5e9d5bd71a Update airtime_mvc/public/js/airtime/preferences/streamsetting.js 
Update statement to remove "disabled" attribute to be compatible with chrome and firefox browser.

Perform commit in devel branc as requested in: https://github.com/sourcefabric/Airtime/pull/21#issuecomment-11144375
 2012-12-08 09:25:19 +09:00
James efa5f6ff6c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-12-05 13:29:48 -05:00
James e1e8160e53 CC-4737: Listener stats should take up the full screen 
- fixed
 2012-12-05 13:29:29 -05:00
denise 402950211a CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-removed redundant 'Ok' button
 2012-12-05 13:23:58 -05:00
denise adb966a734 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-cancel button does not reload the page anymore
 2012-12-05 13:21:18 -05:00
denise 062740ef81 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-done
 2012-12-05 13:16:25 -05:00
Martin Konecny b1985e2bdf SAAS-290: Hosted SaaS widgets + javascript code generation 
-fix code box not automatically expanding on page refresh
 2012-12-04 17:42:28 -05:00
denise 1846f17bbc CC-4731: Cannot save support feedback settings 2012-12-04 16:21:45 -05:00
denise e69bd74d6e -adding german translation files for datatables and plupload plugins 2012-12-04 12:14:35 -05:00
denise 7c046bd0cc -adding spanish translation file for plupload plugin 2012-12-04 12:14:01 -05:00
denise a10f8276db -added spanish .po, and.mo files 
-added spanish translation files for datatables and plupload
 2012-12-04 12:08:23 -05:00
denise 4515ac2aef - added french .po file 
- added french translations for datatables and plupload plugins
 2012-12-03 18:15:08 -05:00
denise 89e0458500 CC-4728: Support Feedback save action does not use ajax 
-done
 2012-12-03 17:15:47 -05:00
denise b2699fa914 merge from devel 2012-12-03 11:06:56 -05:00
denise 260c6aea59 Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 2012-11-29 10:50:01 -05:00
denise 7a4e871495 Merge branch 'devel' into cc-1960-internationalize-airtime 2012-11-29 10:47:17 -05:00
James 4ad9e28e14 CC-1960: Internationalize Airtime / Support translations 
- korean lang pack
 2012-11-29 10:31:13 -05:00
denise 542434d9f0 CC-1960: Internationalize Airtime / Support translations 
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
 2012-11-28 16:16:39 -05:00
Martin Konecny 4983721565 Merge branch '2.2.x' into 2.2.x-saas 
Conflicts:
	airtime_mvc/application/forms/LiveStreamingPreferences.php
 2012-11-28 16:10:33 -05:00
denise 9689c75bed CC-1960: Internationalize Airtime / Support translations 
-added i18n to serverbrowser.js
-fixed small typo in SmartBlockCriteria.php
 2012-11-28 11:54:22 -05:00
denise 22bfc45497 CC-1960: Internationalize Airtime / Support translations 
-defined translations for show builder datatable
 2012-11-27 15:51:50 -05:00
denise 0a642fc717 CC-1960: Internationalize Airtime / Support translations 2012-11-27 12:23:16 -05:00
denise d2ed927e65 CC-1960: Internationalize Airtime / Support translations 
-playout history datatable was missing translation table
 2012-11-27 12:17:59 -05:00
denise b9b387fcd0 CC-1960: Internationalize Airtime / Support translations 
-fixed typos
 2012-11-27 11:59:55 -05:00
denise ddb6289c87 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-23 16:54:39 -05:00
denise 04f6ae5c1a CC-4607: Library: Please make the 'Add x items' following mouse's point 
-fixed
 2012-11-23 16:53:51 -05:00
denise b677130a3f CC-1960Internationalize Airtime / Support translations 
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
 2012-11-23 16:39:41 -05:00
denise c6a5db4a78 CC-1960: Internationalize Airtime / Support translations 
-dashboard was missing a translation - fixed
 2012-11-23 10:48:44 -05:00
denise dd0e71efcc CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
 2012-11-22 17:32:24 -05:00
James da6013b523 CC-4717: Lintian warnings from devel branch 
- fixed
 2012-11-22 15:14:55 -05:00
denise 96b87d23e0 CC-1960: Internationalize Airtime / Support translations 
-added i18n for plupload
 2012-11-22 14:37:54 -05:00
James acf2ffc9d5 CC-4707: Webstream: Preview for Webstream in Scheduler is forbidden 
- fixed
 2012-11-22 11:18:42 -05:00
Daniel James a819b20f55 Moved Flot license information into LICENSE_3RD_PARTY and debian/copyright files 2012-11-22 15:37:08 +00:00
denise 10b6dd202e Merge branch 'devel' into cc-1960-internationalize-airtime 
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
 2012-11-21 11:44:40 -05:00
James 4242fecd34 CC-4615: Now Playing page: Fail to get soundcloud file id in Schedule 
- fixed
 2012-11-20 18:03:13 -05:00
denise 10cd31fa56 CC-1960: Internationalize Airtime / Support translations 
- channged all js strings with embedded variables to use sprintf
 2012-11-20 17:42:26 -05:00
denise 06c3dcb69e CC-1960: Internationalize Airtime / Support translations 
-added jquery.i18n library
 2012-11-20 16:43:42 -05:00
denise e9b9f63630 CC-1960: Internationalize Airtime / Support translations 
-added english translation file for datatables
 2012-11-20 16:42:06 -05:00
denise f40d1f8dd4 CC-1960: Internationalize Airtime / Support translations 
-enabled i18n for datatables, colVis, columnFilter, and fullCalendar
-fixed typos in full-calendar-functions.js
 2012-11-20 16:40:02 -05:00
James d69faef560 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 15:05:20 -05:00
James 4737232b21 CC-2401: Shuffle option in playlists 
- add delayed removing of success message
 2012-11-20 15:05:09 -05:00
denise 57fdab0ddf CC-1960: Internationalize Airtime / Support translations 
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
 2012-11-20 11:33:37 -05:00
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
Martin Konecny d1a22fe7ca CC-4677: Improve Smart block repeat description 
-fixed
 2012-11-15 11:30:56 -05:00
James 2b2a1db055 CC-2401: Shuffle option in playlists 
- done
 2012-11-13 17:32:10 -05:00
denise 0a0cf70046 CC-4687: System -> Stream: Cannot expand/shrink Stream 1/2/3 settings after clicking Save 
-fixed
 2012-11-12 12:06:22 -05:00
denise ef8f8dfa75 CC-4688: System -> Preferences: Please expand the Soundcloud settings if warning for wrong settings exists 
-fixed
 2012-11-12 11:45:26 -05:00
Martin Konecny ed7aba83bf Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas 2012-11-07 17:22:36 -05:00
James 7300b608cf Merge branch 'cc-4661-listener-statistics' into devel 
Conflicts:
	python_apps/api_clients/api_client.py
 2012-11-07 17:20:12 -05:00
James 9112a8d0b1 CC-4661: Listener Statistics 
- enhancement on flot
- data point reduction
 2012-11-07 16:26:31 -05:00
Martin Konecny 4b09b289ce SAAS-290: Hosted SaaS widgets + javascript code generation 
Slight improvements to description as well as element
positioning
 2012-11-07 15:44:22 -05:00
Martin Konecny 1b0b124247 SAAS-290: Hosted SaaS widgets + javascript code generation 
-working code
 2012-11-07 12:49:17 -05:00
denise ccd6447696 - install failed due to wrong metadata key 
- wrong controller action called
 2012-11-07 12:05:20 -05:00
denise b817684972 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
 2012-11-07 11:21:36 -05:00
denise bf4f5fd699 CC-4607: Library: Please make the 'Add x items' following mouse's point 
-fixed
 2012-11-06 16:34:06 -05:00
James 9712e64a69 CC-4661: Listener Statistics 
- bug fix and removing unnecessary code
 2012-11-06 14:52:35 -05:00
denise a1a7396ec9 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks 
-disabled this button in the library toolbar if dynamic blocks are open
 2012-11-06 14:29:26 -05:00
James 2e79e8421c CC-4661: Listener Statistics 
- better legend for multiple series of data
- consistant number of ticks on x-axis
 2012-11-06 10:54:52 -05:00
denise 78e731f717 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-05 12:03:59 -05:00
denise 8fda0ba610 CC-4625: On tablet you cannot create a playlist, smart block or webstream 
-attempt #2
 2012-11-05 12:03:46 -05:00
denise c051e0671d CC-4625: On tablet you cannot create a playlist, smart block or webstream 
-attempt #2
 2012-11-05 12:00:37 -05:00
Martin Konecny d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
denise a201d6f2da CC-4666: Showbuilder page is dead 
-fixed. result of a bad merge
 2012-11-05 11:15:26 -05:00
James 74fe958cad CC-4661: Listener Statistics 
- changes for different mount names
 2012-11-02 18:25:08 -04:00
James 3af3cd5870 CC-4661: Listener Statistics 
- frontend part
 2012-11-02 17:00:38 -04:00
denise 2854dd40e0 CC-4663: Smart Blocks -> Deleting a track in smart block from library gives error 
-fixed
-tracks with undefined mime type were not handled properly
 2012-11-02 16:54:49 -04:00
denise 135aadf16b Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 12:28:21 -04:00
denise 715a21acb2 CC-4625: On tablet you cannot create a playlist, smart block or webstream 
-upgraded bootstrap-dropdown.js to v2.2.1
 2012-11-02 11:59:36 -04:00
denise a937df30ad Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-02 10:48:16 -04:00
denise cc208da2fb CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference 
-added labels
 2012-11-02 10:48:08 -04:00
James 575400b4c2 CC-4623: Library: Preview button for Flac does not work 
- fixed
 2012-11-01 16:44:37 -04:00
James d7a5ab4d94 CC-4622: Library: AAC file can be preview but is blocked from playlist and content menu 
- fixed
 2012-11-01 15:21:56 -04:00
denise dfd52eedf1 CC-4654: Library -> Simple search still has effects even if you are doing an advanced search 
-fixed
 2012-10-31 15:24:50 -04:00
james 2e4d5ec142 CC-4539: Advanced search: Sample rate searched on Hz, but search results 
shown in kHz

- fixed
 2012-10-31 12:32:40 -04:00
James 9d495ebc03 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit. 
- done
 2012-10-30 17:57:58 -04:00
denise 00947f9d7e CC-4640: Automatically jump to current song when loading the Now Playing page. 
-small fix
 2012-10-30 15:34:38 -04:00
denise cabe583a3b CC-4649: Library -> Disable simple search if advanced search fields are open 
-done
 2012-10-30 15:01:46 -04:00
denise 695c0fa926 CC-4607: Library: Please make the 'Add x items' following mouse's point 
-fixed
 2012-10-30 11:45:53 -04:00
denise b08f5091b5 CC-4609: Calendar -> Add/Remove contents: Please remove useless buttons: 'Jump to current playing song' and 'Cancel current show' 
-done
 2012-10-30 11:18:11 -04:00
denise d97afabaea CC-4640: Automatically jump to current song when loading the Now Playing page. 
-added check to see if a show is currently playing
 2012-10-29 15:40:58 -04:00
denise 332f9993c0 CC-4640: Automatically jump to current song when loading the Now Playing page. 
-done
 2012-10-29 15:20:16 -04:00
denise fdd889d7a8 - fixed formatting 2012-10-29 12:09:11 -04:00
Rudi Grinberg dc00528cd5 Merged baseUrl related conflicts 2012-10-29 11:56:20 -04:00
denise 3a7700eaac CC-4583: Use AJAX calls instead of refreshing entire page 
-done
 2012-10-26 18:09:30 -04:00
James e667a721ad - comment for some code 2012-10-26 16:26:48 -04:00
James 1ee228558a CC-4574: Audio preview fails with certain characters in metadata 
- fixed
 2012-10-26 16:24:17 -04:00
denise c51fb8a040 CC-4549: Tooltip for source username cannot be shared between input and output settings 
-fixed
 2012-10-22 16:37:06 -04:00
denise f30d636b17 CC-4581: Confirmation dialog for removing an item from a show refers to deletion 2012-10-19 16:19:32 -04:00
denise 7d8079f770 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
 2012-10-19 12:50:36 -04:00
Martin Konecny f5051cff3a CC-4605: Some AJAX calls are cached 
-fixed
 2012-10-19 11:22:44 -04:00
Martin Konecny d5c2c37a3e Revert "CC-4605: Some AJAX calls are cached" 
This reverts commit ffca5b42a8.
 2012-10-19 11:16:42 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
Martin Konecny ffca5b42a8 CC-4605: Some AJAX calls are cached 2012-10-19 11:07:37 -04:00
denise e9815b617b - added comment 2012-10-18 15:21:38 -04:00
denise 67ac4340c4 CC-4596: Too many ajax calls in Calendar page 
-fixed
 2012-10-18 14:47:19 -04:00
Daniel James 7c799cd3af Fixed formatting of tooltip for smart blocks 2012-10-18 13:01:55 +01:00
James 96da822bc7 CC-4574: Audio preview fails with Zend errors on file with question mark in the title 
- fixed
 2012-10-16 14:38:24 -04:00
James 67ca0db4c8 CC-4542: Playlists containing dynamic smart blocks cannot be previewed 
- fixed
 2012-10-16 14:09:34 -04:00
James 7796b23a58 CC-4506: Audio Preview in Playlist doesn't work 
- fixed
 2012-10-16 12:06:47 -04:00
James 03b32ea986 CC-4563 
Library: Exception is found when remove a block by context menu

- fixed
 2012-10-16 10:37:42 -04:00
Daniel James a103c76378 CC-4558: Make button in Now Playing consistent with same action in Calendar 2012-10-15 12:27:16 +01:00
denise 5f35336fd0 CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values: 
-fixed
 2012-10-11 11:49:04 -04:00
Daniel James 395d25158f CC-4545: Fix tooltip for Auto Switch On feature 2012-10-10 16:26:32 +01:00
denise c9ac675a10 CC-4529: Playlist Builder: The panel of 'Adding n items' will be bigger than usual if there is a item in Playlist has expanded cue in/out setting 
-fixed
 2012-10-09 14:39:29 -04:00
Daniel James b4fee4321c CC-4537: Bit rate hint should be in kbps to match actual search 2012-10-09 16:46:51 +01:00
denise 0d35056cd4 CC-4486: Library -> Advanced Search: Alignment is off sometimes 
-added placeholders to input tags for format examples
 2012-10-04 12:16:57 -04:00
denise eadde1c498 CC-4519: Advanced Search Option: Please use text search instead of scope search from Mime's type 
-fixed
 2012-10-03 11:29:16 -04:00
denise 3dd7e9767b CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes 
-validation was missing for Encoded By filter
 2012-10-02 13:57:36 -04:00
Martin Konecny 9df90414fc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 17:22:13 -04:00
Martin Konecny 5a8510b909 remove gap on right side of show builder: part 3 2012-09-19 17:22:04 -04:00
denise e926b62915 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 17:00:15 -04:00
denise f909ab9da2 CC-4490: Calendar: Empty show icon should have a tooltip 
-done
 2012-09-19 16:59:45 -04:00
Martin Konecny 40c122fafa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 16:56:04 -04:00
Martin Konecny 84ed03ffac remove gap on right side of show builder: part 2 2012-09-19 16:55:44 -04:00
denise f2e495cbd8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 16:40:05 -04:00
denise 2afc4183bb CC-4496: Library -> Contents-feed does not work if advanced search data is invalid 
-fixed
 2012-09-19 16:39:56 -04:00
Martin Konecny a3b53ee3d3 remove gap on right side of show builder 2012-09-19 16:19:02 -04:00
denise b4277f1f17 CC-4495: Library -> Advanced Search: Some fields with ranges do not get validated 
-fixed
 2012-09-19 15:46:03 -04:00
denise 4b2d6caf0e CC-4485: Library -> Advanced Search -> Tooltip needed for invalid input 
-done
 2012-09-19 15:35:45 -04:00
Martin Konecny f717efd7fb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 13:23:14 -04:00
Martin Konecny ca0fb969b7 fix jplayer errors for mp3 and firefox (flash) 2012-09-19 13:23:06 -04:00
denise 81620d4f94 CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes 
-fixed
 2012-09-19 12:41:54 -04:00
denise dc95ab1d00 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents 
-changed null values to empty strings
 2012-09-19 11:05:17 -04:00
Martin Konecny ddc0e8d2ba remove console.log from javascript library :/ 2012-09-19 11:04:01 -04:00
denise 281e7d1092 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-19 10:49:52 -04:00
denise 0c823af660 CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents 
-done
 2012-09-19 10:49:17 -04:00
Martin Konecny 7036036a86 CC-4476: Make all green notification boxes fade out after 5 seconds 
-fixed
 2012-09-18 21:29:02 -04:00
denise 5003e86eac - changed smart block qtip text 2012-09-18 17:37:38 -04:00
denise f9778f2da4 -removed windows CRLF 2012-09-18 17:26:34 -04:00
denise 1d699fe0b8 CC-4479: Buttons in dialog windows are not styled 
-done
 2012-09-18 17:22:24 -04:00
denise b77429164b CC-4465: Calendar: Remove warning icon on empty shows if show is in the past 
-removed setInterval function
 2012-09-18 16:55:46 -04:00
denise 54ab58a9c7 CC-4465: Calendar: Remove warning icon on empty shows if show is in the past 
-removed (commented out) code for this ticket
-postponing for now
 2012-09-18 16:49:45 -04:00
denise 8cae11d588 CC-4478: Library: audio preview check should be skipped if file does not exist 
-fixed
 2012-09-18 15:52:11 -04:00
denise 09b117999e CC-4475: Register form button doesn't have any styling 
-fixed
 2012-09-18 15:28:38 -04:00
denise e676cf856f -remove console.log 2012-09-18 15:16:54 -04:00
denise 0386f8a9cb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-18 15:14:57 -04:00
denise 7bbd10556b CC-4465: Calendar: Remove warning icon on empty shows if show is in the past 
-done
 2012-09-18 15:14:46 -04:00
James 98f0692b8d CC-4457: Media Library: The background of 'Adding items' is minimize to a point 
- fixed
 2012-09-18 14:40:18 -04:00
denise e00ff6367d CC-4458: Now Playing -> "+ Add to current playlist text" might be replaced by something more appropriate 
-fixed
 2012-09-18 11:22:37 -04:00
denise 9c721f202f -small UI improvement 2012-09-18 11:05:13 -04:00
denise 1698aae251 CC-4466: Buttons on Now Playing page are clickable even though they are disabled 
-fixed
 2012-09-18 10:53:19 -04:00
Naomi Aro bb3ffce071 CC-3944 : Now Playing -> Time Line view: Cannot cancel record show, cancel button is disabled 2012-09-17 16:28:28 -07:00
denise 9b39ff93b4 -removed console.log 2012-09-17 15:49:22 -04:00
denise 43c336eb6d CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents 
-implemented css changes
-formatted playlist_builder.css
 2012-09-17 15:41:22 -04:00
James 5d60a599a6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 12:42:11 -04:00
James 5e514b3b60 -UI alignment of input text element 2012-09-17 12:41:58 -04:00
denise f840a9b24a CC-4451: (Firefox) Now Playing -> Can't cancel Current Show 
-fixed
 2012-09-17 12:30:43 -04:00
denise f02bf04a25 CC-4449: (Firefox) Now Playing -> Cancel currently playing track does not work 
-fixed
 2012-09-17 12:27:17 -04:00
denise b8b3bfb495 CC-4450: Now Playing -> Can't remove overbooked tracks 
-fixed
 2012-09-17 12:23:49 -04:00
denise e30d3b770c -removed unused code 2012-09-17 12:19:02 -04:00
denise 3c3b39796d CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled 
-fixed
 2012-09-17 12:10:23 -04:00
Rudi Grinberg 990bcebfe8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 11:58:18 -04:00
Rudi Grinberg b913b067c2 Added setColumnFilter(oTable) 2012-09-17 11:58:08 -04:00
denise 99969ff19d CC-4445: Timeline: 'Select' dropdown menu should be disabled if the button is disabled 
-fixed
 2012-09-17 11:58:05 -04:00
James b3420984e2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-17 11:27:52 -04:00
James 396b529162 - UI interation of advanced search 2012-09-17 11:23:38 -04:00
Rudi Grinberg fab7042ce6 cc-4419: Added quick hack for now -- actual fix 2012-09-17 11:18:18 -04:00
Rudi Grinberg d4443da626 Removed debugging statement 2012-09-17 11:12:52 -04:00
Rudi Grinberg 6118cd63d7 cc-4419: Added quick hack for now 2012-09-17 10:52:37 -04:00
Rudi Grinberg 1c2cebf5a8 Removed comment 2012-09-17 10:27:12 -04:00
Rudi Grinberg f809a17c02 Formatting 2012-09-14 19:05:30 -04:00
denise 84deda99c5 CC-4440: System -> Streams: Update and Save 'Stream 1/2/3' will make it invisible 
-fixed
 2012-09-14 17:35:14 -04:00
Martin Konecny 39903be69a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:51:48 -04:00
Martin Konecny 3ced92db7a CC-4415: Smart Block audio preview doesn't work 2012-09-14 16:51:14 -04:00
denise 8ffaaaef25 -skip playable test if item is a smart block 2012-09-14 16:38:26 -04:00
denise 0524e4e5d2 -implemented UI changes for playlist/block/webstream builder 2012-09-14 15:49:39 -04:00
denise c7f4ede766 -implemented UI changes for library page 2012-09-14 12:08:51 -04:00
denise f581b0536e -fixed formatting 2012-09-14 11:18:13 -04:00
denise bb38512bae -fixed formatting 2012-09-14 10:52:50 -04:00
denise 97a0a82dc3 -renamed AIRTIME_DEV_README to AIRTIME_DEV_README_COLUMN_FILTER 
-added new diff file for dataTables.ColVis.js
 2012-09-13 17:19:08 -04:00
denise c35c76351b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 17:11:10 -04:00
denise 8f48544bb7 -implemented UI changes for Now Playing page 2012-09-13 17:10:38 -04:00
James d93fcec490 CC-4424: Clicking "edit" on playlist allows you to preview tracks that should be disabled 
- fixed
 2012-09-13 17:09:10 -04:00
Martin Konecny 14db5053b1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 14:56:10 -04:00
Martin Konecny b04afaec2c CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
-detect flash fallback
 2012-09-13 14:55:17 -04:00
James b2d61f2402 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 14:22:27 -04:00
James 2293fcda01 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
- fixed
 2012-09-13 14:22:13 -04:00
Martin Konecny 4fd9993108 CC-1710FLAC, BWF, AAC support 
-Enable browser preview for new filetypes
 2012-09-13 12:30:26 -04:00
Martin Konecny 09d587e262 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
-better file type detection
 2012-09-13 12:28:10 -04:00
Martin Konecny e95933525b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 12:25:03 -04:00
Martin Konecny 983bbc5fc5 CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track 
-better file type detection
 2012-09-13 12:24:53 -04:00
Rudi Grinberg e2f8d8e0e7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:10:43 -04:00
James 5067a304d9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 10:49:33 -04:00
James b6b93618e6 CC-4353: Numeric search fields in Library would benefit from format labels 
- bug fix
 2012-09-13 10:49:24 -04:00
Rudi Grinberg 52882ef938 Added mp4 removed aac. 2012-09-13 10:35:13 -04:00
Martin Konecny 4998a63a6a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 17:34:32 -04:00
Martin Konecny 1c293839da CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track 
-disable preview icon
 2012-09-12 17:32:19 -04:00
denise 32b1ee95b7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 16:29:35 -04:00
denise 5ac6877e60 CC-4362: Smart Block: error for multiple criteria 
-fixed
 2012-09-12 16:29:26 -04:00
Martin Konecny 20f5fe6480 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Block.php
	airtime_mvc/public/css/styles.css
 2012-09-12 15:55:43 -04:00
Martin Konecny a418f5777c CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track 
-initial commit
 2012-09-12 15:43:50 -04:00
Vladimir 77824afdd3 Added Bootstrap CSS, images and JS for new buttons and dropdown menues 2012-09-12 21:23:25 +02:00
Rudi Grinberg d1b4ce3de6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 15:19:57 -04:00
denise 07ac651f71 - move title and creator to top of library column view 2012-09-12 15:09:07 -04:00
Rudi Grinberg 92532cb708 cc-4394: Added m4a 2012-09-12 14:54:11 -04:00
denise ceccb547c2 CC-4355: Smart block criteria do not match library columns or metadata editor 
-put library column filter in alphabetical order to match smart block criteria order
 2012-09-11 17:39:47 -04:00
denise f1b8ada1e6 - removed logging 2012-09-11 17:19:02 -04:00