Commit graph

144 commits

Author SHA1 Message Date
James
79f8eabe2b CC-3405: Display to users how to connect a live stream to Airtime
- Done
2012-03-14 14:43:10 -04:00
James
540f262a77 CC-3224: "On-the-fly" stream rebroadcasting
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
2012-03-14 14:43:10 -04:00
James
128a497059 CC-3224: "On-the-fly" stream rebroadcasting
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
James
1ebe3d1812 CC-3224: "On-the-fly" stream rebroadcasting
- Live source is created when only both port and mount point are specified
2012-03-14 14:41:00 -04:00
James
30901aa0d6 CC-3224: "On-the-fly" stream rebroadcasting
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -04:00
James
48bb19d758 CC-3224: "On-the-fly" stream rebroadcasting
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -04:00
james
701ed82f40 CC-3224: "On-the-fly" stream rebroadcasting
- interface implementation. subform within the show form.
2012-03-14 14:41:00 -04:00
James
ca04a7a686 CC-3224: "On-the-fly" stream rebroadcasting
- Form in preference section
2012-03-14 14:41:00 -04:00
Naomi Aro
20db8d6fdf CC-733 : broadcast logs
adding time range selection for the log history.
2012-03-12 11:47:25 +01:00
Naomi Aro
e9627bca07 CC-3174 : showbuilder
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
Martin Konecny
d9967b9a77 -function incorrectly capitalized 2012-03-01 12:15:58 -05:00
Naomi Aro
43d67c921d CC-3174 : showbuilder
adding cue/fade columns to table

fixing schedule fade out
putting default fade between files not in a playlist.
2012-02-27 21:29:02 +01:00
Naomi Aro
ac11d8bcf6 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/application/models/StoredFile.php
2012-02-17 11:50:49 +01:00
Naomi Aro
b1fbeeb448 CC-3174 : showbuilder
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
2012-02-15 00:39:27 +01:00
Martin Konecny
54cbc86a0a Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Nowplaying.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/application/models/airtime/CcShowInstances.php
2012-02-14 14:47:07 -05:00
Martin Konecny
09ef22520e CC-3310: Editing metadata of a song shows Artist instead of Creator.
-fixed
2012-02-08 14:15:15 -05:00
Daniel Franklin
03329ad2cf CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences
- Updated the logic in the fade in/out loggic so the Time format 00:00:00 appears as the more practical seconds format 00.
- I also updated the error message so it includes the time unit seconds in the message.
2012-02-02 14:44:14 -05:00
Martin Konecny
7ee17ba07e CC-3291: Airtime is missing Australia and Arctic timezones
-fixed
2012-01-31 21:24:01 -05:00
Paul Baranowski
07bd5dacae Improved tooltip for Stream Settings: Icecast Vorbis Metadata 2012-01-17 16:03:41 -05:00
James
087d893a60 Merge branch 'airtime-2.0.x' into devel 2012-01-17 14:48:04 -05:00
James
3a8ba36e0d SAAS-155: Add possibility to show additional information on
login page (for demo site)

- username and password are auto filled on demo site
- added informative msg on demo site about username and password
2012-01-17 14:47:26 -05:00
James
c82394b7a0 CC-3246: Hardware audio output cannot be switched off
- fixed
2012-01-13 16:57:02 -05:00
James
bcbbf42f62 CC-3246: Hardware audio output cannot be switched off
- fixed
2012-01-13 16:56:02 -05:00
Yuchen Wang
0df23305a0 CC-2237: Default fade time should be non-zero number of seconds
Done
2012-01-04 17:09:16 -05:00
Yuchen Wang
a63d975fce CC-2355: Repeating show should default to 'No End'
Done
2012-01-04 17:06:58 -05:00
Naomi Aro
905775552d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-27 14:34:27 -08:00
james
9665c970af CC-3218: Stream-settings: Spaces and other illegal characters should not be
allowed in the fields: server, username, password, URL, and mount point

- adding an another mask for domain name. Front and backend
2011-12-22 15:35:46 -05:00
Naomi Aro
52b0e3c5f9 CC-3110 : Password reset
basic functionality password reset using sendmail
2011-12-21 16:01:29 -08:00
James
30b192a809 CC-3218: tream-settings: Spaces and other illegal characters should not
be allowed in the fields: server, username, password, URL, and mount point

- masking was added on the front end and validators were added for the
server side.
- extra fix: fixed php undefined index notice problem.
2011-12-21 17:30:42 -05:00
Naomi Aro
3cd11c696f CC-3184 : Preferences: "Stream Label" needs to be moved to "Stream Settings"->"Global" 2011-12-13 12:10:25 +01:00
Yuchen Wang
c3b6203628 CC-3168: Stream Settings: "Vorbis Metadata" confusing string
Done
2011-12-09 13:42:03 -05:00
Martin Konecny
20f0f5e523 CC-2926: Clicking "Choose File" in support settings to upload image defaults to "Audio/MPEG" type in Chrome
-Fixed.
2011-12-05 12:04:02 -05:00
Yuchen Wang
9991cbd16b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-02 13:55:39 -05:00
Yuchen Wang
30f36177b7 CC-3141: Capitalization of SHOUTcast in stream settings page
Fixed
2011-12-02 13:54:37 -05:00
James
043f0c29a1 CC-3074: Give users the choice of which hardware sound API they wish to
use (instead of hardcoded to ALSA)

- finished everything except LS part(including upgrade and UI)
2011-12-02 13:39:14 -05:00
Yuchen Wang
53aecd1c00 CC-3130: Disabling a Shoutcast stream causes the service type to revert back to Icecast
This happens because we use same field in the db to store whether stream is disabled, and which
type is it (Icecast/Shoutcast). Thus when we disable a stream, we forget about the fact that
it was set to Shoutcast before.

Fixed by separating out the enable/disable state from stream type.
Whether a stream is enabled/disabled is stored in new fields sx_enable.
Stream type is stored in the old fields, sx_output.
2011-11-29 16:25:30 -05:00
James
85b8209db9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 13:09:51 -05:00
James
49df56a0f6 CC-3135: Typo in Stream Settings -> Global Settings, says Ouput
instead of Output

- fixed
2011-11-29 13:09:23 -05:00
Yuchen Wang
57d45a4f84 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 11:13:52 -05:00
Yuchen Wang
c430e0bd6a CC-3125: Small capitalization errors on SoundCloud text labels
Fix for the preference page
2011-11-29 11:13:39 -05:00
Naomi Aro
4c4c401c9c CC-3137 : Cleaning Up Old Playlist Stuff 2011-11-29 17:11:19 +01:00
Yuchen Wang
197997fee7 CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
Mask the password instead of hiding it
2011-11-25 21:52:31 -05:00
James
c9644d4a73 CC-3077: Preference/stream-setting page has no Vorbis metadata option
- cleaning up some code
2011-11-25 15:38:29 -05:00
Yuchen Wang
485a0e8cc6 CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
I just realized this:
1. Enable "Enable Soundcloud Upload" in preference and fill in the username+password, click save
2. Go back to preference, change unrelated setting like "Station Name", click save
3. Now since soundcloud password field is empty (expected, as we don't want others to see how many digits
are there), the save failed

This commit is to fix this. Created another custom validator for the password field, which does the same
thing as ConditionalNotEmpty validator but allow password field to be empty when the username/email field
wasn't changed.
2011-11-24 15:45:39 -05:00
James
eb19d461fe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 17:10:25 -05:00
James
a886b53d74 CC-3077: Preference/stream-setting page has no Vorbis metadata option
- done
2011-11-23 17:03:30 -05:00
Yuchen Wang
ef9a4cd850 CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
Forgot to stage this file in last commit...
2011-11-23 16:17:21 -05:00
Yuchen Wang
008278c7ec CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
Fixing bug introduced by last commit...Should test more thoroughly next time...

Fixed by creating and adding a custom validator that checks if the field is empty only when some other
fields have specific values, in this case, when 'UploadToSoundcloudOption' has a value of '1'.
2011-11-23 16:15:51 -05:00
Yuchen Wang
d3df4b14d2 CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
- Make the form fields required
- Append "Required" label to the fields
- Disable autocomplete for the fields
2011-11-23 12:52:35 -05:00
Yuchen Wang
8766cade49 CC-3092: Station Information: not able to upload logo
- Adding a return statement fixed it...I don't what was I thinking...

- Some indention seems messed up, fixed it
2011-11-23 10:39:05 -05:00