Commit Graph

5057 Commits

Author SHA1 Message Date
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
martin 05ff297cf3 CC-2227 repeating weekday show bug
-fixed syntax error
2011-04-22 00:58:01 -04:00
martin 9dc6d4c0ce Merge branch 'cc-2227-repeating-weekday-show-bug' into 1.8.1 2011-04-21 22:01:23 -04:00
martin 3e560bb082 CC-2227: Repeating weekday show -> Add weekend -> first weekend after show does not have new shows
-Should be fixed
2011-04-21 21:50:50 -04:00
martin 4b7ea32c7d -syntax errors discovered by eclipse 2011-04-21 17:23:59 -04:00
James Moon e31a1240f3 CC-2155:Can open the rebroadcast options without the 'Record'checkbox being selected - fixed 2011-04-20 14:10:58 -07:00
James Moon b53c9482c2 CC-2207:Rename 'Schedule Playlist' window to 'Schedule Media' - fixed 2011-04-20 12:42:38 -07:00
martin 171828f8ad CC-2186: Integration of a logger tool
-initial check-in. Everything appears to be working...
2011-04-20 00:46:03 -04:00
martin 34bd145885 -updated version string to remove beta 2011-04-18 17:32:49 -04:00
martin 59c1e02a98 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-18 15:57:42 -04:00
martin 6f9926eba2 CC-2195: Remove global php.ini changes from install guide and Airtime
-done
2011-04-18 15:57:32 -04:00
Naomi 9e96ec9da4 reloading config after ini values are changed 2011-04-18 15:28:48 -04:00
martin fab68dfad1 CC-2203: Search results: "Delete" should be at the bottom of the list and should have a confirmation
-Fixed
2011-04-18 12:43:04 -04:00
martin d7bb00dc20 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-18 12:01:22 -04:00
martin 7a3fbe9ac7 CC-2196: Update a Live show with invalid data, uncheck the Record checkbox
-fixed
2011-04-18 12:01:02 -04:00
Naomi 23105b9d67 CC-2184 : Hardcoded CSS path should be relative path instead
using baseURL zend provides in path.
2011-04-18 11:02:09 -04:00
martin be26c9a9ba Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-15 12:32:43 -04:00
martin e48f044e56 -CC-2192: Schedule sent to pypo is not sorted by start time. 2011-04-15 12:26:59 -04:00
Naomi b992801a45 hiding/showing show overflow message properly. 2011-04-15 12:11:06 -04:00
Naomi e853a6ff6e need individual rows/total rows error tracker. 2011-04-15 11:22:40 -04:00
Naomi 4d8f434059 have to start each loop as valid now. 2011-04-15 11:13:42 -04:00
Naomi eb312ae454 fixes to template, javascript to handle error arrays. 2011-04-15 10:51:06 -04:00
Naomi 0982405d4c better form validation for rebroadcast date/times 2011-04-15 10:23:08 -04:00
Naomi c3a02e2569 some fixes to display rows in form. 2011-04-15 10:04:16 -04:00
martin d68a8369c8 -changed version string to "1.8.0-beta" 2011-04-14 23:11:40 -04:00
Paul Baranowski 03ab7edea0 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-04-14 18:55:15 -04:00
Paul Baranowski b11cbd8159 CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00