Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,211 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

641 Commits

Author SHA1 Message Date
denise 7c5291fe0c CC-84: Smart Playlists 
- ui cleanup
 2012-07-18 11:55:29 -04:00
James 2a38527161 CC-84: Smart Playlists 
- propel usage chage
- cleaning up code
- some js changes
 2012-07-18 11:52:09 -04:00
denise 0aae7c75ae CC-84: Smart Playlists 
- added shuffle button
- moved all callbacks into one function
 2012-07-17 15:32:26 -04:00
denise a8ca9accdb CC-84: Smart Playlists 
- added remove button to all rows unless only one row is enabled
- disabled playlist contents if type switches from static to dynamic
  and vice versa
 2012-07-17 14:40:52 -04:00
denise e0a674a96c CC-84: Smart Playlists 
-added save button for static playlists
 2012-07-16 18:24:46 -04:00
denise 1bb97c8603 CC-84: Smart Playlists 
- ui clean-up
 2012-07-16 14:44:50 -04:00
denise 2dae5f30f7 CC-84: Smart Playlists 
- code cleanup
- adds 'Add' button to last row, always
 2012-07-16 11:01:34 -04:00
James 46294c3f40 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 
Conflicts:
	airtime_mvc/application/forms/SmartPlaylistCriteria.php
 2012-07-13 16:00:02 -04:00
James ae9442d7f5 CC-84: Smart Playlists 
- editing playlist
 2012-07-13 15:58:23 -04:00
denise b48fb49947 CC-84: Smart Playlists 
-fixed add/remove behaviour
 2012-07-13 15:15:11 -04:00
James 207582eb7e CC-84: Smart Playlists 
- temp commit
 2012-07-13 14:23:30 -04:00
denise d81253cccc CC-84: Smart Playlists 
- send playlist id on generate/save action
- fixed some small UI bugs
 2012-07-12 17:19:53 -04:00
denise 31bb07b4f0 CC-84: Smart Playlists 
- removed modifier array list from form and populate in javascript
- fixed remove functionality to handle the extra criteria value used
  for 'is in the range' modifier
- moved 'add' button to last row
 2012-07-12 13:02:02 -04:00
denise c27b886817 CC-84: Smart Playlists 
-0-indexed form elements
 2012-07-11 16:15:44 -04:00
denise 4842f1a5a1 CC-84: Smart Playlists 
-removed limit checkbox
 2012-07-11 15:52:46 -04:00
denise 7358b00c81 CC-84: Smart Playlists 
-disabled non-visible form elements
 2012-07-11 15:18:47 -04:00
denise 1afe1e4d32 CC-84: Smart Playlists 
-added in save/generate functionality in the UI
 2012-07-11 11:50:40 -04:00
denise 4bed5e647e CC-84: Smart Playlists 
-moved smart_playlistbuilder.js into playlist folder
 2012-07-11 10:45:24 -04:00
denise 4301a221b7 CC-84: Smart Playlists 
-added in 'Add' and 'Remove' form elements functionality on the UI
 2012-07-10 18:20:23 -04:00
denise 72dd48e33e CC-84: Smart Playlists 
-created form and view script
 2012-07-10 15:25:29 -04:00
denise 335dd1516b Merge branch '2.1.x' into devel 
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
 2012-06-29 10:57:14 -04:00
James c669d3cb47 CC-3969: Reset Password: specifying wrong e-mail keeps you on the same page 
without possibility to navigate back gracefully

- done
 2012-06-20 18:02:46 -04:00
James 10fc5038c8 CC-3965: Clarify input/output stream settings by addding appropriate labels 
- fixed
 2012-06-20 17:39:52 -04:00
denise b0e93005e5 Merge branch '2.1.x' into devel 2012-06-15 15:04:18 -04:00
denise d02607ed94 CC-3561: Add button to automatically rescan watched folders. 
-done
 2012-06-15 12:16:19 -04:00
denise 295a8ea5fe CC-3561: Add button to automatically rescan watched folders. 
-done
 2012-06-14 13:44:56 -04:00
denise f3b925daa2 CC-3412: Icecast stream name not defined 
-done
 2012-06-12 17:08:36 -04:00
James 57397312f2 CC-3963: If DJ is scheduled to broadcast for show, then automatically 
enable source when DJ connects.

- done
 2012-06-12 15:38:03 -04:00
denise 5b9add360c CC-3718: Please enable user to input the mail server settings 
-fixed soundcloud settings from collapsing if there are form input errors
 2012-06-11 15:18:12 -04:00
denise d498c51814 Merge branch '2.1.x' into devel 2012-06-11 15:10:33 -04:00
denise 16b6f09420 CC-3959: Make default username "source" for master and show inputs 
-done (just added tooltip)
 2012-06-11 14:55:26 -04:00
denise ca8187c9c2 CC-3718: Please enable user to input the mail server settings 
-done
 2012-06-11 12:53:09 -04:00
denise 532b2710f0 CC-3932: Master/Source Source Connection URL should be in non-editable box 
-done
 2012-06-06 13:10:57 -04:00
denise f57d316b6c CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES 
-changed support feedback message
-fixed whitespace in register-dialog.phtml
 2012-06-06 11:10:29 -04:00
James b23e3d0a54 CC-3927: Should automatically switch back to Master/Show stream if there is a 
connection interruption

- done
 2012-06-05 16:41:41 -04:00
denise 4bcf904f92 CC-3932: Master/Source Source Connection URL should be in non-editable box 
-done
 2012-06-05 15:13:04 -04:00
denise 5966c7feda fixed merge conflit 2012-06-05 14:47:11 -04:00
James 51227b4cad CC-3934: Master and Show stream override need to be disabled on airtime-demo 
- done
 2012-06-05 12:18:59 -04:00
denise a3754be31a CC-3850: Use qTip instead of custom tooltips 
-done
 2012-06-05 11:24:40 -04:00
denise e3bacba39b CC-3920: Phone home stats: explain to the user the benefits to them to clicking YES 
-done
 2012-06-05 11:20:00 -04:00
denise 25ff2b3c3a CC-3873: "Reset e-mail" procedure leads to a certain page with no ability to navigate back from it 
-added "Back to login screen" link
 2012-06-05 11:19:59 -04:00
Martin Konecny 43f57c0f8b CC-3902: Help -> Getting Started: Step 2 is optional now 
-fixed
 2012-06-03 22:55:49 -04:00
Martin Konecny 54d741972a CC-3903: Help -> Getting Started: the link "user manual" is different from the menu item "Help -> User Manual" 
-fixed
 2012-06-03 22:51:23 -04:00
Paul Baranowski 4fec2d3982 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-30 13:59:34 -04:00
Paul Baranowski 81fb81af74 CC-3904: Help -> about: Year 2011 should be 2012 
Fixed.
 2012-05-30 13:59:06 -04:00
Naomi Aro 6b8adff769 CC-3876 : "open the library to schedule files" button should be disabled for 'guest' users and DJ's not assigned to this show 2012-05-24 15:08:54 +02:00
James a6dc2adb78 CC-3874: after 3 unsuccessful attempts to login no RE-CAPTCHA is shown and 
you can't even login as admin user

- fixed
 2012-05-23 17:14:59 -04:00
Naomi Aro 95003c3571 CC-3712 : Trial end date overlaps with Airtime Clock 2012-05-22 12:45:42 +02:00
Naomi Aro 78fe946e57 CC-3712 : Trial end date overlaps with Airtime Clock 2012-05-22 12:40:08 +02:00
Naomi Aro d47514c4db CC-3845 : General UI cleanup 2012-05-21 18:28:19 +02:00
Naomi Aro 4fe80194b6 CC-3845 : General UI cleanup 2012-05-21 17:07:34 +02:00
denise d0211aaca9 SAAS-208: airtime-system: create a option which can set the live stream connection setting 
-done
 2012-05-18 19:08:50 -04:00
denise 8710c00970 SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command 
-these options are hidden is instance is saas
 2012-05-18 12:58:09 -04:00
Naomi Aro bb084f5a85 CC-3845 : General UI cleanup 2012-05-18 16:11:22 +02:00
Naomi Aro ff1327881a CC-3845 : General UI cleanup 2012-05-18 15:40:22 +02:00
denise 8ad336858e CC-3747: Metadata popup should also show the filepath of the track 
- fixed 'File Path' from breaking into 2 lines in Chrome
 2012-05-17 18:53:40 -04:00
Paul Baranowski 6d75b4fc06 The fix for long connection strings in "Add Show" form caused the tooltips to 
be displayed incorrectly (hidden).  Reverted that change.

Fixed display of "Stream URL" in the stream settings.
 2012-05-17 18:07:41 -04:00
Paul Baranowski 869eb77ca4 CC-3611: Show Form: "Repeats" font is wrong, info images in the wrong place 
Fixed both of these issues.

Fixed issue with connection URLs in "Add Show" and in "Stream Prefs" where
the text was unstyled.

Fixed issue with long connection URLS causing display problems
in "Add Show" and in "Stream Prefs".  Now a scrollbar will appear if the
connection URL is too long.

Fixed bug in Stream Prefs where zooming out caused the page to be formatted
differently.

Fixed bug in Stream Prefs where the labels "Master Source Connection URL" and
"Show Source Connection URL" wrapped on multiple lines.

Fixed help text for Add Show -> Live Stream authication settings, the
instructions were wrong and there were misspelled words.
 2012-05-17 17:33:50 -04:00
Paul Baranowski 228f699943 CC-3609: Stream settings page layout works better now, the two panels 
are now placed next to each other.
 2012-05-17 15:06:14 -04:00
Naomi Aro ccbe4f1998 CC-3420 : Custom UI for jplayer from CC-3395 
creating new stylesheet for our audio previews based from jplayer blue monday.
 2012-05-17 16:20:40 +02:00
denise 0c337fe430 CC-3747: Metadata popup should also show the filepath of the track 
-done
 2012-05-01 12:39:56 -04:00
James c9df8e8b15 CC-3722: Create loading indicator for AJAX call when calculating Show length 
- done
 2012-04-26 11:56:14 -04:00
James cf4101cdcd CC-3720: Switch order of streams in dashboard 
- done
 2012-04-26 11:22:57 -04:00
Naomi Aro b5863d3d7a CC-3522 : Now Playing Screen-> Periodical message pops up 2012-04-26 12:14:41 +02:00
Naomi Aro b6bed6ce7a CC-3667 : Preferences pages should have an option to enable/disable password recovery option 2012-04-25 15:22:38 +02:00
Naomi Aro 7aeddf5bb0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 12:51:00 +02:00
Naomi Aro 4cdfd33044 CC-3667 : Preferences pages should have an option to enable/disable password recovery option 2012-04-25 11:32:43 +02:00
James 2cb17a3b08 CC-3660: Cannot click Airtime Manual link on override info popup 
- replaced the popup with qtip
 2012-04-24 11:26:22 -04:00
Naomi Aro d5a416be43 CC-3416 : Create password reset form 2012-04-20 16:10:27 +02:00
denise 64e8640795 CC-3668: Live stream player - volume control needs improved usability 
-new layout done, mute/un-mute image blurry (need new one)
 2012-04-19 12:34:51 -04:00
denise de89db7c36 CC-3668: Live stream player - volume control needs improved usability 
-in progress
 2012-04-18 18:24:50 -04:00
denise 7659ae6384 added missing bracket on <span> 2012-04-18 12:26:10 -04:00
Naomi Aro 102bcb1d46 CC-3416 : Create password reset form 2012-04-17 18:16:10 +02:00
James 1d91d1b11b CC-3659: Override on Master/Show Source connection needs to have 
better description about what the override field actually does.

- fixed description
- extra fix:
 - using variable instead of hard coded text
 - removed unnecessary code
 2012-04-16 18:21:28 -04:00
denise fe68d0fc87 CC-3498: Calendar -> Show Content better representation of duration needed 
-fixed
 2012-04-12 16:25:01 -04:00
denise 0b1b7d0e9f CC-3511: Pausing and then playing the live stream player should restart the stream at current time instead of playing from the buffer 
-play/pause removed
 2012-04-12 12:25:35 -04:00
James 0ec58f0bc3 CC-3250: UI design for mount monitor for media monitor 
( Manage Media Folder and Playlist Builder screen)

- adding tooltip and fixed a minor bug
 2012-04-11 17:24:26 -04:00
Denise Rigato 26d13e7184 CC-3468: Stream settings: Need detailed tooltip for "override" fields 
-fixed
 2012-04-11 11:01:22 -04:00
Denise Rigato e4fc5fafb5 CC-3468: Stream settings: Need detailed tooltip for "override" fields 
-fixed
 2012-04-10 16:30:46 -04:00
Naomi Aro b998a04c2e Merge branch 'devel' into CC-3174 2012-04-10 15:57:13 +02:00
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
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
Naomi Aro f15429c8d6 CC-3144 : Search box shows Track, Show Contents box shows Genre 
replaces track number with genre.
 2011-12-01 11:16:29 +01:00
Naomi Aro 5b7788957e CC-3137 : Cleaning Up Old Playlist Stuff 
unused view.
 2011-11-29 17:22:17 +01:00
Naomi Aro 22e48d042a CC-3137 : Cleaning Up Old Playlist Stuff 2011-11-29 16:35:52 +01:00
Naomi Aro 8646432cce CC-3038 : Playlists offsets not dynamically updating 
refreshes view when a cue/fade is set like all other playlist actions
calling function setSPLContent
 2011-11-29 15:30:05 +01: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 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
Martin Konecny 8231df6c44 CC-3080: Select stream: drop-down menu does not really select stream, makes no difference to output quality on Firefox 3.6 
-should be fixed.
 2011-11-23 10:30:39 -05:00
James 65f2dd065b CC-3063: Live Stream Window: It doesn't play Shoutcast stream 
- fixed. need special string appended when the stream is from shoutcast
- ';stream/1' need to be appended on shoutcast url.(that's how jplayer works)
 2011-11-21 11:57:36 -05:00
James 19eb5abe12 CC-3063: Live Stream Window: It doesn't play Shoutcast stream 
- fixed. flash fallback point was invalid.
 2011-11-21 11:38:56 -05:00
James db9cadbfcd CC-3064: Stream Setting: enabled stream section has to be expanded 
- done
 2011-11-18 14:35:55 -05:00
James 08f0aae761 CC-3053: Stream settings -> the collapse/expend arrow is pointing the wrong way 
- reversing image between close and open
 2011-11-18 14:06:47 -05:00
Yuchen Wang eae90862b1 CC-2950: Tell users if they are running an out-of-date version or not 
Get rid of hardcoded url for downloading the latest version, and use the url
stored in the stat server instead
 2011-11-17 14:10:26 -05:00
james 590a74b8ce CC-3053: Stream settings -> the collapse/expend arrow is pointing the wrong way 
- fixed
 2011-11-16 17:57:07 -05:00
james 1f9b2559ab CC-3032: Airtime -> Help -> About. shows variable name instead of value 
- fixed
 2011-11-16 16:46:54 -05:00
Yuchen Wang 129feb573b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-15 16:38:00 -05:00
Yuchen Wang 46a87ea534 CC-2992: 404 "Help" link doesnt work 
Somehow my last change disappeared...submit again
 2011-11-15 16:37:41 -05:00
James 6229ca46d5 CC-2959: Stream Setting: Status box design for each stream 
- integrated new status boxes
 2011-11-15 16:27:23 -05:00
James 3374e09242 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-15 16:10:58 -05:00
James a723430462 SAAS-69: Support Settings: Change/hide some sections for SaaS 
- Some sections are hidden when saas is enabeld
as described in the ticket.
 2011-11-15 16:10:40 -05:00
Yuchen Wang af1b376cdf CC-3029: Graphic design for the version notification feature 
- use classes in VersionNotify.php for displaying icons instead of inline styling
- change underscore to hyphen so that naming convention is consistent with the
  rest in style.css
 2011-11-15 16:08:05 -05:00
Yuchen Wang 383fa35fc5 CC-2950: Tell users if they are running an out-of-date version or not 
- Hide tooltip and close button on mouseout when current version is up to date
- Return version diff instead of tooltip msg in VersionNotify.php,
  make js side responsible for picking the msg
 2011-11-15 14:24:14 -05:00
Yuchen Wang becaf7a152 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-14 00:35:27 -05:00
Yuchen Wang 1a1db1892f CC-2950: Tell users if they are running an out-of-date version or not 
Initial implementation.
- added some code in phone_home_stat to retrieve latest version from stat server
  and store result in db

- created new view helper VersionNotify.php, which queries and calculates version
  difference, then returns the necessary information in html to the view files

- created new javascript file versiontooltip.js, which sets up the qtip stuff so that
  when the version notification icon is clicked, a tooltip is displayed
 2011-11-14 00:34:53 -05:00
james 68f142470a SAAS-67: "Hardware Audio Out" shows when SaaS is enabled 
- "Hardware Audio Out" is not visible when plan-level is not diabled
 2011-11-13 13:58:47 -05:00
James 03a81e642e CC-2438: Add a button to listen to the stream immediately 
- moved listen button under the "ON AIR"
 2011-11-10 16:36:17 -05:00
James 5503ebc6e5 SAAS-35: "Trial Period" box 
- done
 2011-11-10 15:54:38 -05:00
Yuchen Wang 8f75bf1870 CC-2966: Remove minimum and maximum logo sizes - make them recommended instead 
Fixed by:
1. change wording
2. attach custom filter to the logo upload form, the filter scales down the image
if it's larger than 600x600
 2011-11-09 15:35:14 -05:00
Yuchen Wang 04bcc28b5e CC-3001: Preferences->"Submit" button renamed to "Save", and should be at the top and the bottom of the screen 
Fixed by:
1. changing label to say "Save"
2. wrap the preference form inside another form;
   within the wrapper form, add a submit button at the top
 2011-11-07 17:43:38 -05:00
James 0188dc6c06 CC-2995: Remove "Done Editing" button 
- done
 2011-10-27 10:20:57 -04:00
Yuchen Wang d9186a3bf2 CC-2951: Allow users to select the starting day of the week 
Added system preference in Preference page for user to select the start day of a week
(defaults to Sunday).

Calendar will utilize this information and update the calendar UI accordingly.
 2011-10-19 12:42:22 -04:00
Martin Konecny ca2a535b24 CC-2908: Add "Live Stream" title to live stream popup window 
-fixed logo size being too big.
 2011-10-14 14:25:28 +02:00
james faba5aec57 CC-2745: Show status of liquidsoap/icecast connection on 
Stream Settings page

- commit w/o design
 2011-10-13 14:22:28 -04:00
Martin Konecny 3fee646e35 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-12 14:45:20 +02:00
Martin Konecny 24e208d1d6 CC-2438: Add a button to listen to the stream immediately 
-but is now available. Need to ask Vladimir to position it under the "On-Air"
 2011-10-12 14:26:18 +02:00
James e16c8f3411 CC-2945: Change "Storage Folder" to "Import Folder" 
- fixed
 2011-10-11 17:29:49 -04:00
James 75f57fc18c CC-2933: Add From When: Create custom decorator(phtml) for 
the section

- done
 2011-10-05 12:22:54 -04:00
martin 929e29182b CC-2908: Add "Live Stream" title to live stream popup window 
-custom logo
 2011-10-04 17:18:36 -04:00
James b682c2cd10 CC-2902: Broken link in interface: "Click the box below to advertise 
your station on Sourcefabric.org"

- fixed
 2011-10-04 12:04:09 -04:00
James 64a46294c9 CC-2910: Ability to collapse stream sections in "Stream Settings" 
- done
- only stream 1 is expanded by default
 2011-10-03 17:00:39 -04:00
James aebcfb9450 CC-2905: Add indentation on checkboxes on SoundCloud setting 
- fixed
 2011-10-03 15:35:31 -04:00
James 441b983665 CC-2748: Make Airtime look good in IE 
- fixed
 2011-10-03 15:27:10 -04:00
James 3ac50b0183 CC-2904: Space missing between two boxes on "Playlist Builder" 
- fixed
- extra change: bug on flag name change
 2011-10-03 15:25:55 -04:00
James 83e8a610df Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-03 14:13:15 -04:00
martin 27892c8b46 CC-2906: Airtime Volume Control is invisible when turned on. 
-fixed
 2011-09-30 15:48:12 -04:00
martin a31920e982 CC-2438: Add a button to listen to the stream immediately 
-Streams selectable by their description
-Repeatedly clicking on the ON-AIR, focus()es the window
 instead of reloading it.
 2011-09-30 12:58:49 -04:00
martin 0613c6db3a CC-2908: Add "Live Stream" title to live stream popup window 
-done
 2011-09-30 12:07:44 -04:00
Paul Baranowski 44481d2776 SAAS-41: Changed name of boolean value from disable-stream-conf to 
enable-stream-conf for easier logic.
 2011-09-29 18:11:22 -04:00
James 7e3d25eeaa CC-2795: Give option to set download flag of recorded shows 
uploaded to Soundcloud by default

- done
 2011-09-29 17:10:17 -04:00
James 1593313805 CC-2898: put button within the form 
- done
 2011-09-29 12:12:41 -04:00
James 2e49ffdebe CC-2898: Put "Save" button at top of stream settings 
- fixed
- extra fix: removed incorrect description text for mount point field
 2011-09-29 12:10:25 -04:00
martin 3ded56fdc2 CC-2724: Play Stream Icon + jPlayer popup styling 
-changed to use <select> box instead of radio buttons
 2011-09-28 16:36:16 -04:00
martin 5418ce4601 CC-2724: Play Stream Icon + jPlayer popup styling 
-Everything looks to be working.
 2011-09-27 16:37:03 -04:00
martin 3dbedc3a56 CC-2724: Play Stream Icon + jPlayer popup styling 
-#of streams and stream bitrates now fetched from database.
 2011-09-27 15:26:40 -04:00
martin fef0392e43 CC-2724: Play Stream Icon + jPlayer popup styling -upgraded to jplayer 2.1 2011-09-27 14:02:12 -04:00
James 95a2c179c2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-22 13:40:32 -04:00
James 6d23ea4b49 CC-2308: 404 page 
- done
 2011-09-22 13:40:16 -04:00
martin 2be0960ed5 CC-2833: Use ClassLoaders for PHP Files 
-made MusicDir, Playlist and StoredFile autoload
 2011-09-22 12:24:17 -04:00
martin 046f98db8f CC-2363: Diagnostic screen in Web UI 
-everything working
 2011-09-22 10:45:43 -04:00
martin 19d61ad780 CC-2363: Diagnostic screen in Web UI 
-working with ajax now!
 2011-09-19 17:55:26 -04:00
martin 5a5430f468 CC-2363: Diagnostic screen in Web UI 
-add vladimirs design
 2011-09-19 15:45:23 -04:00
James 1e4bcdf831 CC-2814: Login error messages need to be highlighted 
- done
- Recaptcha box and submit button is moved to center
 2011-09-14 17:50:00 -04:00
martin 583a5faf72 CC-2750: Ability to query health status for pypo, liquidsoap, 
media monitor, and recorder
 2011-09-13 18:43:16 -04:00
martin 9fc2932be6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-13 14:56:48 -04:00
James f25304bcb7 CC-2789: Prevent brue-force password guessing attacks 
- add recaptcha on login page
 2011-09-13 14:16:16 -04:00
martin 0546633ac7 CC-2750:Ability to query health status for pypo, liquidsoap, media monitor, and recorder 2011-09-12 17:15:46 -04:00
martin 362cf93643 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-09 15:07:56 -04:00
martin 9c7bab616d Merge branch '1.9.1' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/ScheduleController.php
	install_minimal/airtime-install
	install_minimal/include/AirtimeInstall.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
 2011-09-09 15:07:43 -04:00
Paul Baranowski 2ed4dc9218 Forgot to add in the "About" page. Here it is. 2011-09-08 13:45:07 -04:00
martin a20bdb941c CC-2260: Liquidsoap and Show contents window do not respect cue-out point 
-fixed
 2011-09-07 17:50:00 -04:00
james ea305bd793 CC-2759: Stream settings "Hardware Audio Out" UI tweaks 
- used same styling as "Stream" sections.
 2011-09-07 16:27:51 -04:00
james b66a923d5f CC-2654: corrected spelling 
- fixed
 2011-09-07 16:19:35 -04:00
james f6f27bf0ff CC-2654: use id 
- added id to navigation
- using id instead of label
 2011-09-07 09:55:21 -04:00
james f1c311acb6 CC-2775: Better layout for Stream Settings page 
- layout is done
- need to implement status update part
 2011-09-07 09:48:02 -04:00
Paul Baranowski 37415f33d4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-06 15:28:57 -04:00
Paul Baranowski 7379da83c6 CC-2049: Log in/out versus sign in/out of admin interface 
Fixed by removing "Sign in" terminology.

Moved "About" link to underneath the "Help" menu.
Simplified the upper right hand corner of the Admin interface.
 2011-09-02 17:29:08 -04:00
James fa929d45a6 CC-2753: Ability to disable stream 1 but still show it in the interface 
- interface change
- all elements becomes 'disabled' depending on 'disable_stream_conf' flag
 2011-09-02 16:13:30 -04:00
James 0c72b8b6bf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-02 15:24:53 -04:00
James 903c3474c7 CC-2654: Remove abilities that don't apply to SaaS 
- not displaying manage folder option when saas is true
- not displaying record and rebroadcast section when saas is true
 2011-09-02 15:24:35 -04:00
Paul Baranowski aa58225e68 Changed the "Configure" menu item to "System". 
Changed Help->About to Help->Getting Started.
Added Help->"User Manual"
Added ability to specify a "target" in the main menu navigation - this allows
us to open up a new tab for the User manual. Adde
 2011-09-02 14:37:40 -04:00
James ce2ce0a13a CC-2755: Displaying trial ending information 
- it only displays about remaining date when the plan level is 'trial'
 2011-09-02 12:10:46 -04:00
James 1a8214fccc CC-2755: Ability to set trial ending date 
- codes for front end.
- design needs to be integrated.
 2011-09-02 12:02:02 -04:00
martin 03cb154bd1 CC-2737: Show disk space used/space available/ disk quota enforcement 
-modify airtime-check-system to return values instead of printing
 them directly
-add ability to view select airtime-check-system via web interface
 2011-08-30 18:00:03 -04:00
martin 1e70feda6b CC-2438: Add a button to listen to the stream immediately 
-Pop-up. Just need a proper skin.
 2011-08-29 15:30:00 -04:00
james b92793e80f CC-2727: Limit number of streams and max bitrate 
- create airtime-stream php script to set number of streams and max bitrate
- the stream section itself is not displayed rather than grey out
 2011-08-26 15:41:20 -04:00
James 58837ff89b CC-2706: Streams should have a username field 
- adding "User" field on stream setting form
- change key name from "output_s1" to "s1_output" format to be consistent
- changed order of inserting in default.sql file
- hiding username field on shoutcast selection
- liquidsoap and pypo takes care of user field input
 2011-08-24 17:13:56 -04:00
James 9eb21cb327 Merge branch '1.9.1' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/Preference.php
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
 2011-08-24 10:30:59 -04:00
James 405edcc5fa CC-2718: Changes to the support page 
- "Help Airtime" button is enanbled solely depending on feedback checkbox
when user already agreed to Terms and condition
 2011-08-23 16:46:29 -04:00
James 3e3391dfba CC-2718: Changes to the support page 
- stroing and retreving new value "privact" to DB
- Displaying "Terms and Condition" link when user agrees it
 2011-08-23 15:11:21 -04:00
James dc6ed33b47 Merge branch '1.9.1' into devel 2011-08-19 16:43:16 -04:00
James 30fcb0b95d CC-2704: Support settings UI tweaks 
- adding server name again under Preference
 2011-08-19 16:42:46 -04:00
James a73612afd2 CC-2607: Ability to adjust stream bitrate,type,etc from the UI interface 
- Modified "Descriptioin" to "Name/Description"
- mount point is not append with extension anymore
- fix on auto generated stream url
- name is used in shoutcast
 2011-08-19 16:35:23 -04:00
James f2f599f723 CC-2704: String change 
-fixed
 2011-08-19 15:00:45 -04:00
James 9b6ead98ae Merge branch '1.9.1' into devel 2011-08-19 14:58:56 -04:00
James 8e108e8596 CC-2704: Change text 
- fixed
 2011-08-19 14:58:31 -04:00
James 314749bf98 Merge branch '1.9.1' into devel 2011-08-19 13:11:11 -04:00
James bb97a0eede CC-2704: Support Setting UI tweak 
- move station name under publicise
- make it required field
 2011-08-19 13:09:10 -04:00
James 8e0496d8c1 CC-2704: Support Setting UI tweak 
Merge branch '1.9.1' into devel

Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
 2011-08-19 12:22:08 -04:00
James db225dd610 CC-2704: Support settings UI tweaks 
- Move station name to "Support Settins" page
 2011-08-19 12:19:35 -04:00
James f855da0f45 Merge branch '1.9.1' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/configs/navigation.php
	install_minimal/DoctrineMigrations/Version20110711161043.php
	python_apps/api_clients/api_client.py
 2011-08-18 19:05:13 -04:00
James d83f9f1b96 CC-2701: Separate Support Settings from Preference page 
- done.
 2011-08-18 18:58:59 -04:00
James 38256de606 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-08-18 13:54:17 -04:00
James 4275cc6667 CC-26027: Remove file 
- removing old file
 2011-08-18 13:53:50 -04:00
James cf55e92aa3 CC-2607: Ability to adjust stream bitrate, type, etc from UI 
- removed debug code from NowPlayingController
- New Form for streamsetting
- Action created in PreferenceController
 2011-08-18 13:53:12 -04:00
martin 61e1c56244 cc-2683-not-using-utc-time 
-pypo now works in UTC time
 2011-08-16 15:07:54 -04:00
James 4f2b2dba6d CC-2607: Abilitiy to adjust stream bitrate, type, etc from the UI 
interface

- dummy page "Stream Setting" page for the test
- StreamSetting model is added
- set owner and group as 'pypo' for liquidsoap.cfg
- pypofech handle 'update_stream_setting' command
 2011-08-15 16:10:46 -04:00
martin 84ec62eeca CC-1942: Add ability to set timezone in preferences 
-Can change the timezone for PHP. Need to change for python as well.
 2011-08-15 10:06:42 -04:00
James b9d969e45a CC-2656: Change user manual link on help page 
- done
 2011-08-09 11:35:25 -04:00
James 968c0f96a2 CC-2651: import idicator 
- Threshold is 10 seconds
- record timestamp once every 5 seconds
- "File import inprogress..." displays above search box
- pyinotify read_freq changed to 0.1 from 1
 2011-08-09 10:40:10 -04:00
James f95e881ec5 CC-2501:Registration:wording changes 
- fixed
 2011-07-14 16:06:13 -04:00
james 947647ed89 CC-2506:'choose folder' should be 'Choose folder' 
-fixed
 2011-07-06 13:50:32 -04:00
james acf5dbd6df CC-2515:Phone Home Metric:prevent parent window refreshing 
- fixed.
 2011-07-06 11:32:57 -04:00
james daf6f9963f CC-2511:Phone Home Metric: add error display on popup 
- refactoring was needed to solve this problem.
- javascript error check is not necessary anymore.
- The form is preloaded to nowplaying page, only when
it's needed, hence ajax call to pull up the form is not
needed anymore.
 2011-07-05 15:53:50 -04:00
james 5e93bb999e CC-2501:Registration wording changes 
- modified text and look on preferences
 2011-07-04 17:54:33 -04:00
martin ae156c85b4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-07-04 14:29:19 -04:00
martin 429d8b234c cc-2419: media monitor import on startup 
-new method of querying db on startup.
 2011-07-04 14:29:09 -04:00
james 4ca7b3cf16 CC-2501:registration-workding-change 
- temp commit. Styling is still broken
 2011-07-04 13:07:46 -04:00
james 2bc108e8ae CC-2504:Show me box in preferences does not show promotinal data 
-fixed
 2011-07-04 12:54:10 -04:00
james 7cc6e54f21 CC-2461:Change text of OK in Manage Music Folders 
-fixed
 2011-06-29 17:36:11 -04:00
james 43c8a28633 CC-2455:Show what i am sending heading 
-fixed
 2011-06-29 17:28:51 -04:00
james f9f6296e2c CC-2466 Manage Music Folders should be Manage Media Folder 
-fixed
 2011-06-29 16:40:49 -04:00
james a018466b80 CC-2468:Manage Users Say DJ and add show says host 
-fixed
 2011-06-29 16:33:20 -04:00
james cfeff13c4e - changing word 'publicise' to 'promote' 2011-06-27 16:04:28 -04:00
Naomi Aro e8265614ba CC-2456 : Multiple storage folders show up on the same line 2011-06-27 18:05:28 +02:00
Naomi Aro 4a478117c6 CC-2411 : Interface for Music Folders Preferences 
applying html/css changes to music folder preference page.
 2011-06-27 11:46:23 +02:00
James c5ec6b5a53 CC-2425:Tweak phone home 
- privacy check box is uncheck by defalut
- 'Yes' button is disabled on popup form by default
- custom error msg is added for privacy checkbox on preference
form
- promote form is hidden by default
 2011-06-26 23:13:49 -04:00
James 1243c60442 CC-2425:Tweak phone home 
- removed original privacy text
 2011-06-26 01:54:05 -04:00
James a936212355 Merge branch 'cc-2425-tweak-phone-home' into devel 2011-06-26 00:45:30 -04:00
James 194ad31c9f CC-2425:Tweak phone hom 
- done
 2011-06-26 00:45:02 -04:00
James cc542797c7 CC-2425:Tweaks to phone home metric 
- Done
 2011-06-24 17:26:37 -04:00
James cace4c6d89 CC-2446:Crash in playlist builder 
- fixed.
 2011-06-24 17:00:59 -04:00
James eef1927f07 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-24 16:30:05 -04:00
James b83420874c CC-2425:Tweak phone home stat 
- fixed as requested. Just need to add the link
 2011-06-24 16:29:24 -04:00
martin a5d2597875 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-24 16:02:01 -04:00
martin 21cf476bfb cc-2444: audio preview is broken 2011-06-24 16:01:40 -04:00
James e05645f523 CC-2415:Subsecond offset 
- temp commit. not sure what needs to be done yet
 2011-06-24 12:29:55 -04:00
Naomi Aro fbf5f85509 CC-2423 Undefined property in StoredFile::$md 
uses the new file metadata access now.
 2011-06-24 10:40:31 +02:00
James Moon 3c3850db29 CC-2305:Create playlist out of range 
- HTML is fixed as Valdimir requested.
- CSS is fixed.
 2011-06-22 23:37:26 -04:00
james 3dcb10c931 - adding link to who's using page( it was remove somehow ). 2011-06-21 11:20:02 -04:00
Naomi Aro 6adce1ba45 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
adding ability to move stor directory.
 2011-06-21 14:58:38 +02:00
Naomi Aro 253eb811c7 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
 2011-06-21 11:20:35 +02:00
Naomi Aro b6888489e0 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
adding music dirs concept to Airtime. New cc_music_dirs table/class.
 2011-06-21 10:24:02 +02:00
James Moon dd4ea127fc CC-1724:Phone home statistic 
- Fixed the bug where it didn't populate country dropdown box
This was due to default sql not popuplate country table correctly
- Changed 180*180 min log text to 200*200
- Changed text are size in support settings
- Client now sends base64encoded image to server.
 2011-06-20 20:31:20 -07:00
james 05dc48fa71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php
 2011-06-20 18:09:37 -04:00
james e762633405 CC-1724:Phone home statistics 
- Final commit for client side.
 2011-06-20 17:58:38 -04:00
Naomi Aro ea21da6b61 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
recursively copying the audio_samples directory.
 2011-06-17 17:54:36 +02:00
james 5adfb79981 CC-1724:Phone home statistics 
Temp commit
 2011-06-15 17:51:44 -04:00
james cf654f1a45 CC-1724:phone-home-statistics 
Rebase from devel into this branch
 2011-06-15 12:06:50 -04:00
james 11b601308e CC-1724:Phone home statistics 
Temp commit
 2011-06-15 11:17:03 -04:00
james ad3ef3ec30 CC-2255: Separate user types admin and program manager 
- New user type 'Program Manager' added
- 'Program Manager' gets same previlage as Admin but doesn't
have access to Configure menu
- Changed user type name 'Host' to 'DJ'
 2011-06-07 14:31:39 -04:00
james 75ffe91325 CC-1919:Playlist builder show time offset 
Fixed.

- I wasn't sure if I had to wait for html/css code from Vladmir.
I just did what I could do.
 2011-05-31 16:49:01 -04:00
Naomi d4a4c4be2a CC-1939 Ability to edit name & description of a playlist, display the description somewhere 
now can edit title/description of a playlist without leaving the main playlist builder screen
 2011-05-18 14:33:41 -04:00
martin 1d8f323a27 cc-2235: help says right-click to add playlist to show 
-fixed
-also renamed "Add Audio" to "Add Media"
 2011-05-17 13:55:51 -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
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
martin 4b7ea32c7d -syntax errors discovered by eclipse 2011-04-21 17:23:59 -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
Naomi b992801a45 hiding/showing show overflow message properly. 2011-04-15 12:11:06 -04:00
Naomi eb312ae454 fixes to template, javascript to handle error arrays. 2011-04-15 10:51:06 -04:00
Naomi c3a02e2569 some fixes to display rows in form. 2011-04-15 10:04:16 -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