Commit Graph

76 Commits

Author SHA1 Message Date
martin a48f467de7 cc-2263: unable to cancel recording show.
-almost final check-in. Everything looks good right now...
2011-05-18 14:33:41 -04:00
martin 167a55591b -top panel js regression fix. (Error when recording show
finished)
2011-05-17 14:55:37 -04:00
martin 1d8f323a27 cc-2235: help says right-click to add playlist to show
-fixed
-also renamed "Add Audio" to "Add Media"
2011-05-17 13:55:51 -04:00
Naomi 3f43c39f41 CC-2256 Airtime-upgrade.php does not upgrade the web app
changing to version 1.8.2
2011-05-17 11:33:22 -04:00
martin 91caaf2c0f Merge branch 'cc-2126-user-should-not-be-able-delete-himself' into devel 2011-05-16 22:52:20 -04:00
martin a937dcb5ac -cc-2126: user should not be able to delete himself
added server side check
2011-05-16 22:37:54 -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
Naomi 15a2022418 CC-1799 : Live Studio Playout from media library (pytagsfs)
sending a file's metadata to airtime when it is modified
2011-05-13 13:25:53 -04:00
Naomi 52efc79f8c CC-1799 : Live Studio Playout from media library (pytagsfs)
set up daemontools process for the media monitor script.
2011-05-13 13:25:53 -04:00
James Moon 06f51aa78a CC-2251: Show content window pop up is too big
The show content window size is detemined dynamically based on
browsers viewport size.

I'm not sure what the size should be. So I set width and height
as like following:

width = viewport width * 4/5
height = viewport height * 2/3

Ratio can be easily changed.
2011-05-10 19:13:14 -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
James Moon 48af794cfa CC-2188: Download action for all media file
Fixed. The issue was due to change in getFileUrl() in
StoredFile.php.
2011-05-05 17:01:22 -04:00
James Moon 6bbbdd5404 CC-2238: Deleting a playlist from right list
Fixed.

1. It only clears the left window form if 'delete' action is
clickced on the opened playlist.
2. similar functionality was implemented when 'edit meatadata'
form is opened in the left window.
2011-05-05 16:52:38 -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
mkonecny 12e30820ae cc-2232-automatically-fill-in-show-name
-changed default "Untitled Show 1" to "Untitled Show"
2011-05-04 20:52:04 -04:00
James Moon e5969ab4be CC-2232:Automatically fill in show name
Notes:
1. Not sure if "Untitled Show 1" would be the best name.
 What if "Untilted Show 1" already exist? There is no easy way
of keeping track of the numbers. So wouldn't it be better to just use
"Untitled Show"?
2. There is no easy way to figure out if the current form is
opened for "update" or "add".( We can check the text on the button
if it says "add" or "update" button, but it's always bad to rely on
 any UI text. So the new code will focus and higlight name text on both
update and create new case for now.
2011-05-04 20:52:03 -04:00
James Moon 95613f40f1 cc-2188: Download action for all media file.
Download action were added in two placese.

1. Playlist Builder. jjmenu now showing 'Download'.
2. Calendar-> Show Content. Click on the file, you will see
Downlaod menu.

Limitation:

File name is set to original file name.
On the ticket it said, file format should be like
"show_name-12012011-2130.mp3". However, in my opinion,
this is only possible, if a user downloads it from
calender->show content. We know what the show names and etc,
but, if the user downloads it from Playlist Builder, we cannot
retrive such information. To be consistent in both area, I just
set the file name to original file name. This can be easily
modified in the future.
2011-05-04 19:05:14 -04:00
martin 8e2019a935 cc-2182: Convert back to restful design
-done
2011-05-02 16:33:37 -04:00
martin 9e01e389ea cc-2182: convert back to restful design
-initial commit
2011-05-02 15:33:32 -04:00
martin 8ffbcc96c7 Merge branch 'cc-2211-changes-to-playlist-not-shown' into devel 2011-04-29 15:32:27 -04:00
martin 50c649dc59 Merge branch 'cc-2211-changes-to-playlist-not-shown' into devel 2011-04-29 15:31:18 -04:00
James Moon afa51c0d56 CC-2211:changes to playlist not show
Move redraw function into callback function when PL gets deleted
from the left window
2011-04-29 12:17:06 -07:00
James Moon 615c6e18f5 cc-2211:changes-to-playlist-not-shown
There was a timing issue
Moved redrawing part into callback function.
2011-04-29 11:08:10 -07:00
martin 3ac7fb01af Merge branch 'cc-2238-deleting-a-playlist-from-right-list' into devel 2011-04-29 13:52:30 -04:00
martin a2f8062404 Merge branch 'cc-2202-start-upload-button-vanishes' into devel 2011-04-29 13:21:51 -04:00
James Moon 676d64bbb6 cc-2202:start upload button vanishes
Fixed.
2011-04-27 15:33:32 -07:00
James Moon d9ecb965bb cc-2211:changes-to-playlist-not-shown
- removing some codes that aren't used.
- it deletes pl from the right list if the 'delete' button on
the left window is clicked.
2011-04-27 14:41:47 -07:00
James Moon c322b8fb7f cc-2238:deleting-a-playlist-from-right-list
fixed.
2011-04-27 14:22:50 -07:00
James Moon 44d599a00b CC-2211:Changes to playlist not shown
Everything works fine except when adding new playlist.
When the new playlist gets created, it doesn't display
the page which contains the playlist.
2011-04-27 12:14:24 -07:00
James Moon d9216eafe5 cc-2230:Overbooked show still palying
Fixed. Assigning it to Martin for a review
2011-04-26 13:36:21 -07:00
martin 9236f4941d Merge branch 'master' of dev.sourcefabric.org:airtime into 1.8.1
Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
2011-04-26 15:34:53 -04:00
Paul Baranowski d14dc6cbe3 Merge commit '08864f79347e912e990f5ce0e86e5a8e739dc29d'
Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/models/Shows.php
2011-04-25 18:49:51 -04:00
Paul Baranowski 219598ac06 CC-2225 airtime-clean-storage doesnt work
Forced the user to run the script as superuser.
2011-04-25 18:34:03 -04:00
Paul Baranowski 78ed3e2822 Merge commit 'bfb90eefd10226ca32cc4e3c39cbb34ab88178d8' into 1.8.1 2011-04-25 17:58:34 -04:00
Paul Baranowski eb76bbe7f0 Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Shows.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/user/remove-user.phtml
	airtime_mvc/public/js/airtime/schedule/add-show.js
	airtime_mvc/public/js/airtime/schedule/schedule.js
	install/airtime-upgrade.php
	install/include/AirtimeInstall.php
	python_apps/api_clients/api_client.py
	utils/airtime-clean-storage
	utils/airtime-clean-storage.php
	utils/airtime-import
	utils/airtime-import.php
2011-04-25 17:24:53 -04:00
Paul Baranowski 07633ea249 CC-2225 airtime-clean-storage doesnt work
CC-2224 airtime-import checks if you can write to the stor directory even if you are linking

Had to rewrite the airtime-clean-storage script.
2011-04-25 16:48:34 -04:00
James Moon bf34170f29 Temp commit.
It's not done, need to work more later.
2011-04-25 10:11:12 -07:00
martin 42a5df0b57 -changed version string to 1.8.1 2011-04-22 01:04:16 -04:00
martin cfcd612d47 -updated version string to 1.9.0-beta 2011-04-22 01:02:35 -04:00
martin d57a308111 Merge branch '1.8.1' 2011-04-22 00:59:16 -04:00
martin 483848aa73 Merge branch 'cc-2227-repeating-weekday-show-bug' into 1.8.1 2011-04-22 00:59:01 -04:00