Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,909 Commits 18 Branches 28 Tags 437 MiB
Commit Graph

1760 Commits

Author SHA1 Message Date
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 3769f5e5db IM-933 : datepicker switch/design 2013-08-28 14:54:44 -04:00
Naomi 05054fa823 IM-931 : Icon Overlap 2013-08-28 14:48:35 -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
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 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 3ea2b920a6 crlf 2013-08-19 23:20:26 -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
denise 6520211b4d Merge branch '2.4.x' of dev.sourcefabric.org:airtime into 2.4.x 2013-05-28 16:19:30 -04:00
denise 9545d8aacb Removed dropping and recreating cc_schedule table index before inserting into this table. 
We thought it would be a significant performance booster but it isn't
 2013-05-28 16:19:17 -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 7ec664823d Fixes whitespace to the left of 'Open Media Builder' button (CC-5166) 2013-05-22 10:23:42 +01: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
Martin Konecny 0da0e798c6 make password input width same as text input width. Also make everything a little wider. 2013-04-10 18:19:46 -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 943538ed9d Revert "CC-4980: Create graphic with 4 switches for Airtime Dashboard" 
This reverts commit baf693d1a9.
 2013-02-27 14:35:35 -05:00
Vladimir baf693d1a9 CC-4980: Create graphic with 4 switches for Airtime Dashboard 2013-02-27 17:36:43 +01: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