Commit Graph

64 Commits

Author SHA1 Message Date
james ad3ef3ec30 CC-2255: Separate user types admin and program manager
- New user type 'Program Manager' added
- 'Program Manager' gets same previlage as Admin but doesn't
have access to Configure menu
- Changed user type name 'Host' to 'DJ'
2011-06-07 14:31:39 -04:00
Naomi Aro f46cdd3888 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-07 10:00:22 +02:00
martin 61d80b4710 Merge branch '1.8.2' into devel 2011-06-06 20:11:11 -04:00
james 4247f8c7a7 CC-2362:Recorded show wrong file name
- not finished yet. Temp commit
2011-06-06 14:10:12 -04:00
Naomi Aro c8219e3b97 Merge branch 'cc-2326-edit-show-end-date-problems' into 1.8.2 2011-06-06 20:06:24 +02:00
Naomi Aro 0f942d149d CC-2326 Edit a show (End Date problems)
not clearing options array.
2011-06-06 20:05:35 +02:00
Naomi Aro 02e259c0ea CC-2365 Shows from the past can be dragged into the future
adding a backend check if the show has started in the past.
2011-06-06 19:06:22 +02:00
martin 1de4777de3 cc-2362: upload to soundcloud with the wrong name after show rename.
-make sure to remove all rebroadcasts of recorded shows when editing.
2011-06-06 12:20:44 -04:00
martin ebf7dd0e0d Merge branch '1.8.2' of dev.sourcefabric.org:airtime into 1.8.2 2011-06-06 12:01:58 -04:00
martin d591858528 cc-2362: upload to soundcloud with the wrong name after show rename.
-changed so that recorded shows are not deleted by default
-changed static method to non-static.
2011-06-06 12:01:37 -04:00
Naomi c30eeaf5bd CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
searching database by filename to retrieve file.
Checking if is supported audio file/temp audio file.
2011-06-06 11:26:15 +02:00
Naomi 377f77dff4 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
naming convention in fallback order

stor/artist/album/track - title.ext
stor/artist/album/title.ext
stor/artist/album/originalfilename.ext
stor/artist/track - title.ext
stor/artist/title.ext
stor/artist/originalfilename.ext
stor/originalfilename.ext
2011-06-06 11:23:30 +02:00
Naomi Aro 1f045c8c7b CC-2356 Default genre when uploading to Soundcloud doesn't work
somehow variable names must have changed.
2011-06-04 15:45:08 +02:00
Naomi Aro 27075ad369 CC-2356 Default genre when uploading to Soundcloud doesn't work
function call changed incorrectly.
2011-06-04 15:45:08 +02:00
martin 1540e593e4 Merge branch '1.8.2' into devel
Conflicts:
	airtime_mvc/application/models/Dashboard.php
	python_apps/media-monitor/airtime-media-monitor-start
	python_apps/pypo/airtime-pypo-start
	python_apps/show-recorder/airtime-show-recorder-start
2011-06-03 17:29:55 -04:00
martin eee885f746 cc-2344: wrong song displayed
-removed unnecessary code.
2011-06-03 17:06:47 -04:00
martin e69f9497ed cc-2344: wrong song displayed
-fixed #2
2011-06-03 17:03:11 -04:00
martin c9c9ecf2cd cc-2344: wrong song displayed
-fixed
2011-06-03 16:36:13 -04:00
martin 19e52e81b5 cc-2351: updating a bi-weekly repeating show is incorrect
-fixed
2011-06-03 14:51:17 -04:00
martin e969baee1c cc-2359: record check box is disabled after update show
-fixed
2011-06-03 14:01:58 -04:00
martin 308efaeadc CC-2336: Some Show Editing Features Seem to have been lost
-fixed shows in the past being edited!
2011-06-02 15:56:54 -04:00
martin b747ce6fb0 cc-2344: wrong song displayed
-fixed
2011-06-02 12:45:57 -04:00
james 75ffe91325 CC-1919:Playlist builder show time offset
Fixed.

- I wasn't sure if I had to wait for html/css code from Vladmir.
I just did what I could do.
2011-05-31 16:49:01 -04:00
Naomi Aro f5e6082ee7 CC-2336 Some Show Editing Features Seem to have been lost 2011-05-30 18:41:31 -04:00
Naomi Aro 1bca5208e7 CC-2336 Some Show Editing Features Seem to have been lost 2011-05-30 18:41:31 -04:00
Naomi Aro f7de484461 CC-2336 Some Show Editing Features Seem to have been lost
recovered everything that original worked I think will keep looking,
still problems with editing a show which has already started.
2011-05-30 18:41:31 -04:00
Naomi 03fae770e5 CC-2326 Edit a show (End Date problems) 2011-05-26 17:00:21 -04:00
Naomi 81ee30105d CC-2326 Can't edit a show more than once (End Date problems)
keep adding the 1 day interval here
2011-05-26 16:27:50 -04:00
Naomi 8d59c18bef CC-2326 Can't edit a show more than once (End Date problems)
show editing assumed inclusive end dates while show creating assumed non inclusive.
2011-05-26 15:41:47 -04:00
Naomi 765897600d CC-2318 Edit Metadata of Live shows doesn't work
form is not taking care that a track number should be an integer,
default empty string cannot be set for integer, rejected by database.
2011-05-26 11:11:12 -04:00
Martin Konecny 6a181a4e9a CC-2323: Next song in the top panel not showing
-fixed
2011-05-25 14:35:31 -04:00
Naomi 2866bf46cd CC-2282 Import script does not restore storage from backup if database is intact
making spaces after ifs to follow coding standards.
2011-05-24 20:48:01 -04:00
Naomi 71ac8d4b1b CC-2282 Import script does not restore storage from backup if database is intact
not considering a duplicate to exist just because there's a row in the database, checking if its file exists on the system as well.
2011-05-24 20:48:01 -04:00
Naomi b84854c13c CC-2271 1.8.2 code cleanup tasks
changing 1.8.1 upgrade script to using raw source first.
2011-05-19 09:59:13 -04:00
martin d6616004a6 CC-2283: Now playing bar only shows the first word of the show name
-fixed
2011-05-18 18:37:13 -04:00
martin 3416ba20d9 cc-2263: unable to cancel recording show
-made cancelled recorded shows still upload.
2011-05-18 14:33:42 -04:00
Naomi d4a4c4be2a CC-1939 Ability to edit name & description of a playlist, display the description somewhere
now can edit title/description of a playlist without leaving the main playlist builder screen
2011-05-18 14:33:41 -04:00
martin b87e661f96 Merge branch 'devel' of dev.sourcefabric.org:airtime 2011-05-16 11:45:23 -04:00
naomiaro a3d7c5e70b CC-1799 : Live Studio Playout from media library (pytagsfs)
metadata almost working from airtime form -> python daemon. Just need to look into permissions for some stor folders.
2011-05-13 13:25:55 -04:00
Naomi 5be039d349 CC-1799 : Live Studio Playout from media library (pytagsfs)
if a tag is edited by easytag, the change is now reflected in airtime database.
2011-05-13 13:25:55 -04:00
martin bc640d38f2 cc-2167-top-panel-doesn't-list-recording-shows 2011-05-10 19:06:35 -04:00
mkonecny 359c4a4eb8 cc-2126: user shouldnt be able to delete himself
-changed it so that the "x" is still visible, but when clicking,
an error message shows. Did this because the columns were resizing
when the x wasnt visible. Also the empty column looked weird with only
one user.
2011-05-05 23:42:14 -04:00
James Moon 2a5df8bed9 CC-2126: User should not be delete himself
Done.
2011-05-05 23:42:14 -04:00
mkonecny 9638f6dd3e cc-2167: now playing view with recording shows a gap
-implemented
2011-05-05 16:45:13 -04:00
mkonecny 1337efcdcd cc-2229-refactor-now-playing-code
-bug fix with red gap bar showing even when there was no gap
2011-05-05 15:00:42 -04:00
mkonecny 038f2e1c69 cc-2229-refactor-now-playing-code
-bug fixes
2011-05-05 14:55:45 -04:00
mkonecny 7010f2156e cc-2229-refactor-now-playing-code
-further refactoring...
2011-05-05 14:08:52 -04:00
mkonecny 48ed126703 CC-2229-refactor-now-playing-code
-server side done.
2011-05-05 13:24:21 -04:00
mkonecny 1492dcf283 cc-2229-refactor-now-playing-code
-initial check-in
2011-05-05 00:28:34 -04:00
martin 8e2019a935 cc-2182: Convert back to restful design
-done
2011-05-02 16:33:37 -04:00