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
|
811abc4baf
|
don't change monit monitor state on service start/stop
|
2013-04-01 19:31:13 -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
|
6b57462ca1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-03-26 15:02:30 -04:00 |
|
Martin Konecny
|
894887bd62
|
Merge branch '2.3.x' into devel
|
2013-03-26 15:02:17 -04:00 |
|
Martin Konecny
|
caa2413fd8
|
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
|
2013-03-26 15:02:08 -04:00 |
|
Martin Konecny
|
7237d48ef6
|
fix missing import
|
2013-03-26 15:01:53 -04:00 |
|
Martin Konecny
|
d79bfaaef9
|
-fix infinite loop on invalid files
|
2013-03-26 15:01:44 -04:00 |
|
Martin Konecny
|
7779cde824
|
Merge branch '2.3.x' into devel
|
2013-03-24 23:12:10 -04:00 |
|
Martin Konecny
|
265ac49f2e
|
remove duplicate cc_config
|
2013-03-24 23:11:55 -04:00 |
|
Martin Konecny
|
38f8a0d231
|
more robust handling if system permissions go wrong
|
2013-03-24 22:58:13 -04:00 |
|
Martin Konecny
|
1c49320d95
|
Merge branch '2.3.x' into devel
|
2013-03-24 22:26:01 -04:00 |
|
Martin Konecny
|
89983bd4f8
|
remove unnecessary file delete
|
2013-03-24 22:25:38 -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
|
a5c8b7624e
|
CC-1469: Crossfading support (non-equal power)
-handle file attributes changing (end time, replaygain etc.)
|
2013-03-22 15:56:05 -04:00 |
|
Martin Konecny
|
7a6940c96c
|
Merge branch 'cc-1469-crossfade' into devel
Conflicts:
python_apps/pypo/pypopush.py
|
2013-03-22 15:24:14 -04:00 |
|
Martin Konecny
|
8a5c82d71a
|
CC-1469: Crossfading support (non-equal power)
-fix few bugs
|
2013-03-22 15:21:28 -04:00 |
|
Martin Konecny
|
2fc1612460
|
Merge branch '2.3.x' into devel
|
2013-03-22 14:24:37 -04:00 |
|
Martin Konecny
|
fc6742869f
|
better frozen liquidsoap handling
|
2013-03-22 14:23:42 -04:00 |
|
Martin Konecny
|
e0583a8b6e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
debian/changelog
|
2013-03-22 14:06:16 -04:00 |
|
Martin Konecny
|
6d1025507a
|
Merge branch '2.3.x' into devel
|
2013-03-22 14:05:08 -04:00 |
|
Martin Konecny
|
19753429dc
|
add wait timer before liquidsoap is shutdown
|
2013-03-22 14:04:50 -04:00 |
|
Martin Konecny
|
33ca2e7c9c
|
CC-1469: Crossfading support (non-equal power)
-refactor
|
2013-03-22 12:16:17 -04:00 |
|
Martin Konecny
|
ffe06ea2a0
|
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
|
2013-03-19 15:23:02 -04:00 |
|
Martin Konecny
|
708d36ba9c
|
syntax error
|
2013-03-19 15:22:27 -04:00 |
|
Daniel James
|
c33b0cb980
|
Don't run the airtime-install script if Apache has not been configured [#CC-5020]
|
2013-03-19 17:45:09 +00:00 |
|
Daniel James
|
abb2d9d93f
|
Don't run the airtime-install script if Apache has not been configured [#CC-5020]
|
2013-03-19 17:40:42 +00:00 |
|
Martin Konecny
|
65b4d4ee57
|
2.3.1 release prep
|
2013-03-19 12:57:09 -04:00 |
|
Martin Konecny
|
6dae7d3973
|
CC-1469: Crossfading support (non-equal power)
-cleanup
|
2013-03-15 17:00:36 -04:00 |
|
Martin Konecny
|
445573dcdb
|
CC-1469: Crossfading support (non-equal power)
-webstreams scheduled in the future are now working...
|
2013-03-15 15:07:55 -04:00 |
|
Martin Konecny
|
dd7fc61e23
|
CC-1469: Crossfading support (non-equal power)
-further implementation..
|
2013-03-15 12:50:23 -04:00 |
|
Martin Konecny
|
2b7ebafa94
|
CC-1469: Crossfading support (non-equal power)
-further implementation..
|
2013-03-14 18:29:52 -04:00 |
|
Martin Konecny
|
91d1243554
|
CC-1469:
Crossfading support (non-equal power)
-initial commit
|
2013-03-14 16:50:55 -04:00 |
|
Martin Konecny
|
5bc49341a1
|
CC-5023: Miss base_dir in GetServerType() will cause Web Server Type is "A"
-fixed
|
2013-03-12 17:01:31 -04:00 |
|
Martin Konecny
|
c563aaf608
|
CC-5023:
Miss base_dir in GetServerType() will cause Web Server Type is "A"
-fixed
|
2013-03-12 17:00:52 -04:00 |
|
Martin Konecny
|
661a407f72
|
CC-5016: Allow user control for webstream metadata format
-fixed
|
2013-03-08 16:45:19 -05:00 |
|
Martin Konecny
|
fe96b66fd7
|
CC-5016:
Allow user control for webstream metadata format
-fixed
|
2013-03-08 16:00:16 -05:00 |
|
Martin Konecny
|
0075b27947
|
CC-5015: Allow for cue_out points to be Null in DB
-prep for 2.4
|
2013-03-08 14:57:20 -05:00 |
|
Martin Konecny
|
e68e6d9160
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
debian/control
|
2013-03-08 12:40:31 -05:00 |
|