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
martin
569827abf9
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-30 17:06:15 -04:00
martin
2924da4bd4
CC-1990:Widget to display schedule and "Now Playing" on any website
...
-added internationalization support for all WADR widgets
2011-03-30 17:06:04 -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
martin
e5d4968d1a
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-30 13:53:57 -04:00
martin
b91adfb3aa
-Airtime.ini should follow PHP coding guidelines more closely.
2011-03-30 13:53:48 -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
534dad8da2
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-30 12:35:33 -04:00
martin
b0882cabd2
-fixed install issue when airtime/files directory was missing.
...
-installer now displays correct airtime version string
2011-03-30 12:35:24 -04:00
Naomi
60141e0e01
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-03-30 12:13:00 -04:00
Naomi
e769870919
removing gate operator for now, sounds bad and can lead to automatic rebroadcasting problems.
2011-03-30 12:12:14 -04:00
lukabazuka
c257bceab0
Fixed issues CC-2117 and CC-2118
2011-03-30 18:04:25 +02:00
martin
9c73ca246a
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-30 12:01:46 -04:00
martin
85cdc00254
CC-2132: Airtime upgrade not working
...
-fixed up upgrade scriupt from 1.6.x to 1.7.0
-created an AirtimeIni php class
2011-03-30 12:01:26 -04:00
Naomi
2aae93dd04
putting alpha in
2011-03-30 11:03:14 -04:00
Naomi
11973e9f10
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-03-30 11:01:42 -04:00
Naomi
f6d5182c50
adding version at top of install/uninstall script
2011-03-30 11:01:23 -04:00
martin
f5db45ecfe
-cleaned up liquidsoap config file
2011-03-29 20:52:18 -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
fe97a25e28
CC-2044: remove hardcoded settings from application/configs/conf.php
...
-added missing config value to recorder.cfg
2011-03-29 18:42:26 -04:00
martin
eb74c5718f
Merge branch 'master' of dev.sourcefabric.org:airtime
...
Conflicts:
python_apps/api_clients/api_client.py
2011-03-29 18:35:57 -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
Naomi
4c457ce6bc
set gate to really low level.
2011-03-29 18:01:30 -04:00
Naomi
a4996def76
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-03-29 17:33:00 -04:00
Paul Baranowski
45fe719ea6
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-29 17:32:20 -04:00
Naomi
a13c6fc62e
Merge branch 'master' of dev.sourcefabric.org:campcaster
2011-03-29 17:32:12 -04:00
Paul Baranowski
835960d25f
Added explanation to the user for each of the tools in dev_tools.
2011-03-29 17:32:03 -04:00
Paul Baranowski
9ebe7ec1ca
Better error message when timezones dont match up between pypo and airtime.
2011-03-29 17:31:22 -04:00
Naomi
4bdd8d425d
CC-2124 : Rebroadcast: Retry upload to Airtime on failed upload
...
added configurable number of upload retries as well as length between retries.
2011-03-29 16:32:31 -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
54f378049d
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-29 14:45:03 -04:00
martin
b73e58551f
CC-2128: storageUrlPort in application/configs/conf.php not being used
...
-fixed
2011-03-29 14:44:51 -04:00
paul.baranowski
c2e95b6625
Merge branch 'master' of dev.sourcefabric.org:airtime
2011-03-29 14:16:25 -04:00