Commit Graph

467 Commits

Author SHA1 Message Date
Paul Baranowski c34b25883f CC-2137: Playlist builder doesnt work. Shows blank page
Fixed bug with new return type from Playlist::create() in the PlaylistController.
2011-03-31 14:40:55 -04:00
martin 403b08351c Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-31 12:39:22 -04:00
martin 7dcd6c78e5 CC-2031: Put extra 'Add this show' button at bottom of Add show box
-Done. Just need Vladimir to fix up the css.
2011-03-31 12:39:12 -04:00
Naomi 7cedbabb39 CC-2129 : Retry automatic upload to Soundcloud if Internet connection problem
fixing http code check
2011-03-31 10:37:06 -04:00
martin bc33154f4b CC-2040: playlist builder: when you "edit metadata" on a playlist, you can not "cancel"
-done, might need to ask vladimir to properly align the submit and and cancel button.
2011-03-30 22:18:05 -04:00
Naomi e902d3b3d4 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-30 18:15:48 -04:00
Naomi 85a984e669 CC-2129 : Retry automatic upload to Soundcloud if Internet connection problem
configs for retry, id of soundcloud file is added to database.
2011-03-30 18:15:33 -04:00
Paul Baranowski cdfe0ce197 Tweaks to the calendar load test. 2011-03-30 17:32:23 -04:00
Paul Baranowski 94dc54638a Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-30 17:27:24 -04:00
Paul Baranowski e5cbfa6ecd Added Ofir's Calendar load test.
In order to make it work, I made the following changes:

Merged Playlist::Insert() into the create() function, now there
is only one way to create a playlist.

Renamed Show::addShow() to Show::create() to make the API like
the other classes.  It returns the created show ID now.

Renamed Show::populateShowUntilLastGeneratedDate() to Show::populateShowUntil(),
allowed it to accept a second parameter for an end date.

Renamed Show::populateShowsUntil() to Show::populateAllShowsInRange().

Added documentation to a number of functions.
2011-03-30 17:27:14 -04:00
Naomi d2fb99eff9 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-30 15:42:36 -04:00
Naomi f184cc596a CC-2110 : Soundcloud file metadata 2011-03-30 15:42:01 -04:00
martin 32c28046ef CC-1990: Widget to display schedule and "Now Playing" on any website
-admin can now enable/disable access to scheduling information to remote widgets via the preferences page.
2011-03-30 15:34:35 -04:00
martin db3134cea8 -Preference page now shows a green confirmation success message similar to Manage Users page. 2011-03-30 14:54:31 -04:00
Naomi 7706282d2a Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-30 13:30:52 -04:00
Naomi 3805f8dfda CC-2129 : Retry automatic upload to Soundcloud if Internet connection problem 2011-03-30 13:27:21 -04:00
martin bcafa9edc4 CC-2105: SoundCloud password should be protected in Configure->Preferences UI 2011-03-30 13:14:37 -04:00
martin 8d0b2918f3 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-29 20:44:20 -04:00
martin 89d2c317cb CC-2044: remove hardcoded settings from application/configs/conf.php
-moved liquidsoap config to /etc/airtime as well
2011-03-29 20:44:04 -04:00
Naomi 7ca8978f56 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-29 19:36:53 -04:00
Naomi a9d288385b CC-2129 : Retry automatic upload to Soundcloud if Internet connection problem
static retries/wait time right now.
2011-03-29 19:36:36 -04:00
martin 8e07446e88 CC-2044: remove hardcoded settings from application/configs/conf.php
-baseFilesDir now moved to /etc/airtime/airtime.conf
2011-03-29 19:05:25 -04:00
martin 2702363a33 -CC-2044: remove hardcoded settings from application/configs/conf.php
-rearranged some stuff...some bugs still to go
2011-03-29 18:32:53 -04:00
martin 161505a6df CC-2044: remove hardcoded settings from application/configs/conf.php
-refactored some code to begin work on this...
2011-03-29 16:10:00 -04:00
martin b73e58551f CC-2128: storageUrlPort in application/configs/conf.php not being used
-fixed
2011-03-29 14:44:51 -04:00
Naomi 5100613049 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-29 12:47:43 -04:00
Naomi 8c522352d7 CC-2110 : Soundcloud file metadata
adding a users function which will prob be used for metadata... when I see what's needed.
2011-03-29 12:47:34 -04:00
martin d745201afe CC-2098: Only push playlists that havent ended yet
-re-added ability to specify to/from time ranges
2011-03-28 18:23:57 -04:00
martin d6c8e8ca3d CC-2092: When listening to a rebroadcast show, UI is telling me show is empty
-Fixed
2011-03-28 18:07:16 -04:00
martin 70dd2a4838 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-28 16:30:00 -04:00
martin 2aa0cd22c6 CC-1990: Widget to display schedule and "Now Playing" on any website
-update to API controller to support new widget
2011-03-28 16:29:50 -04:00
Naomi c0e8152077 CC-2110 : Soundcloud file metadata
added text area to preferences to allow for additional soundcloud tags.
2011-03-28 15:39:01 -04:00
naomiaro df8b9af8f6 CC-2110 : Soundcloud file metadata
uploading show description, show name in filename, tags ready to be uploaded for creator need to figure out what to upload.
2011-03-28 12:10:51 -04:00
naomiaro bb0f610fca Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-25 17:19:38 -04:00
naomiaro 40c9c48961 CC-2029 : Missing icons on buttons 2011-03-25 17:18:42 -04:00
martin deb210a8d4 -Changed text for Show URL -> Website. 2011-03-25 17:16:22 -04:00
naomiaro 4ef86fa084 CC-2099 : Show dialog: Offset days should go up to 30 days in the future 2011-03-25 15:33:54 -04:00
naomiaro 9306aa18ca Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-25 15:09:18 -04:00
naomiaro 32323cb8ae CC-2107 : Soundcloud username should be changed to email 2011-03-25 15:08:57 -04:00
martin 095a218969 CC-2046: About box could display version number
-Made About box use the defined constant
2011-03-25 15:08:52 -04:00
naomiaro d067cf0222 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-24 23:47:08 -04:00
martin 1107a67579 CC-2098: Only push playlists that havent ended yet
-implemented. Removed ability to specify time ranges for now, and defaulted to looking from now to 24 hours ahead.
Being able to specify time ranges was removed, since we are not using bi-directional communication between pypofetch and Airtime server.
2011-03-24 23:43:27 -04:00
naomiaro d5707c514b Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	python_apps/show-recorder/install/recorder-daemontools.sh
2011-03-24 23:10:04 -04:00
naomiaro c727c338af CC-2097: Show-recorder: Use RabbitMQ, api_client, and the structure of pypofetch
using api client now
2011-03-24 23:07:13 -04:00
martin 343fb593ee CC-2051: Unable to change user password
-Password is changeable, and success message appears whenever a user is added/updated.
2011-03-24 22:29:14 -04:00
martin d71bfbe191 CC-2108: Show time is hardcoded to 00:00
-fixed
2011-03-24 22:07:04 -04:00
naomiaro 35b2ddfd29 CC-2097 : Show-recorder: Use RabbitMQ, api_client, and the structure of pypofetch
setting up configs
2011-03-24 17:43:37 -04:00
paul.baranowski bdf98c9ec8 CC-2035: Context menu says 'Add Content' when it should say 'Add/Remove Content'
Changed.
2011-03-24 15:08:58 -04:00
paul.baranowski 38e84b81db CC-2047: Add Audio menu could be labeled Add Media
Changed.
2011-03-24 15:05:49 -04:00
naomiaro e57b18168a Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-23 23:37:01 -04:00