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 |
denise
|
846e940f82
|
Merge branch 'cc-4961-show-linking' of dev.sourcefabric.org:airtime into cc-4961-show-linking
Conflicts:
airtime_mvc/application/services/ScheduleService.php
airtime_mvc/application/services/ShowInstanceService.php
airtime_mvc/application/services/ShowService.php
|
2013-03-08 11:24:54 -05:00 |
denise
|
4a86da5f87
|
Created function to create repeating show instances
Created function to create rebroadcast show instances
|
2013-03-08 11:19:03 -05:00 |
Martin Konecny
|
3969e38d51
|
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
|
2013-03-07 18:34:10 -05:00 |
Martin Konecny
|
c2fb811100
|
CC-5012:
remove all shell=True commands for subprocess calls
-fixed
|
2013-03-07 18:33:55 -05:00 |
Daniel James
|
f7168a20d3
|
Add versioned dependency on Silan 0.3.1 for Airtime 2.4.x series [#CC-5006]
|
2013-03-07 14:43:18 +00:00 |
Daniel James
|
1758714098
|
Add versioned dependency on Silan 0.3.0 [#CC-5006]
|
2013-03-07 14:40:25 +00:00 |
Martin Konecny
|
fc261035a8
|
CC-4999: Do silan analysis quietly in the background
-set silan nice level to 19
|
2013-03-06 19:48:35 -05:00 |
Martin Konecny
|
3497a3730c
|
Merge branch '2.3.x' into devel
|
2013-03-06 18:24:48 -05:00 |
Martin Konecny
|
0321464ab8
|
CC-4999:
Do silan analysis quietly in the background
-fixed
|
2013-03-06 18:24:19 -05: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
|
8e314477c7
|
CC-5005: airtime-purge doesn't remove all files
-cleanup
|
2013-03-06 12:26:07 -05:00 |
Martin Konecny
|
2ba39bddf0
|
CC-5005: airtime-purge doesn't remove all files
|
2013-03-06 11:49:53 -05:00 |
denise
|
af622eb4b8
|
CC-4961: Show linking
Refactored some more show instance creation functions
|
2013-03-06 09:58:35 -05:00 |
denise
|
c29e11fa0f
|
Created empty showInstance service.
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
|
2013-03-06 09:58:35 -05:00 |
denise
|
d497cfa857
|
Created show service
|
2013-03-06 09:58:35 -05:00 |
denise
|
99c07272fd
|
- Moved all form validation to it's own function in schedule service
- Moved show creation to it's own function in schedule service
|
2013-03-06 09:58:35 -05:00 |
drigato
|
bdab294fce
|
Added comments to Schedule Service
|
2013-03-06 09:58:35 -05:00 |