Commit Graph

311 Commits

Author SHA1 Message Date
James b32e463350 CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window
- fixed
2012-04-09 12:19:22 -04:00
James 954fa2bceb CC-3444: Ability to edit currently playing show (end time and permissions)
- handling in better way. we created separate action for this.
2012-04-05 16:01:27 -04:00
Martin Konecny 8050a1ce29 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section
-in progress
2012-04-05 14:45:16 -04:00
Naomi Aro 0b3809c379 CC-3110 : Password reset
added sender email to preferences form, created db upgrade script.
2012-04-05 14:18:42 +02:00
James ebbaa02210 CC-3514: Playlist-> Metadata list of fields is not matching to that of
Playlist->Edit Metadata

- fixed
2012-04-03 18:09:03 -04:00
James eb8bdabe91 CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
- fixing user info display
2012-04-03 14:15:15 -04:00
James a49a3a1d2e CC-3482: Live Stream: UI Design for Source Stream panel on dashboard
- master panel UI integration
2012-04-03 11:58:48 -04:00
James 286c240012 CC-3444: Ability to edit currently playing show (end time and permissions)
- done
2012-03-30 15:11:24 -04:00
Naomi Aro 5a24331ef6 CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 17:37:18 +02:00
Naomi Aro f48c5ff575 CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 15:34:58 +02:00
Naomi Aro 1b8a967cc0 CC-3174 : timeline
register js getting in way of toggling.
2012-03-29 11:32:27 +02:00
Naomi Aro d12ef1c7a2 CC-3536 : Work out ACL with library on NowPlaying when it's a guest User 2012-03-28 18:43:44 +02:00
Naomi Aro 1e9348f27f CC-3509: "Add Files" button (make it look better) 2012-03-28 17:50:14 +02:00
james 2bb9b03b19 CC-3507: Live Stream status: naming
- naming change on stream setting page
2012-03-28 09:55:04 -04:00
James 44e8e96cc8 CC-3507: Live Stream status: naming
- fixed
2012-03-26 17:29:09 -04:00
James e76f4baf18 CC-3489: Live Stream: When Custom Auth check box is checked, Custom Username and Custom Password field must be required
- done
2012-03-26 15:09:27 -04:00
Naomi Aro 1fdb3cf163 CC-3360 : Timeline Css
adding Css to timeline.
2012-03-22 18:04:22 +01:00
James 6b768c2f99 CC-3483: Live Stream: default fade in/out for live stream transition
- done. changing fade value doesn't require LS to restart
2012-03-20 22:16:17 -04:00
Daniel 4bb0421cf7 CC-3429: Firefox does not natively support mp3 file playing so preview does nothing.
- removed useless logging in AudiopreviewController.php.
- updated if statement syntax in audio-preview.phtml according to review comments.
2012-03-20 18:46:48 -04:00
James b7634098d3 CC-3471: Stream setting page looks much worse in Chrome than in Firefox
- fixed
2012-03-19 15:02:29 -04:00
Naomi Aro 9509c70595 CC-3453 : Playlist
reworking inital playlist events to all use the new "on" delegation in jQuery.
fixing some out of date errors.
2012-03-19 14:09:05 +01:00
Martin Konecny 5a7a502d45 CC-3436: Warn the user that the stream will be interrupted when pypo is restarted
-Done
2012-03-17 15:24:19 -04:00
Daniel 5b953443c6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/public/js/airtime/showbuilder/builder.js
2012-03-15 18:12:15 -04:00
Daniel ae0d3c560c CC-3394: Add play button to timeline table.
- added image information to row in ShowBuilder.php to enable audio preview of shows.
- moved around code so the audio preview functionaly is standalone
- fixed the firefox bug for issue CC-3429
2012-03-15 17:56:51 -04:00
james 559acfd5a1 CC-3452: Live Stream: DJs assigned to the show and Program Managers should be
able to control switches and able to kick out connection

- refactoring code
2012-03-15 14:33:59 -04:00
james 4595da9087 CC-3452: Live Stream: DJs assigned to the show and Program Managers should
be able to control switches and able to kick out connection

- kickout buttons and switch buttons are now visible to everyone.
- clicking buttons without correct permission will return proper error msg.
2012-03-15 14:29:31 -04:00
Naomi Aro fa1f03ed58 CC-3174 : showbuilder
improving look of playlist when files are not on disk.
2012-03-15 12:08:29 +01:00
Naomi Aro ae646545c4 CC-3201 : file import more visible 2012-03-15 11:36:32 +01:00
James c5c9fd7ba8 CC-3430: Live Stream: Admin should be able to kick out the source connection
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
2012-03-14 14:43:11 -04:00
James 2ee4b227fc CC-3439: Live Stream: Only admin should be able to turn on/of switch and
able to see kick out button

- done
2012-03-14 14:43:11 -04:00
James 4eefc05366 CC-3427: Live Stream: Ability to switch off Scheduled Play
- done
2012-03-14 14:43:10 -04:00
James e31ac81e74 CC-3418: Live Stream: Merge current "On-Air" indicator and "Listen"
button with new stream source indicator

- Initial commit
2012-03-14 14:43:10 -04:00
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 f193047a1c CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
are connected and give user the ability to block those streams

- added stream source switch interface
- backend code
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 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
Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel
Conflicts:
	VERSION
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Show.php
	airtime_mvc/public/js/airtime/dashboard/helperfunctions.js
	install_minimal/include/airtime-constants.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypocli.py
	python_apps/pypo/pypofetch.py
2012-03-12 17:52:17 -04:00
Daniel d713f830cd CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/public/js/airtime/library/library.js
2012-03-12 10:23:50 -04:00
Naomi Aro f28f6659dc CC-3403 : Replace Now Playing with the new Timeline screen 2012-03-12 14:23:03 +01:00
Naomi Aro 20db8d6fdf CC-733 : broadcast logs
adding time range selection for the log history.
2012-03-12 11:47:25 +01:00
Daniel 470cf0dbf8 CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
- Updated jplayer so it now shows a list view under the player which shows details of the track being played, and for playlists the entire playlist list.
- Also enabled playing playlists from the library.
2012-03-09 18:47:08 -05:00
Naomi Aro 53b8eb2724 CC-733 : export broadcast logs
exporting stats based on czech law
2012-03-08 18:30:56 +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
Daniel 709e117f41 CC-3391: Audio Preview cannot play tracks with commas in their filename
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
2012-03-06 13:50:07 -05:00
Daniel a09b63b8d0 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
2012-03-05 19:00:14 -05:00
Daniel b8452928da CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- updated player ui so it matches demo code
- can play any song from the library or playlist builder, but not very usable
2012-03-05 19:00:14 -05:00
Daniel 1aab682104 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- updates to audio preview on library and playlist
2012-03-05 19:00:14 -05:00
Daniel 0b9ed43e50 Updated library functionality and started with playlist work. 2012-03-05 19:00:14 -05:00
Naomi Aro 3ab375a23c CC-3174 : showbuilder
chaning text on edit button.
2012-03-02 15:29:19 +01:00
Naomi Aro b358c90cfb CC-3174 : showbuilder
making the library toggle in when pressing the edit button
2012-03-02 15:28:04 +01:00
Naomi Aro 99b490129c CC-3174 : showbuilder
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
Naomi Aro 872bd27847 CC-3174 : showbuilder
getting rid of useless views.
2012-02-29 18:06:53 +01:00
Naomi Aro a9e7a70dfb CC-3174 : showbuilder
fix audio preview.
2012-02-29 16:23:41 +01:00
Daniel 9736fd7deb CC-3334: Upgrade notification reports there is an upgrade when user has a later version than the official released version
- I've updated the comment to read the difference between 1.9.5 and version 3.0.0 is calculated as 105
- I've also updated the checking logic to make the first outdated anything below 20 and the second outdated between 20 and 29.
2012-02-27 17:28:06 -05:00
Naomi Aro 19d13889af CC-3351 : Track length should only show to tenths of a second in the library
created a length formatter to use in multiple places.
2012-02-24 15:07:04 +01:00
Daniel 1677bc6816 CC-3334: Upgrade notification reports there is an upgrade when user has a later version than the official released version
Updated the logic in Version Notify so that if the currently installed version of airtime is greater then the official version a notification does not appear saying Airtime needs to be updated.
2012-02-22 16:06:06 -05:00
Naomi Aro c89451f880 CC-3340 : Remove "Search" tab from library view 2012-02-22 21:56:55 +01:00
Naomi Aro 0ba3049528 CC-3174 : showbuilder
removing old scheduling method code to avoid confusion.
2012-02-22 13:19: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
Naomi Aro 941da1fe44 CC-3174 : showbuilder
adding add/remove to the context menu.
airtimeline now has default set start/end times in the inputs.
2012-02-09 23:41:12 +01:00
Naomi Aro d9947b622a CC-3174 : showbuilder
fixing times in CcPlaylistContents
2012-02-06 18:46:53 +01:00
Naomi Aro 42452b8ea9 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/airtime/library/spl.js
2012-02-06 11:07:10 +01:00
Naomi Aro 16863ee95e CC-3174 : showbuilder/library
playlist fades are working again, still need more error checking to be done.
2012-02-05 23:38:12 +01:00
Naomi Aro 38f3d6bfb0 CC-3174: showbuilder/library refactoring
adding new context menu files, playlist is working except for editing fades.
2012-02-04 19:27:26 +01:00
Naomi Aro 46fdf56b70 CC-3174 : showbuilder
refactoring playlist to work with group add/delete by resource id and using transactions.
2012-02-04 15:52:31 +01:00
Naomi Aro 19f069b602 CC-3174 : showbuilder
can add items to a playlist with the refactoring.
2012-02-04 00:12:06 +01:00
Naomi Aro 6da4397a96 CC-3174 : show builder
can add playlists to the time line
upgraded datatables to 1.9
upgraded qtip2 to a newer version
put qtips on type column on lib table.
2012-02-02 23:15:39 +01: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
Naomi Aro 3aab811a3e CC-3174 : showbuilder
fixing some css/js for display.
2012-02-01 23:33:20 +01:00
Naomi Aro ecaebbeb67 CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones. 2012-01-23 19:07:07 +01: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 ff428d2c4f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-17 11:35:48 -05:00
James dae7e73a84 CC-3250: UI design for mount monitor for media monitor
( Manage Media Folder and Playlist Builder screen)

- initial commit
2012-01-17 11:35:31 -05:00
Martin Konecny 54ee177f7d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-16 13:58:45 -05:00
Naomi Aro df33a457b1 Merge branch 'devel' into CC-3174 2012-01-16 09:58:02 +01:00
Naomi Aro 859213b760 CC-3174 Show Builder
experimenting
2012-01-16 09:56:57 +01:00
James 08a09e4096 CC-2977: Never delete files from the database
- using mtab(previous and current) files to figure out directories to be
added or removed
- adding index to cc_files
- see the tickets and media monitor design page for more info
2012-01-12 17:55:05 -05:00
Yuchen Wang 044f511455 SAAS-141: Tweaks for trial balloon
Done
2012-01-12 15:47:08 -05:00
Martin Konecny 4f546a1bc3 CC-3238: When ICEcast is not on local host, Jplayer is not playing anything
-fixed with workaround to show the user what ip they're listening on.
2012-01-11 16:27:14 -05:00
James f6f1b143d7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-11 12:18:28 -05:00
James 04b48d47cc CC-2977: Never delete files from the database
- Files are marked deleted(file_exists to false) on deletion.
- Dirs are marked removed(removed flag to true) on removal of watched
folder in a usual way. If dir is unmounted, without being removed from
watched list first, it will be marked as not exists(exist flag to false)
- Manage Media Folders will show if dirs exist or not( mounted or not)
- Playlist builder will show if files exists or not
2012-01-11 12:17:48 -05:00
Yuchen Wang 722306928b CC-3114: Show Content Dialog doesn't display total time
Done
2012-01-04 17:15:15 -05:00
Yuchen Wang 476484a269 CC-2985: Pop-up metadata box in Playlist Builder does not show Language field
Done
2012-01-04 17:08:38 -05:00
Naomi Aro 52b0e3c5f9 CC-3110 : Password reset
basic functionality password reset using sendmail
2011-12-21 16:01:29 -08:00
James 8b37c5d4da CC-3215: When you click on Playlist Builder, for a brief instant you see
the library table headings with different columns

- fixed
2011-12-20 11:32:46 -05:00
Yuchen Wang f6670b001f CC-3202: Airtime/Sourcefabric/GNU GPL v.3 links in Help->About should be opened in a new tab
Done
2011-12-14 22:29:02 -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 1b8e1455d6 SAAS-101: "Buy Now" link needs to pop up a new window when you click on it
Done
2011-12-09 13:51:20 -05:00
Yuchen Wang 106b54b6f4 CC-3168: Stream Settings: "Vorbis Metadata" confusing string
href='#' is not needed, removing it
2011-12-09 13:50:55 -05:00
Yuchen Wang c3b6203628 CC-3168: Stream Settings: "Vorbis Metadata" confusing string
Done
2011-12-09 13:42:03 -05:00
Yuchen Wang af3b75bab4 SAAS-95: Trial Box: Change "Keep Going On" to "Buy Now"
Done
2011-12-05 19:50:42 -05:00
Yuchen Wang 9523174a0f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-05 16:27:27 -05:00
Yuchen Wang 6591523452 SAAS-93: Switch link for Trial box
Done.
2011-12-05 16:27:17 -05:00
Martin Konecny 0440eb7539 CC-3160: Once Hardware dropdown is changed, stream information does not refresh
-fixed
2011-12-05 12:34:11 -05:00
Yuchen Wang ee5b675562 CC-3147: Change text in help > Getting Started: "Only admins can add shows."
Fixed
2011-12-02 13:57:40 -05:00