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 |
|
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 |
|
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 |
|
denise
|
187e49e4b2
|
CC-4961: Show linking
Added back-end functionality for creating monthly repeating shows on
the same day of the week
|
2013-03-22 14:57:02 -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 |
|
denise
|
6766d208aa
|
CC-4961: Show linking
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
|
2013-03-21 16:31:05 -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
|
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 |
|
denise
|
bae9f1202a
|
CC-4961: Show linking
Removed unused schedule controller actions
Fix bug where changing a show to repeat deletes the original show's content
|
2013-03-19 10:09:28 -04:00 |
|
denise
|
4bdd89f747
|
CC-4961: Show linking
Fixed edit show start/end time bug
|
2013-03-18 12:34:27 -04:00 |
|
Martin Konecny
|
6dae7d3973
|
CC-1469: Crossfading support (non-equal power)
-cleanup
|
2013-03-15 17:00:36 -04:00 |
|
denise
|
896e03d76b
|
CC-4961: Show linking
Refactoring all services thus far
|
2013-03-15 16:56:22 -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 |
|
denise
|
5735baf237
|
CC-4961: Show linking
Made progress on ShowInstanceService
|
2013-03-13 11:08:16 -04:00 |
|
denise
|
f9f4e4f1fb
|
CC-4961: Show linking
Made some progress on show editing
|
2013-03-12 18:01:12 -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 |
|
denise
|
438200425a
|
CC-4961: Show linking
|
2013-03-12 11:33:32 -04:00 |
|
denise
|
c721b81a13
|
CC-4961: Show linking
Refactoring
|
2013-03-12 10:30:31 -04:00 |
|
denise
|
7347be35b1
|
Created a new service for show days
Created a new user service
Started refactoring edit show action
|
2013-03-11 16:18:40 -04:00 |
|
denise
|
1cc823ef0e
|
Inital edit show reconfiguration changes
|
2013-03-08 17:10:35 -05:00 |
|
Martin Konecny
|
661a407f72
|
CC-5016: Allow user control for webstream metadata format
-fixed
|
2013-03-08 16:45:19 -05:00 |
|
denise
|
116d98a81b
|
Removed comment
|
2013-03-08 16:10:07 -05:00 |
|
denise
|
d8ced29dd0
|
Refactored adding show forms to the view
|
2013-03-08 16:08:43 -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 |
|
Martin Konecny
|
635dfd356d
|
Merge branch '2.3.x' into devel
|
2013-03-08 12:39:47 -05:00 |
|
Martin Konecny
|
30970598fe
|
minor fixes
-don't show print subprocess commands to py-interpreter.log
|
2013-03-08 12:39:29 -05:00 |
|
denise
|
8415dfdf6f
|
Add comments
|
2013-03-08 12:18:24 -05:00 |
|
denise
|
5111f74494
|
Created function to set the next populate until date for repeating shows
|
2013-03-08 12:17:55 -05:00 |
|
denise
|
9be6b82d97
|
Fixed rebroadcast date bug
|
2013-03-08 12:06:45 -05:00 |
|