Commit Graph

3963 Commits

Author SHA1 Message Date
Naomi 0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Naomi 2e03e1982f CC-2301 : changing more CRLF files 2013-04-29 18:11:11 -04:00
Naomi b2a490ac47 CC-2301 : working on creating a crossfade method for waveforms. 2013-04-29 18:09:12 -04:00
Naomi 58957cc919 CC-2301 : running dos2unix on 3 files. 2013-04-29 17:01:08 -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
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
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 5ac51e289d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-04-01 19:15:02 -04:00
Martin Konecny 6ae8da98e4 removing logging 2013-04-01 19:14:55 -04:00
Martin Konecny ee617c8a70 Merge branch '2.3.x' into devel
Conflicts:
	airtime_mvc/application/controllers/UserController.php
2013-03-26 16:34:11 -04:00
Martin Konecny d9646994e9 remove airtime-demo specific code 2013-03-26 16:33:14 -04:00
Martin Konecny 5dc0a4477b disable deletion of users 2013-03-26 16:10:42 -04:00
Martin Konecny 894887bd62 Merge branch '2.3.x' into devel 2013-03-26 15:02:17 -04:00
Martin Konecny 265ac49f2e remove duplicate cc_config 2013-03-24 23:11:55 -04:00
Martin Konecny b1160afeab cleanup 2013-03-22 18:05:49 -04:00
Martin Konecny d12f793578 remove potential password change exploit in airtime-demo 2013-03-22 18:05:34 -04:00
Martin Konecny 5ceeb88899 Merge branch '2.3.x' into devel 2013-03-06 13:46:01 -05:00
Martin Konecny 7ca178295f CC-4993: airtime-check-system reports airtime-liquidsoap as down
-fixed
2013-03-06 13:43:22 -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 cc69418215 Merge branch '2.3.x' into devel 2013-03-05 16:21:22 -05:00
Martin Konecny d7d1170ee1 CC-5003:
Some tracks are being cut off before fully playout out

-fixed
2013-03-04 18:52:51 -05:00
Martin Konecny 00d577fd5b CC-4985: Ensure files deleted via the UI are deleted from stor directory.
-temporary fix. We know rabbitmq received the message, but we don't know
if media-monitor actually acted on it.
2013-03-04 15:22:09 -05:00
Martin Konecny ae503121d8 CC-4984: Exception for replaygain
-fixed
2013-02-28 18:26:15 -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 e08732fba7 CC-4975: airtime-silan cmd error
-fixed
2013-02-25 19:45:26 -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 9113853e41 Removed logging messages from Library controller, index action 2013-02-19 11:51:26 -05:00
denise c0c6ac5d75 CC-4954: Please make Library page remember the status per user
- it was only working if there was a playlist object set
- fixed so it works even if there isnt
2013-02-19 11:37:22 -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
Naomi f2773fcb01 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-15 16:32:43 -05:00