denise
|
ab10ae68a2
|
CC-5036: Add back edit show instance functionality
|
2013-04-01 14:42:35 -04:00 |
|
denise
|
1eba09fc4c
|
Show linking
|
2013-03-28 16:19:05 -04:00 |
|
denise
|
d0691b114c
|
Show linking
|
2013-03-28 14:25:40 -04:00 |
|
denise
|
731b86b36c
|
Added back editing a repeating show instance feature
|
2013-03-27 16:25:39 -04:00 |
|
denise
|
e259639d1a
|
Removed scheduleController private variable, currentUser
Removed showService private variable, currentUser
|
2013-03-27 09:02:49 -04:00 |
Daniel James
|
254dbafd1b
|
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
|
2013-03-27 12:34:14 +00:00 |
|
Daniel James
|
3323029507
|
Prompt user to run airtime-install script with -d option for custom Apache setups
|
2013-03-27 12:33:47 +00: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 |
|
denise
|
418bf0b5ff
|
Created calendar service and moved the context menu creation there
|
2013-03-26 16:03:53 -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
|
5ab52b12c7
|
CC-4417:
Opus codec support
|
2013-03-26 15:00:41 -04:00 |
|
denise
|
230d1a6aa9
|
Fixed bug where shows weren't populating when moving forward in the calendar
|
2013-03-26 10:33:06 -04:00 |
|
denise
|
ef8f87df5d
|
Show linking
|
2013-03-25 16:28: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 |
|
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 |
|
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 |