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

2980 Commits

Author SHA1 Message Date
denise 30b64f81fd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-23 10:41:09 -04:00
denise c99e1b892c CC-84: Smart Playlists 
-divided criteria into sub form to handle multiple sets
 2012-07-23 10:40:53 -04:00
Martin Konecny 255866d240 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Show.php
 2012-07-22 19:18:53 -04:00
Martin Konecny aaa0c01e01 CC-4120: memory optimizations for calendar page. 
-can now fetch over a year of data at a time
 2012-07-22 19:14:29 -04:00
James ef64ce2b73 CC-4112: Smart Playlist: Cannot search Long string 
- added length validator
- extra fix: Due to lazy loading, aggregated field on playlist was not
updated properly.
 2012-07-20 15:32:46 -04:00
denise 9bdb4a40e0 CC-84: Smart Playlists 
-fixed playlist type spacing on UI
 2012-07-20 12:32:18 -04:00
denise a67b2fa300 CC-84: Smart Playlists 
- removed soundcloud_id criteria
- added last_played criteria
 2012-07-20 11:25:54 -04:00
denise d801139a12 CC-84: Smart Playlists 
- utime and mtime in library were displaying in UTC
 2012-07-19 19:11:42 -04:00
denise 14712d4d78 CC-84: Smart Playlists 
- fixed undefined index warnings
 2012-07-19 19:09:51 -04:00
denise 624986e973 - removed unnecessary logging line 2012-07-19 18:11:31 -04:00
denise 8e60aec601 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-19 18:07:55 -04:00
denise 647de9ed39 CC-84: Smart Playlists 
- started storing last played time in cc_files
- db column (lptime) already existed but was not being used before this
- will use this as a criteria for smart playlists
 2012-07-19 18:07:39 -04:00
James 2e7cf68777 CC-4110: Smart Playlist: some search criteria don't work 
- added bunch of validation
- fixed a bug with range modifier not working correctly
 2012-07-19 16:57:24 -04:00
denise 9fcc851523 CC-84: Smart Playlists 
-hides playlist content if dynamic instead of disabling
-show the user how many files match specified criteria
 2012-07-19 14:52:39 -04:00
James 0322e6b0c6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-19 14:45:34 -04:00
James 82f087c84d CC-84: Smart Playlists 
- changed db query so it's lazy loading
 2012-07-19 14:45:15 -04:00
Rudi Grinberg 1f603bb75b cc-4105 : merge devel into my branch 2012-07-19 10:51:04 -04:00
James 6fc41ee4bf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-18 16:12:20 -04:00
James 266d86d9e4 CC-84: Smart Playlists 
- fixed a bug
- change LIKE to ILIKE
 2012-07-18 16:12:06 -04:00
denise 2d8a9188eb CC-84: Smart Playlists 
- qtip wasn't showing up on 'new' and 'edit' events
- changed 'Artist' to 'Creator' to be consistent with library
 2012-07-18 15:48:15 -04:00
James 9516771099 Merge branch 'cc-84-smart-playlist' into devel 
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Scheduler.php
 2012-07-18 12:23:57 -04:00
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
Rudi Grinberg c23023bcd9 Removed irrelevant comment 2012-07-17 16:43:04 -04:00
Rudi Grinberg 25d3028fb1 cc-4105: added testing support for api client and ApiController 2012-07-17 16:43:04 -04:00
Rudi Grinberg 531dfe2b5e cc-4105: fixed up python media monitor request parameter for recorded shows\n.Added more input validation in php controller 2012-07-17 16:43:04 -04:00
Rudi Grinberg 0ddc8497c3 cc-4105: small improvement in reloadMetadataGroupAction. We give more detailed responses and log bad requests in a little more detail as well 2012-07-17 16:43:04 -04:00
Rudi Grinberg f348652f0e cc-4105: reloadMetadataGroupAction seems to be ready for production.\nSet the parameter correctly after finishing the debugging from the python side 2012-07-17 16:43:04 -04:00
Rudi Grinberg fdf921bbaf cc-4105: Made reloadMetadataGroupAction safer by validating input 2012-07-17 16:43:04 -04:00
Rudi Grinberg 01448d42df cc-4105: added some comments to describe development 2012-07-17 16:43:04 -04:00
Rudi Grinberg b0f5b722db cc-4105: fixed typo.\nadded some error checking in case bad parameters are given to dispatchMetadataAction 2012-07-17 16:43:04 -04:00
Rudi Grinberg 98b4e3c47b cc-4105: Tweaked php method to have more consistent return values 2012-07-17 16:43:04 -04:00
Rudi Grinberg aa298453b7 cc-4105: removed useless comments 2012-07-17 16:43:04 -04:00
Rudi Grinberg eb00b5cbb3 cc-4105: renamed controller action and method to correct name 2012-07-17 16:43:04 -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
Martin Konecny 1bd07eeaca Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/models/ServiceRegister.php
 2012-07-17 15:00:53 -04:00
Martin Konecny eba4b688c4 User Patch: If a callback is not given, then just provide the raw JSON. 
Submitted by Ross Masters <ross@rossmasters.com>
 2012-07-17 14:47:13 -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
Vladimir 1e76845e9c more sophisticated remote_addr determining 2012-07-17 13:34:48 -04:00
James 7c07bf146c Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-17 11:07:38 -04:00
James a4ba776b0f CC-84: Smart Playlists 
- save playlist type to db
- on edit type is loaded
 2012-07-17 11:07:16 -04:00
denise e0a674a96c CC-84: Smart Playlists 
-added save button for static playlists
 2012-07-16 18:24:46 -04:00
Rudi Grinberg 20e32b98ba Merge branch 'devel' into mediamonitor2 
Conflicts:
	python_apps/api_clients/api_client.py
 2012-07-16 17:41:36 -04:00
Rudi Grinberg 1804531e84 removed comment 2012-07-16 17:19:11 -04:00
James fc09baacd7 CC-84: Smart Playlists 
- static playlist is done.
 2012-07-16 17:18:37 -04:00
Rudi Grinberg a1c205edff cc-4105: Removed wrong error handling from api_client. Split up controller action to make it reusable through other actions 2012-07-16 16:43:48 -04:00
Rudi Grinberg 1c084a3101 moved misplaced docstring 2012-07-16 15:47:44 -04:00
Rudi Grinberg d08b62dd39 cc-4105: removed dead code path 2012-07-16 15:25:45 -04:00
Rudi Grinberg 723e6356bc Merge branch 'mediamonitor2' of dev.sourcefabric.org:airtime into mediamonitor2 2012-07-16 14:58:34 -04:00
Rudi Grinberg a9f6bb3b5c cc-4105: changed error handling from returning none to throwing exception 2012-07-16 14:58:23 -04:00
denise 1bb97c8603 CC-84: Smart Playlists 
- ui clean-up
 2012-07-16 14:44:50 -04:00
Martin Konecny 4ebcb1b1f9 Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/models/Playlist.php
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
 2012-07-16 14:31:03 -04:00
Martin Konecny 312f35ae48 CC-430: Audio normalization (Replaygain Support) 
-change default database value to null
 2012-07-16 12:10:42 -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
Rudi Grinberg 3e24b71436 removed wrong comments 2012-07-16 10:31:00 -04:00
Martin Konecny ce1a63f47d CC-430: Audio normalization (Replaygain Support) 
-small bug fixes
 2012-07-15 22:55:52 -04:00
Martin Konecny 583695f98c CC-430: Audio normalization (Replaygain Support) 
-values are now written through to database
 2012-07-15 22:22:42 -04:00
Martin Konecny 39760f8494 CC-4090: Make code style PSR compliant 2012-07-15 22:22:07 -04:00
Martin Konecny 632f039977 CC-430: Audio normalization (Replaygain Support) 
-values are now written through to database
 2012-07-15 22:19:55 -04:00
Martin Konecny b4f1cc13c0 CC-430: Audio normalization (Replaygain Support) 
make code simpler (don't download database to file)
 2012-07-15 22:19:16 -04:00
Rudi Grinberg 71dc7d99b4 cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method 2012-07-15 22:17:36 -04:00
Rudi Grinberg 44d91f7798 cc-4105: clean up url construction in api client 2012-07-15 22:17:36 -04:00
Rudi Grinberg 0fd6c4adbf fixed typo 2012-07-15 22:17:36 -04:00
Rudi Grinberg 9f1ec3c05c created a new controller action for chunked requests from media monitor 2012-07-15 22:16:58 -04:00
Martin Konecny 794cf2c845 CC-4090: Make code style PSR compliant 
-run psr-cs-fixer
 2012-07-15 21:17:13 -04:00
Martin Konecny 5661872034 checkAuth in init() function 2012-07-15 21:07:34 -04:00
Rudi Grinberg 8340079b95 cc-4105: added a method in API client corresponding to chunked requests.\nAlso add prepared corresponding apicontroller method 2012-07-13 17:57:18 -04:00
Rudi Grinberg 47893865cc cc-4105: clean up url construction in api client 2012-07-13 16:32:17 -04:00
James 601263b7a0 CC-84: Smart Playlists 
- adding propel files for playlistcriteria table
 2012-07-13 16:16:07 -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
Rudi Grinberg 3b708fae6a fixed typo 2012-07-13 14:54:04 -04:00
Rudi Grinberg a6d51bea8d created a new controller action for chunked requests from media monitor 2012-07-13 14:51:43 -04:00
denise 971b4cf7cf Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-13 14:32:31 -04:00
James bf46605ea1 CC-84: Smart Playlists 
- changing field name in backend
- diabled loading criteria on edit temporarly
 2012-07-13 14:32:05 -04:00
denise fcc4c1f9af CC-84: Smart Playlists 
-fixed merge conflict
 2012-07-13 14:26:17 -04:00
James 207582eb7e CC-84: Smart Playlists 
- temp commit
 2012-07-13 14:23:30 -04:00
James 3bce6b4999 CC-84: Smart Playlists 
- db inserting into cc_playlistcriteria
- error validations
 2012-07-12 17:58:44 -04:00
Martin Konecny f0f033b4fb CC-430: Audio normalization (Replaygain Support) 2012-07-12 17:58:29 -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
James 64857410a6 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-12 15:28:11 -04:00
James f0134ba3fa CC-84: Smart Playlists 
- validation on server side
- getting list of files from db which satisfies criteria
 2012-07-12 15:27:51 -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
James 470fef80ba Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-12 12:05:51 -04:00
Martin Konecny 8f6d6058a2 CC-4100: Make number of shows displayed in widget customizable 
-removed Logging message
 2012-07-11 19:33:19 -04:00
Martin Konecny bd51b4db02 CC-4100: Make number of shows displayed in widget customizable 
-fixed
 2012-07-11 19:31:24 -04:00
denise e8a2f23856 CC-84: Smart Playlists 
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
 2012-07-11 18:53:28 -04:00
James 393495433f Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 16:17:22 -04:00
denise c27b886817 CC-84: Smart Playlists 
-0-indexed form elements
 2012-07-11 16:15:44 -04:00
James d52c079606 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 16:14:59 -04:00
James 93b34bb079 CC-84: Smart Playlists 
- controller skeleton
- playlist model dummy functions
 2012-07-11 16:14:11 -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 5fb0364f2d CC-84: Smart Playlists 
-switched action names for static/dynamic
 2012-07-11 11:57:13 -04:00
denise fe75ba0e93 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 11:50:52 -04:00
denise 1afe1e4d32 CC-84: Smart Playlists 
-added in save/generate functionality in the UI
 2012-07-11 11:50:40 -04:00
Martin Konecny 646e028037 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 10:47:14 -04:00
denise 4bed5e647e CC-84: Smart Playlists 
-moved smart_playlistbuilder.js into playlist folder
 2012-07-11 10:45:24 -04:00
denise a1ceb4bfa0 CC-84: Smart Playlists 
-added in 'Add' and 'Remove' form elements functionality on the UI
 2012-07-11 10:42:51 -04:00
denise b7cd90bc28 CC-84: Smart Playlists 
-created form and view script
 2012-07-11 10:42:51 -04:00
Martin Konecny 7ce4934cdc CC-4090: Make code style PSR compliant 
-removed all trailing whitespace in forms directory
-replace all tabs with 4 spaces
 2012-07-10 18:55:44 -04:00
Martin Konecny d9cde230cd CC-4090: Make code style PSR compliant 
-removed all trailing whitespace
 2012-07-10 18:53:06 -04:00
Martin Konecny ee3447f903 CC-4090: Make code style PSR compliant 
-User.php
-removed all trailing whitespace
 2012-07-10 18:51:32 -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
James 24a90700a1 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by 
others on some situation.
 2012-07-10 17:24:57 -04:00
James f174a2bcf3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 17:09:46 -04:00
James 39506740eb CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by 
others on some situation.

- fixed
 2012-07-10 17:09:21 -04:00
Martin Konecny f072be5d0e Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 16:41:48 -04:00
Martin Konecny 6d98cca9c3 SAAS-270: Apache2 errors on SaaS 
-no reason to pass $pl since it is not even used. Fixed
 2012-07-10 16:41:30 -04:00
denise 72dd48e33e CC-84: Smart Playlists 
-created form and view script
 2012-07-10 15:25:29 -04:00
James d90d83200e Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 15:12:27 -04:00
James 62b0fec595 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by 
others on some situation.

- fixed
 2012-07-10 15:11:59 -04:00
denise 69bbc53b98 CC-4037: Remove SaaS specific code from Airtime codebase 
-removed live chat popup
 2012-07-10 15:09:28 -04:00
Martin Konecny 3d243468a7 CC-4090: Make code style PSR compliant 
Subjects.php
 2012-07-10 10:36:53 -04:00
Martin Konecny dc2b4fed0a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-10 10:19:35 -04:00
Martin Konecny 00a2a19833 CC-4090: Make code style PSR compliant 
Subjects.php
 2012-07-09 23:41:00 -04:00
Martin Konecny e91c96b90e CC-4090: Make code style PSR compliant 
StreamSetting.php
 2012-07-09 23:32:21 -04:00
denise 6369c85ed1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-09 14:50:49 -04:00
denise c6c0a70152 CC-4075: Calendar -> Can create overlapping show by repeating show 
-fixed
 2012-07-09 14:50:35 -04:00
James c279e008d0 Merge branch '2.1.x' into devel 2012-07-06 15:52:09 -04:00
James 63856ea918 CC-4079: Apache error: missing $startDt variable 
- fixed
 2012-07-06 15:40:16 -04:00
denise e4fb42cbd0 CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show. 
-done
 2012-07-06 15:26:51 -04:00
Martin Konecny 24349e64d8 CC-430: Audio normalization (Replaygain Support) 
-some minor fixes for default value (should be 0 dB not 1dB)
 2012-07-05 23:30:53 -04:00
Martin Konecny 5c1af49252 CC-430: Audio normalization (Replaygain Support) 
-Added support on Liquidsoap side
 2012-07-05 23:24:34 -04:00
Martin Konecny ce698d4123 CC-430: Audio normalization (Replaygain Support) 
-Added support on server side
 2012-07-05 22:37:40 -04:00
James 9bc1c66fe3 CC-2747: If the file contains '\' in its meta title, airtime doesn't 
detect duplicate

- fixed
- extra fix: there was also problem with web UI upload and it's fixed
see the comment on the ticket for more detail.
 2012-07-05 15:27:49 -04:00
denise 1cbb0345b3 improved error message for overlapping shows 2012-07-05 11:33:03 -04:00
denise 4441bf18b7 CC-4072: Improve the check overlapping shows function 
-done
 2012-07-05 11:24:49 -04:00
denise 771974433b CC-4071: Prevent shows from overlapping on drag and drop in calendar 
-done
 2012-07-05 11:01:48 -04:00
denise 1fa3da5bd0 CC-4069: Edit Show -> cannot edit show 
-fixed
 2012-07-04 18:58:22 -04:00
denise cbf026412c CC-4056: Add Show -> Prevent shows from overlapping 
-done
 2012-07-04 11:34:18 -04:00
denise 598bf8942c Merge branch '2.1.x' into devel 2012-07-03 14:57:16 -04:00
james 7342ea4d4b CC-4053: Widget not showing correct day on Sunday 
- fixed weekly widget
- also fixed today's show widget
 2012-07-03 13:17:48 -04:00
denise 3e75b28c9d Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
 2012-07-03 10:42:29 -04:00
denise 46604fdf59 CC-4046: Timeline -> cannot drag and drog song into the posion between song's name and "show empty" 
-fixed
 2012-06-29 16:59:03 -04:00
denise 7ea106e0d3 CC-4051: Library -> First character gets cut off of file name when downloading a track from a watched folder 
-fixed
 2012-06-29 16:02:27 -04:00
James 6d823d01ab CC-4042: Media Library -> Non-admin user cannot see "File import in progress" 
- fixed
 2012-06-29 12:49:59 -04:00
James b425fbd894 CC-4045: Logging: add file name and line number on logging function 
- done
 2012-06-29 12:47:14 -04:00
denise 001f0790f9 Merge branch '2.1.x' into devel 2012-06-29 12:26:45 -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 0b069c2f54 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-29 10:56:55 -04:00
James a8792a7b97 CC-4042: Media Library -> Non-admin user cannot see "File import in progress" 
- fixed. See the comment for more detail.
 2012-06-29 10:55:19 -04:00
denise 38cb439f53 CC-4036: Timeline -> A new Cursor will be selected when there are 2 shows and we add/delete items in timeline view 
-fixed
 2012-06-28 17:55:17 -04:00
James 6c83633933 CC-4008: Inconsistent button labels for Play/Preview in Now Playing page 
- changed everyting to "Preview"
 2012-06-28 13:33:01 -04:00
James d13ade977a CC-4034: Files on Watched folder shouldn't be deleted physically. 
- fixed
 2012-06-28 13:28:45 -04:00
james 443537b2db CC-4020: Apache error found: Undefined variable: switch_start 
- fixed
 2012-06-27 22:50:46 -04:00
denise 8141dec3b5 CC-3975: Media Library: Try to download files from watched folder, the filename will be "true" 
-added comment
 2012-06-27 15:13:03 -04:00
denise d5a5bdd310 CC-3975: Media Library: Try to download files from watched folder, the filename will be "true" 
-added comment
 2012-06-27 14:57:47 -04:00
denise bdaa64d4d1 CC-3975: Media Library: Try to download files from watched folder, the filename will be "true" 
-fixed (originally scheduled for 2.2 - adding for 2.1.3)
 2012-06-27 13:13:07 -04:00
denise 1300593e8b CC-3975: Media Library: Try to download files from watched folder, the filename will be "true" 
-fixed
 2012-06-27 13:03:22 -04:00
denise 4015949d2a CC-3933: Replace Airtime version number in source code with a hash of the version + uniqueId. 
-done
 2012-06-27 10:27:53 -04:00
Martin Konecny a63b765621 CC-4011: System -> Media Folders: Changing page will stop removing a watched folder with lots of files (50,000) 
-Changed doing 50,000 database calls to 1.
 2012-06-25 23:40:07 -04:00
Martin Konecny 84f867a00f Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-25 18:31:07 -04:00
Martin Konecny b8c559db58 add time to our version so cache is never used in dev branch 2012-06-25 18:30:33 -04:00
denise 8005049bdc CC-3996: Undefined offset: 0 in StoredFile.php (Apache error) 
-fixed
 2012-06-25 12:22:34 -04:00
denise ffb7f2ff65 CC-3933: Replace Airtime version number in source code with a hash of the version + uniqueId. 
-done
 2012-06-22 18:01:00 -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 f029124447 Merge branch '2.1.x' into devel 2012-06-19 17:57:27 -04:00
denise 9ac024fa72 CC-3993: Validate that reporting stats are correct on Airtime PRO instances 
-done
-if no log data for the past 24 hours, update current record with current date, and delete old records
 2012-06-19 16:59:59 -04:00
denise b742033647 - Add Media: fix to accept audio files with ID3 tags liquidsoap complains about 2012-06-18 12:24:13 -04:00
denise f3d0f06397 - Add Media: reverted change to testing audo file with liquidsoap (will fix in 2.1.x) 2012-06-18 12:00:54 -04:00
denise 186b8ef1c2 CC-3975: Media Library: Try to download files from watched folder, the filename will be "true" 
-fixed
 2012-06-15 16:48:51 -04:00
denise b0e93005e5 Merge branch '2.1.x' into devel 2012-06-15 15:04:18 -04:00
denise bb54a9041f CC-3986: 'Add User' does not convert email address to lowercase 
-done
 2012-06-15 15:03:48 -04:00
denise 87faf47c94 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-15 14:42:37 -04:00
denise d02607ed94 CC-3561: Add button to automatically rescan watched folders. 
-done
 2012-06-15 12:16:19 -04:00
James 81fb7699a4 CC-3985: Email field on User creation should be required. 
- done
 2012-06-14 16:11:14 -04:00
James 73a7a76078 Merge branch 'CC-3963' into 2.1.x 
Conflicts:
	airtime_mvc/public/js/airtime/preferences/streamsetting.js
 2012-06-14 16:06:53 -04:00
denise 70bfe031ef Merge branch '2.1.x' into devel 
Conflicts:
	airtime_mvc/application/models/Email.php
 2012-06-14 15:30:33 -04:00
denise 6b990f8712 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into devel 2012-06-14 13:45:14 -04:00
denise 295a8ea5fe CC-3561: Add button to automatically rescan watched folders. 
-done
 2012-06-14 13:44:56 -04:00
denise f433fd89fe CC-3970: Password Reset: No UI error msg for no mail server founded 
-done
 2012-06-13 16:04:57 -04:00
James b07b83f740 CC-3981: Record Show: Change streams settings during recording will 
cause record fail

- added warning message
 2012-06-13 14:44:38 -04:00
denise 9cabd4d32c CC-3921: Add mobile phone number field to user record 
-done
 2012-06-13 13:39:54 -04:00
James 4077858c8e CC-3927: Should automatically switch back to Master/Show stream if there 
is a connection interruption

- chaning label and description text
 2012-06-13 12:46:26 -04:00
Martin Konecny f188eeada2 preparation for 2.1.1 release 2012-06-13 11:35:14 -04:00
denise 9b31a6daac Merge branch '2.1.x' into devel 2012-06-13 10:10:05 -04:00
Martin Konecny 02b6d04952 CC-3956: PHP script can enter inifinite loop 
-small cleanup
 2012-06-12 20:18:06 -04:00
Martin Konecny d1c224321b Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-12 18:51:31 -04:00
Martin Konecny b858c34526 CC-3956: PHP script can enter inifinite loop 
-fixed
 2012-06-12 18:51:22 -04:00
James 776e35dfa9 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-12 17:49:52 -04:00
James 548a6ce16a CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday 
- bug fix
 2012-06-12 17:49:34 -04:00
denise f3b925daa2 CC-3412: Icecast stream name not defined 
-done
 2012-06-12 17:08:36 -04:00
denise 8b2353ede0 Merge branch '2.1.x' into devel 2012-06-12 15:49:18 -04:00
denise 55634ddd46 CC-3928: Use liquidsoap to test whether file is playable on upload. 
-done
-tests return value and output
 2012-06-12 15:41:10 -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 df518fb03f Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-12 14:58:51 -04:00
denise b588b3b9a4 CC-3849: PlaylistLibrary->Edit Metadata: The deletion of metadata entries has no effect after saving 
-set track_number as a required field on form
 2012-06-12 14:40:18 -04:00
Martin Konecny 22453f3820 CC-3968: Cannot preview file as * .MP3 
-fixed
 2012-06-12 11:31:10 -04:00
denise d66ba4074c Merge branch '2.1.x' into devel 2012-06-11 18:11:09 -04:00
denise d8a1a17f19 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-11 18:08:47 -04:00
denise 81c7eb7763 CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked 
-fixed
 2012-06-11 18:08:36 -04:00
Martin Konecny 2ebf149a65 CC-3949: On edit empty show, time_filled becomes null 
fix method of checking null
 2012-06-11 17:08:17 -04:00
denise 1b057c8954 Merge branch '2.1.x' into devel 2012-06-11 16:49:03 -04:00
James 06d90c53aa CC-3957: Make Schedule Widgets show future Sunday instead of past Sunday 
- fixed
 2012-06-11 16:42:12 -04:00
James 6316c23b25 CC-3954: apache log errors part3 
- bug fix
 2012-06-11 16:10:51 -04:00
James 31000afbf3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-11 15:52:58 -04:00
James c78ba0faf6 CC-3954: apache log errors part3 
- fixed
 2012-06-11 15:52:39 -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
James 62eee61d4e CC-3956: PHP script can enter inifinite loop 
- fixed
 2012-06-08 17:58:21 -04:00
James 0bae3f9038 CC-3949: On edit empty show, time_filled becomes null 
- fixed
 2012-06-08 16:18:27 -04:00
James e661f400a4 CC-3950: apache log errors part2 
- fixed
 2012-06-08 15:31:45 -04:00
James 628f1518a7 CC-3906: PlaylistLibrary-> user can not delete track which has been already 
played even after cancelling the show.

- fixed
 2012-06-08 15:24:37 -04:00
James 1625cc6a25 CC-3948: Dashboard -> Source Info panel: Cannot turn off source if 
source is disconnect.

- fixed
 2012-06-08 15:14:30 -04:00
denise 7d4851573f CC-3951: Password Reset: You can still reset password even after system email for Password Reset disabled 
-fixed
 2012-06-08 13:09:14 -04:00
Martin Konecny 0416c05f9c add reason why Propel connection failed 2012-06-08 12:06:54 -04:00
denise b586d69d09 CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show. 
-fixed
 2012-06-08 11:39:04 -04:00
denise 951bd3c9b5 CC-3933: Remove version number and date strings from login page footer, add robots.txt 
-done
 2012-06-08 10:51:10 -04:00
James 3b9f6f12de CC-3834: System -> Stream Settings: click "save" will cause some errors in 
zendphp.log

- removed logging
 2012-06-08 10:33:06 -04:00
James 7228dc9eb0 CC-3869: Source Streams: Please give Guest and DJ user clear error message 
when they try to shut off Scheduled Play stream

- fixed
 2012-06-07 14:27:12 -04:00
James fb48184629 CC-3875: Dashboard: User shouldn't be able to set currently playing shows end time in the past 
- fixed
 2012-06-07 12:25:21 -04:00
James 3c7f3d52e1 CC-3864: Calendar -> Edit show: Can edit the start time of current playing show 
- bug fix. In case of this error, we should maintain the original start time.
 2012-06-07 12:14:22 -04:00
James 2bf6408d90 CC-3864: Calendar -> Edit show: Can edit the start time of current playing show 
- fixed
 2012-06-06 18:23:27 -04:00
James ec6ff4c9e6 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-06 17:32:10 -04:00
James e5d5f44813 CC-3905: Playlist Library -> the delete tracks button is enabled for DJ 
users and PM's

- done
- PM should have full control on the library
- DJ is only allowed to edit/delete playlist that they created.
no action on files except play or add to their own playlist
 2012-06-06 17:31:51 -04:00
denise d8a75cf5c6 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-06 17:06:54 -04:00
denise fda04295a6 CC-3941: Overridden connection url in stream settings gets reverted back to default when 'Save' is clicked 
-fixed
 2012-06-06 17:06:46 -04:00
James e35692e588 CC-3939: Media Library -> Edit Metadata: click 'Cancel' will keep in editing 
page after error message appears

- fixed
 2012-06-06 16:28:41 -04:00
James fb533bed07 CC-3855: System -> Support Feedback: Cannot uncheck 'Promote my station 
on Sourcefabric.org' if it's checked then saved.

- fixed
 2012-06-06 14:26:23 -04:00
James bcf3f0014f Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-06 14:19:15 -04:00
James 0ca45e343b CC-3878: Recorded media file's track number is changed after restarting media-monitor 
- fixed
 2012-06-06 14:18:54 -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
denise 226ef262ba CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show. 
-retreived hours and minutes via preg_match()
 2012-06-06 10:31:49 -04:00
Martin Konecny 68deba81d9 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-05 22:30:50 -04:00
Martin Konecny d4b1fc711e CC-3928: Use liquidsoap to test whether file is playable on upload. 
-change to wording
 2012-06-05 22:30:17 -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 8b71ed6078 CC-3850: Use qTip instead of custom tooltips 
-removed description from cb_airtime_auth and cb_custom_auth
-description is no longer needed since we use qtips
 2012-06-05 14:49:31 -04:00
denise 5966c7feda fixed merge conflit 2012-06-05 14:47:11 -04:00
denise 35be145043 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-05 14:41:19 -04:00
denise df3a74b501 CC-3850: Use qTip instead of custom tooltips 
-removed description from icecast_vorbis_metadata element
 2012-06-05 14:40:40 -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 74e9f70506 CC-3928: Use liquidsoap to test whether file is playable on upload. 
-done
 2012-06-05 11:24:40 -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 990dea12a4 CC-3895: Sometimes Media Monitor will not update the length of tracks with the same title but different contents. 
-fixed
 2012-06-05 11:20:00 -04:00
denise c1976162cb CC-3793: "Star time" check will block updating shows when error found in colour settings 
-fixed
 2012-06-05 11:19:59 -04:00
denise 19d5655779 CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show. 
-fixed to only allow 24h or less
 2012-06-05 11:19:59 -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
denise 3566480999 CC-3888: Record Show: ON AIR light and scheduled Play will ON for several seconds when a record show starts 
-fixed
 2012-06-05 11:19:59 -04:00
Martin Konecny b6446442ba CC-3917: record_date field in recorded shows causing problem 
-fixed
 2012-06-04 11:43:41 -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
Martin Konecny 89c0583849 CC-3926: System -> Stream setting: input ' into "Name/Description" will cause PDOException 2012-06-03 22:39:42 -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
denise f23582612a SAAS-247: Stream settings wipes out master/show source settings if is a SAAS instance 
-fixed
 2012-05-28 15:41:59 -04:00
Naomi Aro 396795e70e CC-3879 : Now Playing-> Guest's clicking on Preview pops up error window 2012-05-28 17:59:26 +02:00
denise 561934c8ef SAAS-244: Live chat box appears in stream-player and preview windows 
-fixed
 2012-05-25 16:23:33 -04:00
denise f35f561f67 CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent 
- removed 'SAAS'
 2012-05-25 10:49:40 -04:00
Naomi Aro d91850b1ca CC-3877 : Now Playing-> Show manipulation buttons should be disabled for guest user and DJ's who are not assigned to the show 2012-05-24 18:10:36 +02:00
Naomi Aro 8b4c876c5b CC-3884 : UI constantly refreshes when filtered by a show in a timerange 2012-05-24 17:33:15 +02: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
Martin Konecny eb4207dd1d CC-3863: Stats should not send version number with extra characters 
-fixed
 2012-05-23 17:25:16 -04:00
James b28a700005 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-23 17:17:00 -04: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
denise 80998f2eac Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-23 16:19:06 -04:00
denise 28a383e960 - fixed check for currentShow's end boundary to only be greater than current time 2012-05-23 16:18:59 -04:00
Martin Konecny 1edfb097da Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-23 16:17:37 -04:00
James 01439663d9 CC-3863: Stats should not send version number with extra characters 
- fixed
 2012-05-23 15:06:22 -04:00
James a969599986 CC-3858: Record and Rebroadcast Creation Problem\ 
- fixed
 2012-05-23 14:55:55 -04:00
Martin Konecny 4608f04140 remove useless logging 2012-05-23 00:43:05 -04:00
James 164c158c80 CC-3859: Playout History: Filter out songs that are not played out 
- done
 2012-05-22 17:39:27 -04:00
denise 453b343284 SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting 
- fixed setting end_time
 2012-05-22 16:53:04 -04:00
Martin Konecny b2f39ae66b CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier) 
-introduced small problem, now fixed
 2012-05-22 16:33:18 -04:00
James c7a551fe84 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-22 16:13:11 -04:00
James 6da923ace1 CC-3859: Playout History: Filter out songs that are not played out 
- db change and upgrade.
 2012-05-22 16:11:25 -04:00
Martin Konecny 6b44792c11 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-22 12:22:11 -04:00
Martin Konecny bbd694eb10 CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier) 
-introduced small problem, now fixed
 2012-05-22 12:22:03 -04:00
Naomi Aro 428b13f3d7 CC-3803 : Don't allow editing of a current Record show 2012-05-22 17:51:53 +02: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
Martin Konecny f485b9b601 CC-3804: The title of the record show's media will be changed after Media Monitor restart 
-removed re-setting the track_title. It was causing problems, and it seems to no
longer have a reason to be here (you cannot rename a recorded show after it
has started)
 2012-05-21 02:23:34 -04:00
Martin Konecny bbc101bde8 CC-3810: NowPlaying Bar during a recorded show looks scary in 2.1 (much nicer in 2.0.3 and earlier) 
-fixed
 2012-05-20 23:30:03 -04: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 42f75634fc CC-3854: Crash on Adding Show 
-fixed
 2012-05-18 18:57:22 -04:00
denise f3840f6eac CC-3796: If you change the show's start and end time, the length of content will be displayed as ".00" 
-refactored empty check on $time
 2012-05-18 17:54:58 -04:00
denise d7eb9a9d95 SAAS-238: Password reset: hide these options in the preferences, allow them to be set using airtime-system command 
- changed "Airtime System Email" label on System->Preferences form
 2012-05-18 14:50:42 -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 466e30895c CC-3845 : General UI cleanup 2012-05-18 16:00:36 +02:00
Naomi Aro ff1327881a CC-3845 : General UI cleanup 2012-05-18 15:40:22 +02:00
Naomi Aro 5d3382a3d9 CC-3845 : General UI cleanup 
changing eye icon to play for the preview option in a context menu.
 2012-05-18 12:29:37 +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
denise 8ed2efe770 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-17 18:27:06 -04:00
denise 9967f5451c CC-3737: ON AIR turns to grey from time to time, while the stream keeps playing 
- fixed
- added a 'type' key to distinguish between tracks and shows
 2012-05-17 18:21:58 -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 821484d81a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-15 15:43:16 -04:00
denise e0c53afe0b CC-3796: If you change the show's start and end time, the length of content will be displayed as ".00" 
-fixed
 2012-05-15 15:43:06 -04:00
Martin Konecny 1921b26943 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-15 15:17:58 -04:00
Martin Konecny 1245d1e860 CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE 
-fixed in a better way
 2012-05-15 15:17:19 -04:00
denise 61fd560daa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-15 15:11:04 -04:00
denise b96f0590b1 CC-3808: No tooltip for preview playlist 
-done
 2012-05-15 15:10:56 -04:00
Martin Konecny 6695e3e190 -fix javascript error in widgets 2012-05-15 14:35:01 -04:00
Martin Konecny 4b03a45d46 CC-3757: Widgets: ON AIR show's elapsed and remaining time are wrong 
-fixed
 2012-05-15 14:20:53 -04:00
Martin Konecny 55b0715142 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-15 12:35:15 -04:00
Martin Konecny 025ef0ed27 CC-3826: Couldn't find constant MDATA_KEY_RECORD_DATE 
-fixed
 2012-05-15 12:35:02 -04:00
denise c4c988b98a CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent 
-now shows all keys, null or not, in the list
 2012-05-15 11:54:11 -04:00
Naomi Aro d2dc02cf9e CC-3777 : Decide on what should happen with canceling recorded show 2012-05-15 15:07:42 +02:00
Naomi Aro 07d029b8cc CC-3777 : Decide on what should happen with canceling recorded show 2012-05-15 14:56:31 +02:00
Naomi Aro 6a2bab66fa CC-3825 : Deleting any recorded show cancels the current recording show 2012-05-15 13:02:24 +02:00
denise 6add79268f CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent 
- system info from airtime-check-system now displays in "Show Me What I Am Sending"
 2012-05-14 18:10:20 -04:00
denise 12be26925e -set p_keepData parameter to true when Application_Model_Preference::GetSystemInfo is called 
-this will keep all the cc_live_log data in tact if support-settings are saved
 2012-05-14 15:38:04 -04:00
denise d2704c4d22 - check if variable exists before using if exlpode() was called 2012-05-14 15:24:53 -04:00
denise 8ff30cf5a1 CC-3797: Feedback Metrics "Show Me What I Am Sending" doesnt show all of the fields that are being sent 
-fixed
 2012-05-14 11:58:07 -04:00
Naomi Aro 803c44611a CC-3819 : Add View on Soundcloud context menu option on calendar page 2012-05-14 15:48:09 +02:00
Naomi Aro f8900d4b05 CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2012-05-14 15:13:08 +02:00
Naomi Aro 2be64a0067 CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2012-05-14 15:08:56 +02:00
Naomi Aro ff5aebfd6b CC-3817 : Should use soundcloud icon for recorded & uploaded shows in timeline for past shows to match calendar 2012-05-14 15:06:56 +02:00
Naomi Aro cc71c61fce CC-3816 : Automatic uploading of recorded shows, View on Soundcloud choice in menu doesn't work 2012-05-14 13:01:44 +02:00
Naomi Aro 97ce006130 CC-3816 : Automatic uploading of recorded shows, View on Soundcloud choice in menu doesn't work 2012-05-14 12:36:57 +02:00
denise eb182cf887 SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting 
- added phone_home_stat testing parameter
- fixed problem if missing data in airtime_latest_version file
 2012-05-11 17:27:14 -04:00
denise de372f967d --removed function no longer in use 2012-05-11 16:09:36 -04:00
denise 746e55de32 SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting 
-calculated scheduled broadcasting
 2012-05-11 16:09:36 -04:00
denise 195d0d8311 SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting 
-calculated scheduled usage
 2012-05-11 16:09:36 -04:00
denise 624ba85212 - deleted old broken code from LiveLog.php 2012-05-11 16:09:36 -04:00
denise de3e5a6e3c SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting 
-fixed inserts into cc_live_log
 2012-05-11 16:09:36 -04:00
denise 99738fad30 SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting 
-added cc_live_log inserts
 2012-05-11 16:09:35 -04:00
denise e347819c77 SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting 
-created cc_live_log table
 2012-05-11 16:06:28 -04:00
Naomi Aro 5620c2b85e CC-3772: On upgrade, make sure values in cc_files year have correct format 
removed to_date postgresql function, bad metadata will cause this to fail.
 2012-05-10 17:01:22 +02:00
Martin Konecny 80861bc643 CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year. 
-better way to do this...
 2012-05-09 01:18:58 -04:00
Martin Konecny 6c4bb1ef9e -rename playlists.js to dashboard.js 2012-05-08 20:41:09 -04:00
denise 0a03bba5b7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-07 15:08:47 -04:00
denise 9a9add9732 SAAS-235: Metrics: "Trial End Date" should be sent to stat server (only for SaaS customers) 
-done
 2012-05-07 15:07:29 -04:00
Martin Konecny 1d245ed79d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-07 14:26:00 -04:00
Martin Konecny c466b946a0 CC-3770: Make sure files in /srv/airtime/stor have world-readable permissions. 
-change read permissions on files right after they're uploaded
 2012-05-07 13:12:20 -04:00
Naomi Aro abd63e736a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-07 18:19:26 +02:00
Naomi Aro a514e3b60a CC-3776 : Current Recorded show is resizeable on the calendar (by dragging) 2012-05-07 18:19:18 +02:00
denise bdf314b93a SAAS-157: Automated metrics: gather info about soundcloud usage 
- put DB query inside try-catch
 2012-05-07 12:12:08 -04:00
denise 3a6a1d8691 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-07 12:02:15 -04:00
denise 96fa5ac715 SAAS-157: Automated metrics: gather info about soundcloud usage 
-added soundclound_enabled check
 2012-05-07 12:01:36 -04:00
Naomi Aro 6a93a479f8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-07 17:49:35 +02:00
Naomi Aro df4cdfb07e CC-3687 : Remove context menus from recorded shows since they are blank. 2012-05-07 17:48:56 +02:00
denise 678e573e7a SAAS-157: Automated metrics: gather info about soundcloud usage 
-done
 2012-05-07 11:24:40 -04:00
denise b5db91f0f4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-07 10:22:41 -04:00
Naomi Aro a79514c8ee CC-3687 : Remove context menus from recorded shows since they are blank. 2012-05-07 15:24:06 +02:00
Naomi Aro 1cc84c1c85 CC-3761 : Calendar->Update Show:Try to input wrong number of Colour, Browser hangs 2012-05-07 14:48:33 +02:00
Naomi Aro 41e7150462 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-07 14:29:02 +02:00
Naomi Aro a4b949cc2f CC-3753 : Cannot cancel record show on Timeline view 2012-05-07 14:28:21 +02:00
Martin Konecny bd6686a243 CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year. 
fixed
 2012-05-06 20:45:52 -04:00
Martin Konecny 77bffcd8e9 join function should be static 2012-05-06 20:30:49 -04:00
Martin Konecny 6135660d0f CC-3771: year column in cc_files sometimes has values greater than 2^31-1, which causes postgresql to fail when trying to convert this to a year. 2012-05-06 20:05:14 -04:00
Martin Konecny 4ad3286db2 CC-3769: PHP 5.3.2 issue with DateTime::createFromFormat and format string "U.u" 2012-05-06 15:34:41 -04:00
Martin Konecny adee58bcbc -better handling of timezones 2012-05-05 22:29:31 -04:00
Martin Konecny 1f214747b2 -catch all exceptions in Preference model and make header 503 2012-05-05 22:29:16 -04:00
Martin Konecny 5204da4502 -new logging class 
-don't log errors to stdout
-log all errors to /var/log/airtime/zendphp.log
 2012-05-05 22:28:52 -04:00
denise 7c06e27e7f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-04 15:58:14 -04:00
denise f50d7c3c03 SAAS-157:Automated metrics: gather info about soundcloud usage 
-added soundcloud_enabled option
 2012-05-04 15:58:07 -04:00
Martin Konecny 9092b7f725 CC-3764: Media Library->Edit Metadata: Throw exception when trying to edit metadata 
-fixed
 2012-05-04 12:47:29 -04:00
Martin Konecny 22c5da1629 CC-3755: Found Exception in apache's error log 
-Return error code so that python services automatically retry later.
 2012-05-04 12:40:44 -04:00
Martin Konecny b4cd429204 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-04 12:06:41 -04:00
Martin Konecny 65e771d189 CC-3756: Cannot download/preview tracks in Media Library 
-Fixed
 2012-05-04 12:02:42 -04:00
Naomi Aro d19ed4a97e CC-3730 : Boundary tracks need recalculating when resizing current show on calendar (by dragging) 2012-05-04 17:49:58 +02:00
Naomi Aro edaec54a5d CC-3724 : Now Playing -> Timeline view: to drag and drop single file very fast will block adding the same file 
using jquery.blockUI.js on timeline/playlist builder pages.
 2012-05-04 15:00:18 +02:00
Martin Konecny 10704be503 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-05-03 16:14:03 -04:00
root 80898ec898 CC-3732: NationTalk Database upgrade fail, from 2.0.3 to 2.1.0 
-fixed
 2012-05-03 16:13:50 -04:00
denise 13e147540d SAAS-214: "--email" being inserted for "city" field in statistics 
-fixed quote insertion if string is empty
 2012-05-03 13:55:55 -04:00
denise 81d7e0c80f CC-3747: Metadata popup should also show the filepath of the track 
-fixed filepath join
 2012-05-03 09:59:31 -04:00
denise ff6e2a2e5a CC-3747: Metadata popup should also show the filepath of the track 
-fixed
 2012-05-02 16:52:49 -04:00
James 8a2b9e7221 CC-3746: Calendar: Duration of 24hrs show is 00h 00m 
- fixed
 2012-05-01 17:05:18 -04:00
denise 0c337fe430 CC-3747: Metadata popup should also show the filepath of the track 
-done
 2012-05-01 12:39:56 -04:00
denise 4477ac02e7 CC-3677: Tooltips improvements 
-done
 2012-04-30 16:20:23 -04:00
James 0d5f581e35 CC-3731: Can add a show of zero length 
- fixed
- extra fix: Changed all the duration format so it's consistent
 2012-04-27 14:07:14 -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
James 0fe4478bb5 CC-3478: Calendar->Show has some inconsistencies on special Days (e.g. 
switching to Daylight Saving Time)

- added exception handling
 2012-04-26 10:56:08 -04:00
Naomi Aro 2c84420424 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-26 12:15:31 +02:00
Naomi Aro b5863d3d7a CC-3522 : Now Playing Screen-> Periodical message pops up 2012-04-26 12:14:41 +02:00
James 28d27b8932 CC-3719: "Start time" check will block editing ON AIR show 
- fixed
 2012-04-25 18:01:37 -04:00
James b5a65ae7e4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 17:22:05 -04:00
James fe71487fa2 CC-3478: Calendar->Show has some inconsistencies on special Days (e.g. 
switching to Daylight Saving Time)

- fixed
 2012-04-25 17:21:25 -04:00
Martin Konecny e12bd35ee2 CC-3671: add show on week/day view doesn't get start time/end time filled in 
-use str formatter for padding
 2012-04-25 16:39:58 -04:00
Martin Konecny 34a1949511 CC-3696: more rebroadcast show instances will be created after change the calendar 
-fixed
 2012-04-25 15:09:58 -04:00
Martin Konecny b5bf5e9598 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 12:08:05 -04:00
Martin Konecny 06455c65e3 CC-3714: Create show with start time as 0xx:xx will freeze the browser 
-fixed
 2012-04-25 12:07:58 -04:00
Martin Konecny a291f42112 CC-3716: cannot create show start before 10:00 
-fixed
 2012-04-25 12:02:06 -04:00
Naomi Aro d2448b804f CC-3697 : Only "Recording From Line In" can be added to the Rebroadcast show 2012-04-25 17:09:40 +02:00
Naomi Aro 9b4c3efe8e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 15:22:51 +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
Martin Konecny eec14f9592 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 09:19:26 -04:00
Martin Konecny bf96207849 CC-3714: Create show with start time as 0xx:xx will freeze the browser 
-fixed
 2012-04-25 09:19:15 -04:00
Naomi Aro 7aeddf5bb0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-25 12:51:00 +02:00
Naomi Aro 439ebb1128 CC-3667 : Preferences pages should have an option to enable/disable password recovery option 2012-04-25 12:50:21 +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
Martin Konecny 63a5f45e9b CC-3690: Able to create repeat show in the past, by editing an already ON AIR show 
-fixed
 2012-04-24 18:22:39 -04:00
Martin Konecny 3bc919affb CC-3696: more rebroadcast show instances will be created after change the calendar 
-fixed
 2012-04-24 17:52:07 -04:00
Martin Konecny 172bbf9d7f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-24 16:47:48 -04:00
Martin Konecny dd72090c3f CC-3711: Verify Propel hasn't broken anything with its different handling of boolean columns compared to Pear. 
-fixed in ShowBuilder controller
 2012-04-24 16:46:51 -04:00
Martin Konecny 6e755b000b CC-3707: copy files to stor, extra forwardslash 
-fixed
 2012-04-24 16:15:22 -04:00
James 5be12c0a93 CC-3695: Non-admin user cannot preview the contents 
- guest doesn't have access to playlist builder, hence allowing DJ, PM and
admin to access the preview.
 2012-04-24 15:57:43 -04:00
James 3c4d01aa93 CC-3675: Playlist -> the files from Disconnected Mediafolder can still 
be previewed (played)

- done
 2012-04-24 12:59:07 -04: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
Martin Konecny b9ab11ce28 CC-3702: System -> Status: No difference between a service is failed vs a service is not monitor 
-fixed
 2012-04-23 17:18:34 -04:00
Martin Konecny 5e5ced6fe5 CC-3701: Need to differentiate between a service being down vs not-monitored (airtime-check-system) 
-fixed
 2012-04-22 14:28:02 -04:00
Martin Konecny 6e9b179afc CC-3603: Calendar->Once you update the rebroadcasted show it disappears 
-fixed
 2012-04-20 16:57:32 -04:00
Martin Konecny 2a9ea435f2 CC-3694: Upgrade fails with Propel database conversion. 
-fixed
 2012-04-20 15:37:51 -04:00
Martin Konecny 85bc150159 CC-3694: Upgrade fails with Propel database conversion. 
-fixed
 2012-04-20 14:46:23 -04:00
Martin Konecny 5aa2339a1d CC-3693: Uninstalling + Reinstall of Airtime + refreshing the page as a non-existant user causes a stack trace. 
-Fixed
 2012-04-20 13:11:28 -04:00
Martin Konecny 7d6e251adf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-20 11:31:37 -04:00
Martin Konecny da8a5296b0 CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window 
-add user type into javascript as a variable so we can check permissions on js side
 2012-04-20 11:31:24 -04:00
Naomi Aro d5a416be43 CC-3416 : Create password reset form 2012-04-20 16:10:27 +02:00
Naomi Aro e242972a78 Merge branch 'CC-3174' into devel 2012-04-20 13:04:38 +02:00
Naomi Aro 6b4fd7d3bb CC-3686 : Improve differentiation of a record/rebroadcast show in the timeline 2012-04-20 13:03:50 +02:00
Martin Konecny 16f3a331bb CC-1927: Remove PEAR DB 
-missed some conflicts :/
 2012-04-19 17:03:13 -04:00
Martin Konecny cba253439a CC-1927: Remove PEAR DB 
-various fixes
 2012-04-19 16:54:38 -04:00
paul.baranowski 235997c616 CC-1927 Remove PEAR DB 
* Removed the DEB package "php-db" from the full install script as it is
  no longer needed.
* Missed one call to PEAR::isError()
 2012-04-19 16:35:19 -04:00
paul.baranowski 9ec584e90c CC-1927 Remove PEAR DB 
Removed remaining references to $CC_DBC
 2012-04-19 16:35:19 -04:00
paul.baranowski 96b010e7f0 CC-1927 Remove PEAR DB 
* Removed all traces of PEAR functions.
* Fixed AirtimeInstall::GetVersionInstalled() to return the correct answer
  even when it cant connect to the database.  Also fixed return value to
  be consistent on failure.
* Fixed phone_home_stat.php and soundcloud-uploader.php
 2012-04-19 16:35:19 -04:00
paul.baranowski c0da27b445 CC-1927: Remove Pear DB 
Final touches on install/upgrade scripts, now they are working.
Still need to remove last traces of PEAR throughout the code.
 2012-04-19 16:34:14 -04:00
paul.baranowski 95d69a3bbe CC-1927: Remove PEAR DB 
Fixed all install/upgrade scripts.
 2012-04-19 16:34:14 -04:00
paul.baranowski 7f78a7f663 CC-1927: Remove PEAR DB 
First pass through the model classes to remove use of $CC_DBC.
Web application is working.
There are still other parts of the app that use PEAR DB.
 2012-04-19 16:33:05 -04:00
paul.baranowski f69a172ee1 Commented out a bunch of Logging debug lines. There was a lot of output 
being logged in the Zend log file.
 2012-04-19 16:16:56 -04:00
James 3849e944cf CC-3682: System-> Stream - Tooltips on port ranges should be introduced 
- fixed
 2012-04-19 15:22:02 -04:00
James 92671f5723 CC-3681: the value range for the Master, Show Source posrts should be 
corrected (shrinked)

- added validator that check if the value is between 1024 and 49151
 2012-04-19 15:18:53 -04:00
Martin Konecny 92f2027fc4 -missing CC_CONFIG global.. 2012-04-19 15:06:15 -04:00
Martin Konecny 1e111f176e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-19 15:03:28 -04:00
Martin Konecny 458aae33a1 CC-3429: Firefox does not natively support mp3 file playing so preview does nothing. 
-Removed use of filemtime
-audiopreview is now in correct directory
 2012-04-19 15:03:17 -04:00
James ee7829d920 CC-3663: Cannot edit rebroadcast show 
-fixed
 2012-04-19 12:57:13 -04:00
James 32eb80bdeb Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-19 12:56:31 -04:00
James 45fa1efc2d CC-3603: Calendar->Once you update the rebroadcasted show it disappears 
- fixed
 2012-04-19 12:56:15 -04:00
denise ad769b53d8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-19 12:35:05 -04: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
James a7fc31012f CC-3689: Remove Edit Show Instance ability 
- done
 2012-04-19 11:29:19 -04:00
James 8bd3a35789 CC-3683: Upgraded database not equivalent to fresh install database part 1 
- fixed
 2012-04-19 11:24:30 -04:00
Martin Konecny bd8ce4b0a7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-18 19:02:53 -04:00
Martin Konecny 5bea867bec CC-3429: Firefox does not natively support mp3 file playing so preview does nothing. 
-fixed
 2012-04-18 19:02:29 -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 8588857def CC-3674: Cannot add songs to 'Now Playing' nor Playlists 
-fixed
 2012-04-18 16:49:32 -04:00
denise 7de74f2540 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-18 16:14:04 -04:00
denise 79f3473dfe CC-3674: Cannot add songs to 'Now Playing' nor Playlists 
-fixed for Now Playing
 2012-04-18 16:13:52 -04:00
James 58f4727f17 CC-3666: Default Playlist fade in/out time is not zero. 
- fixed
 2012-04-18 16:06:23 -04:00
Martin Konecny 70a51f1aca Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-18 15:45:15 -04:00
James dacdc4e432 CC-3672: Source switch stays connected if current show is cancelled 
- fixed
 2012-04-18 15:38:47 -04:00
James d3d6b10528 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-18 14:03:47 -04:00
James 897b61b357 CC-3479: Calendar->Drag and Drop show has some inconsistencies with hours 
- fixed
 2012-04-18 14:00:40 -04:00
denise 843299361a Merge branch 'cc-3637-fix-external-source-dashboard-display' into devel 2012-04-18 12:32:21 -04:00
denise 479e112317 CC-3637: Now playing shows "Nothing Scheduled" when restreaming external source 
-fixed
 2012-04-18 12:30:37 -04:00
denise 7659ae6384 added missing bracket on <span> 2012-04-18 12:26:10 -04:00
James 000f7d549c CC-3652: Can't edit current show if it's a single instance 
when the timezone is in CEST(prague timezone)

- fixed a bug where variable name wasn't changed
 2012-04-18 12:25:10 -04:00
denise 53a85204da CC-3498: Calendar -> Show Content better representation of duration needed 
-fixed (check for array length after explode())
 2012-04-17 16:52:59 -04:00
Martin Konecny 64a7a13f79 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-17 16:25:57 -04:00
Martin Konecny d258e39b2e CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. 
-Remove unecessary "continue;" statements
 2012-04-17 16:25:10 -04:00
James 5df1fede9f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-17 15:43:39 -04:00
James a91785ff42 CC-3652: Can't edit current show if it's a single instance 
when the timezone is in CEST(prague timezone)

- The bug was that it was using local timestamp for the current time.
- removed some unnecessary code
- changed a variable name to more understandable name.
 2012-04-17 15:43:18 -04:00
Naomi Aro 467fbc2c4b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-17 19:00:57 +02:00
Naomi Aro 4732c0ad67 CC-733 : Broadcast Log 2012-04-17 18:59:17 +02:00
Martin Konecny 29e24d1847 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-17 12:24:05 -04:00
Martin Konecny cdf92b016f CC-3655: Context menu for current show missing add/remove content and remove all content options. 
-undone
 2012-04-17 12:23:56 -04:00
Naomi Aro 102bcb1d46 CC-3416 : Create password reset form 2012-04-17 18:16:10 +02:00
Martin Konecny 2c4df4853a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 18:38:55 -04:00
Martin Konecny 79b9de203d -Better attempt at getting at least 3 items 2012-04-16 18:38:48 -04:00
James 4527da6cdf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 18:22:03 -04: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 27e5a6db5e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 17:36:19 -04:00
denise e786514f27 CC-3655: Context menu for current show missing add/remove content and remove all content options. 
-fixed
 2012-04-16 17:31:16 -04:00
James da691dcfb7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 17:29:18 -04:00
James c08800468f CC-3658: DJ assigned to the Show can't switch/kick streams 
- fixed
 2012-04-16 17:29:02 -04:00
denise 2fc591db2b CC-3498: Calendar -> Show Content better representation of duration needed 
-fixed
 2012-04-16 17:09:54 -04:00
James 2f4861db26 CC-3444: Ability to edit currently playing show (end time and permissions) 
- added comment
 2012-04-16 17:06:06 -04:00
James d11fca8ac8 CC-3444: Ability to edit currently playing show (end time and permissions 
- fixed
 2012-04-16 16:48:04 -04:00
James 2e811dfef8 CC-3642: System->Streams->DJ URL changes are not reflected in Calendar 
->LiveStream

- fixed
 2012-04-16 15:23:37 -04:00
James 9aa814212a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 14:58:03 -04:00
James df3acb5590 CC-3654: Cannot resize current (non-repeating) show on the calendar 
- fixed
 2012-04-16 14:57:53 -04:00
Naomi Aro 7e3112e3d7 CC-3610 : Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW 2012-04-16 18:31:15 +02:00
Naomi Aro b5f48c7732 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-16 18:16:33 +02:00
Naomi Aro b9d82a579f CC-3407 : Timeline: Display if tracks are missing on disk 2012-04-16 18:16:24 +02:00
Martin Konecny a6c0a1d2d9 -removed erroneous import 2012-04-16 12:04:35 -04:00
Naomi Aro a0fb607d30 Merge branch 'CC-3174' into devel 2012-04-16 16:40:02 +02:00
Naomi Aro c96c60dc5a CC-3620 : Calendar -> Unresponsive script warning when trying to add 300 ogg files 
improving speed of js rendering,
datatables config is loaded from localstorage,
removed aggregate propel behaviour on cc_show_instances time_filled.
 2012-04-16 16:33:32 +02:00
James 0ad9177dac CC-3648: Airtime Station time is broken 
- fixed
 2012-04-16 10:19:34 -04:00
James ffc17ba705 CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format 
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
 2012-04-13 17:45:28 -04:00
James a6f44226b9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-13 17:18:52 -04:00
James 9cafc91785 CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. Attempt to 
play unavailable track leads to platform hanging

- in cast of mount/unmoun drive has some nested folder that were already in the
cc_music_dirs table, airtime was only setting true/false flag on only one of
the entry.
 2012-04-13 17:18:31 -04:00
Martin Konecny 5a2d55ef84 CC-3520: Change default password of monit 
-currently I allow it to be fixed, but I don't actually change it
from default of airtime:guest
 2012-04-13 16:58:12 -04:00
Martin Konecny 2e4cab45b3 -Logging::log works with arrays 2012-04-13 16:50:54 -04:00
James 3ae8eb9105 CC-3622: When changing location of the stor directory, the "organize" 
subfolder is not being created

- fixed
 2012-04-13 15:09:59 -04:00
James 36ca2c29fc CC-3634: Media Folder: if file was deleted from file system, and the file was 
scheduled in the future, it wasn't marking the file as deleted

- using propel instead of PEAR DB
 2012-04-13 15:03:27 -04:00
James 1bb04296a9 CC-3639: Preferences-> Fade In is interpreted improperly (it is insanely high) 
- the regular exp check in model class was wrong
 2012-04-13 12:05:59 -04:00
Naomi Aro ef908ee894 CC-3626 : Playlist Builder -> you can not add files from Library by using "+" button (if default Fades were changed in Preferences) 2012-04-13 11:09:52 +02:00
James 6e1bf50009 CC-3638: Dashboard: On Air and Current playing show wasn't displaying correctly 
- fixed
 2012-04-12 18:49:24 -04:00
James fd700c225c CC-3607: MediaFolder->deattaching the MediaFolder does not trigger the files 
be remover from server

- RecallByMd5() was checking against all cc_files entries which includes
 deleted files
 2012-04-12 17:37:14 -04:00
James c706bc32fd CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format 
- fixed
 2012-04-12 17:23:26 -04:00
James d4533ca545 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 17:19:03 -04:00
James c6ad9462af CC-3634: Media Folder: if file was deleted from file system, and the file 
was scheduled in the future, it wasn't getting deleted from Airtime

- fixed a bug
 2012-04-12 17:18:45 -04:00
denise 62cd704d1c --added comment 2012-04-12 17:12:43 -04:00
denise 9d4a474521 CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show 
-fixed
 2012-04-12 17:07:27 -04:00
denise fe68d0fc87 CC-3498: Calendar -> Show Content better representation of duration needed 
-fixed
 2012-04-12 16:25:01 -04:00
James f522c7a7af Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 16:17:36 -04:00
James 53e37ee826 CC-3634: Media Folder: if file was deleted from file system, and the file was 
scheduled in the future, it wasn't getting deleted from AIrtime

- fixed
 2012-04-12 16:17:19 -04:00
Martin Konecny c2db20f004 CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-cleanup
 2012-04-12 15:10:40 -04:00
Martin Konecny bfed474b7b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 13:41:18 -04:00
denise a2fedaa3f1 CC-3621: Calendar -> show contents (for a 24 hours show): It display "0:00:00" as total time of 24 hours show 
-fixed
 2012-04-12 13:36:45 -04:00
Martin Konecny 83d78eb0dd -check if exec function is available before using it 2012-04-12 13:36:36 -04:00
denise 7276d3d895 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 13:34:48 -04:00
Martin Konecny 380094b4cc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 13:29:58 -04:00
Martin Konecny 04718a88ae CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-done
 2012-04-12 13:29:49 -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 4ef18fb00f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 12:22:36 -04:00
James c90a8006cc CC-3622: When changing location of the stor directory, the "organize" 
ubfolder is not being created.

- I confirmed that Airtime was creating organize folder upon chaning stor dir
but, still added a code which make sure it create organize folder if it's
missing somehow.
 2012-04-12 12:22:20 -04:00
denise 390f9b44fd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 12:22:09 -04:00
Naomi Aro 0486d33e27 Merge branch 'CC-3174' into devel 2012-04-12 18:12:01 +02:00
denise b0948e8848 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 12:01:55 -04:00
Naomi Aro adddd1085c CC-3592 : Calendar-> Recorded Shows do not get Rebroadcasted at the moment 
added a flag whether to check user permissions or not.
 2012-04-12 18:00:38 +02:00
Martin Konecny 8303eb728e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-12 11:54:58 -04:00
Martin Konecny 5a8df0321e CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-in progress
 2012-04-12 11:54:51 -04:00
James 18391604b5 CC-3424: UI Design for new drop down menu 
- html integration
 2012-04-12 10:26:11 -04:00
denise 3d156a0516 CC-3612: Stream->Preferences-> inappropriate error message is popped up 
-fixed
 2012-04-12 10:01:22 -04:00
denise d06b3573e9 CC-3623: Need to send show name to Liquidsoap. (Currently sending name as "TODO") 
-fixed
 2012-04-11 19:22:47 -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
Martin Konecny bdd3444acf CC-3548: Schedule: Separate repeate show template and single instance on 'When' section 
-in progress
 2012-04-11 16:45:03 -04:00
James f0be7cc995 - comments and removing logging 2012-04-11 16:06:10 -04:00
James 8f197115ae CC-3618: Current playing Text Field in Dashboard alternates between "Nothing 
Scheduled" and "current playing song"

- fixed
 2012-04-11 15:54:03 -04:00
James c510286614 CC-3596: Playlist->Library->Edit Metadata: Throw exception after 
inputing string in "BPM"

- added digit validator
 2012-04-11 14:09:51 -04:00
James 13502b4c08 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-11 12:27:54 -04:00
James f82aef2a85 CC-3566: Preferences->"Fade In" is not respected when Show starts 
- millisecond value of fade was sent wrong from php side.
- crossfade() call was removed and it was causing fade in/out not working.
 2012-04-11 12:27:41 -04:00
Martin Konecny 4ff0962b60 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-11 11:22:07 -04:00
Denise Rigato 26d13e7184 CC-3468: Stream settings: Need detailed tooltip for "override" fields 
-fixed
 2012-04-11 11:01:22 -04:00
Martin Konecny a09a31bc88 CC-3610: Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW 
-pypo side fixed
 2012-04-10 23:13:52 -04:00
James 1017b4e449 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-10 17:37:15 -04:00
Denise Rigato e4fc5fafb5 CC-3468: Stream settings: Need detailed tooltip for "override" fields 
-fixed
 2012-04-10 16:30:46 -04:00
James 148fdfb8f9 Merge branch 'CC-3603' into devel 2012-04-10 15:28:38 -04:00
Naomi Aro 428d04d77f CC-3605 : Create 2.1 upgrades 2012-04-10 18:07:39 +02:00
Naomi Aro b998a04c2e Merge branch 'devel' into CC-3174 2012-04-10 15:57:13 +02:00
Naomi Aro 1dcced18ac CC-3605 : Create 2.1 upgrades 2012-04-10 14:45:48 +02:00
James 56ce2b0da5 - text change on live stream section on show form 2012-04-09 17:04:53 -04:00
James 32548de639 CC-3486: Text Fields in Stream settings behave in unorthodox way. Highlighting 
entire text and typing does not erase the highlighted text.

- removed all the masking
- meioMask is very outdated so it's removed from the project.
 2012-04-09 16:35:39 -04:00
Denise Rigato 7fc575e750 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 15:51:37 -04:00
Denise Rigato ee0a08be15 CC-3487: Improved restart warning message for stream settings page 
-fixed
 2012-04-09 15:51:17 -04:00
Denise Rigato 516f71c23e CC-3487: Improved restart warning message for stream settings page 
-fixed
 2012-04-09 15:49:39 -04:00
Martin Konecny 5bc1fe84ad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 12:43:46 -04:00
Martin Konecny 54ec6445c6 CC-3606: System->Media Folders-> system seems to search 
-fixed. Need to check if directory actually exists.
 2012-04-09 12:43:40 -04: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 6785a373a1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-09 10:50:51 -04:00
James d035681f35 CC-3596: Playlist->Library->Edit Metadata: Throw exception after 
inputing string in "BPM"

- added validator on the form
 2012-04-09 10:50:32 -04:00
James 064490a2fd CC-3603: Calendar->Once you update the rebroadcasted show it disappears 
- temp commit
 2012-04-09 10:37:44 -04:00
Martin Konecny d562a26f4b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-07 22:33:47 -04:00
Martin Konecny 548c4ffb8d -change it so that user can access API actions if logged in. 2012-04-07 22:28:10 -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 ef6c496ba3 CC-3541: Missing show title from "Show Content" pop-up 
-fixed
 2012-04-05 15:49:58 -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 35a89e0308 CC-3174 : timeline 2012-04-05 15:52:16 +02: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
Naomi Aro cf2813a545 CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page 2012-04-05 10:56:06 +02:00
Naomi Aro 35d2ded26b CC-3597 : Playlist->Library->Edit Metadata: Throw exception after click "Cancel" at "Edit Metadata" page 2012-04-05 10:47:35 +02:00
James cde8e07c0b CC-3581: Calendar->It should not be possible to change the duration for 
the recorded show

- fixed
 2012-04-04 16:26:28 -04:00
James ab7da1ce90 CC-3581: Calendar->It should not be possible to change the duration for 
the recorded show

- "When" section is disabled when editting rebroadcasting show
 2012-04-04 15:44:52 -04:00
James 5da7d42290 CC-3548: Schedule: Separate repeate show template and single instance on 
'When' section

- UI portion of the feature
 2012-04-04 14:53:26 -04:00
Martin Konecny 3be1944fa4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-03 18:29:44 -04:00
Martin Konecny 366ea78fce CC-3532: Now Playing GUI-> Progress bar is still playing after end of show 
-fixed
 2012-04-03 18:29:36 -04:00
James e5843dc54e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-03 18:09:39 -04: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
Martin Konecny edcce7432d CC-3409: System status page times out if monit is not running. 
-Fixed
 2012-04-03 17:38:59 -04:00
James bcdd27863f CC-3513: Playlist Builder->Download makes user be redirected to a blank page 
- fixed
 2012-04-03 16:30:54 -04:00
James 4cb64b0eb1 CC-3569: Update total track metric to only report tracks that exist 
- fixed
 2012-04-03 15:53:55 -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 012ecc4698 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-03 13:53:24 -04:00
James 44e3217f3a CC-3482: Live Stream: UI Design for Source Stream panel on dashboard 
- fixed order of css insertion.
 2012-04-03 13:53:08 -04:00
Naomi Aro 057ca55074 CC-3589 : Send cancel recording message to pypo 2012-04-03 18:43:13 +02:00
Naomi Aro 1da134f967 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-04-03 18:26:13 +02:00
Naomi Aro 711105aade CC-3588 : Cancelling Empty Show gives "Invalid Request" 2012-04-03 18:26:04 +02: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
Naomi Aro d2d45dcae6 CC-3587 : index problem in scheduling. 2012-04-03 17:56:50 +02:00
Naomi Aro 079862d2f2 CC-3505 : Timeline: Remove repeating date if "end date" is the same as the "Start date" 2012-04-03 16:11:53 +02:00
Naomi Aro 5dfaa00c25 CC-3542 : When you delete the current show it takes all songs from that show out of the playout history 2012-04-03 11:15:22 +02:00
Naomi Aro d27470da99 Merge branch 'CC-3174' into devel 2012-04-03 10:58:39 +02:00
Martin Konecny 1519ada85c CC-3567: Don't require API key for API controller when APPLICATION_ENV = "development" 
-fix problem when constant isn't defined
 2012-04-02 17:28:05 -04:00
Martin Konecny 709f38e4ed CC-3567: Don't require API key for API controller when APPLICATION_ENV = "development" 
-fixed
 2012-04-02 17:28:05 -04:00
Martin Konecny 2e88801dad CC-3562: NOWPlaying->Overbooked Show1 introduces problems to itself and to the next 
-fixed
 2012-04-02 17:28:05 -04:00
Naomi Aro 6c25423f4e CC-3545 : Calendar->AddRemove (Now Playing Tab->Add Files to Show) -> changing order of tracks is not correct 
removing table tools.
replacing with something simpler that will preserve order on screen.
 2012-04-02 19:03:11 +02:00
Naomi Aro c5b761bff3 CC-3542 : When you delete the current show it takes all songs from that show out of the playout history 2012-04-02 15:31:02 +02:00
Naomi Aro eeb7273909 CC-3542 : When you delete the current show it takes all songs from that show out of the playout history 2012-04-02 15:20:13 +02:00
Naomi Aro ebf530a97c CC-3558 : Playlist->EditMetadata->Save Changes -> 404 page not found page appears 2012-04-02 11:02:03 +02:00
James 2395415292 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-30 15:11:54 -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 cfb5fbc0c9 CC-3518 : Airtime requires internet access to run 2012-03-30 17:37:21 +02:00
Naomi Aro b39db57d0c CC-3501 : Calendar->Show->Add media files from Library better usability may be proposed 2012-03-30 14:45:30 +02:00
Naomi Aro 9e9ae11725 CC-3551 : Change Cue Out for currently deleted track 2012-03-30 12:24:55 +02:00
James 5b65b56b93 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-29 16:57:49 -04:00
James 7325d51ada CC-3449: Live Stream: Kick out live dj at the end of the show 
- fixed so airtime sends series of kick_out events according to
cached_ahead value in cfg file.
 2012-03-29 16:57:28 -04:00
Naomi Aro cea37774ca CC-3551 : Change Cue Out for currently deleted track 2012-03-29 19:20:02 +02: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 12b23443db CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 16:27:08 +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 0746115d2c CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time 2012-03-29 11:06:57 +02:00
James 4f5d7efaa1 CC-3449: Live Stream: Kick out live dj at the end of the show 
- done
 2012-03-28 15:12:01 -04: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
Naomi Aro 8910d93c55 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-28 17:30:21 +02:00
Naomi Aro aca6e995dd CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not 2012-03-28 17:29:34 +02:00
james ac35ba5a93 CC-3519: System-> Stream> Problem with Master DJ Port and DJ Port settings 
- fixed a bug when master and dj port are both empty, it was returnning error
 2012-03-28 10:15:54 -04:00
Naomi Aro fe21abf16d CC-3503 : Preserve the state of "Now Playing" screen - whether Library section is open or not 2012-03-28 16:14:02 +02:00
james 2bb9b03b19 CC-3507: Live Stream status: naming 
- naming change on stream setting page
 2012-03-28 09:55:04 -04:00
Naomi Aro 4904a16ebb CC-3534 : Check Scheduling Edge Cases 
extracting out error checking in scheduling, added created column to cc_showinstances
 2012-03-28 14:23:25 +02:00
Naomi Aro b70773489a CC-3534 : Check Scheduling Edge Cases 
not allowing users to add to a show that has ended.
 2012-03-28 10:50:02 +02:00
James b935c82b83 CC-3519: System-> Stream> Problem with Master DJ Port and DJ Port settings 
- fixed
 2012-03-27 17:14:34 -04:00
Naomi Aro 9dbe8a5e5e CC-3463 : Usability improvements for timeline 2012-03-27 18:40:17 +02:00
Naomi Aro c1bdc6ff0f CC-3463 : Usability improvements for timeline 
working on timeline context menu.
cursor/play functions.
 2012-03-27 18:27:58 +02:00
Naomi Aro 9c52b2ee1f CC-3174 : showbuilder 
fixing jplayer preview
 2012-03-27 16:27:43 +02:00
Naomi Aro dfc6ae6273 CC-3463 : Usability improvements for timeline 
started to add cursor options to context menu.
 2012-03-27 15:46:25 +02:00
Naomi Aro 296a5c583a CC-3407 : Timeline: Display if tracks are missing on disk 2012-03-27 15:16:07 +02:00
Naomi Aro 451b573c52 Merge branch 'CC-3174' into devel 2012-03-27 14:14:58 +02:00
Naomi Aro 2956009f42 CC-3451 : Ability to delete the currently playing clip 2012-03-27 14:11:36 +02:00
Naomi Aro 10e4ae781f CC-3451 : Ability to delete the currently playing clip 2012-03-27 12:44:48 +02:00
Martin Konecny 3f713ca8dc CC-3426: apache log errors from plupload 
-fixed
 2012-03-26 19:00:40 -04:00
Martin Konecny a50b1ffe73 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 17:59:53 -04:00
Martin Konecny d7af91f306 CC-3520: Change default password of monit 
-done
 2012-03-26 17:59:44 -04:00
James 44e8e96cc8 CC-3507: Live Stream status: naming 
- fixed
 2012-03-26 17:29:09 -04:00
Martin Konecny 3308cbb7de Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 16:18:43 -04:00
Martin Konecny ccfa954f0e CC-3174: Show Content Builder 
-fixed indentation
 2012-03-26 15:43:29 -04:00
James 375be99fbd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-26 15:09:56 -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
Martin Konecny 1a4e6c563b cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Martin Konecny c301cd5256 cc-3476: dynamic timeout 2012-03-26 14:33:33 -04:00
Naomi Aro 275faa1881 CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time 2012-03-26 19:08:52 +02:00
Martin Konecny 0525f182ef CC-3516: Creating a show has a long execution time 
-grey out add-show form while busy
 2012-03-25 22:56:51 -04:00
Naomi Aro 3ab8c3d57b Merge branch 'CC-3174' into devel 2012-03-23 16:42:40 +01:00
Naomi Aro 711d1f202a CC-3463 : Usability of timeline 
changing buttons to be jquery ui icons.

adding button to trim overbooked
adding button toscroll current item to top.
 2012-03-23 16:42:08 +01:00
James 1ccf63ab0b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-22 16:24:38 -04:00
James f8d3a8c8bb CC-3449: Live Stream: Kick out live dj at the end of the show 
- PHP side implementation
 2012-03-22 16:23:59 -04:00
James 24260e8908 CC-3408: Live Stream: Check if the selected port is available to use 
- done
 2012-03-22 16:21:23 -04:00
Naomi Aro 1fdb3cf163 CC-3360 : Timeline Css 
adding Css to timeline.
 2012-03-22 18:04:22 +01:00
James b4e9f9699c CC-3483: Live Stream: default fade in/out for live stream transition 
- take care of bootstrap of pypo
 2012-03-20 22:29:52 -04: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 d4142f8b8b CC-3484: Pypo: On bootup, it should grab station name and stream 
label for liquidsoap

- fixed
- created new function set_bootstrap_variables()
 2012-03-20 16:41:15 -04:00
Naomi Aro e76cffd8b0 CC-3463 : timeline usability 
moving multiple files within the timeline.
 2012-03-20 17:55:35 +01:00
James e194ff0dc8 CC-3469: Stream settings: Connection URLs are not generated correctly 
- done
 2012-03-19 16:08:23 -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 8105c6571c CC-3355 : Timeline/Library: Select all in the library, drag to empty show --> nothing is added 
if something is added after a footer, it will be added to the end of whatever is before the footer.
 2012-03-19 14:48:11 +01: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 22cc362f1c CC-3448: Cancel show shouldn't send "cancel show" msg to pypo anymore 
-done
 2012-03-17 23:51:58 -04: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
Martin Konecny 9be6f1bd0e CC-3464: Playout forward cache should be configurable 
-Done
 2012-03-17 14:53:15 -04:00
Daniel 7914b30233 CC-3429: Firefox does not natively support mp3 file playing so preview does nothing. 
- after reading about the trick foudn in Mark Panaghiston's posting from this link https://groups.google.com/forum/#!topic/jplayer/gTJrSCjwftw
- the current imperfect solution for firefox sould be to show a video jplayer that can play all the audio types.
 2012-03-16 18:03:35 -04:00
Daniel 77e1c1c0cb CC-3466: Select statement for Now Playing has 'AND' in statement when no shows scheduled. 
-added check to make the code do nothing when a previous, current and next show id aren't specified.
 2012-03-16 17:13:32 -04:00
Daniel 8a34023336 CC-3465: Now playing should show tracks over shows for previous and next 
- added logic to include previous and next show in schedule query so the now playing bar will show the tracks from the show instead of the show itself.
 2012-03-16 14:02:53 -04:00
James 5156f8067e 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 20:52:22 -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 04c2c2f920 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-15 14:29:48 -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 7a8398bd32 CC-3174 : showbuilder 
including context menu to delete items from timeline.
 2012-03-15 16:11:29 +01:00
Naomi Aro 2beadc9301 CC-3174 : showbuilder 2012-03-15 14:14:02 +01: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 06e810c35d CC-3437: Live Stream: Liquidsoap(Pypo) should preserve the last switch 
status when it restarts

- missed one file from previous commit
 2012-03-14 14:43:10 -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 efee025691 CC-3406: Live Stream: Switch off live sources on disconnection 
- done
 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 d4a387e113 - adding switch to liquidsoap 2012-03-14 14:41:00 -04:00
James dfe87723f0 - bug fix in stream setting 
- testing lisquidsoap
 2012-03-14 14:41:00 -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
Daniel f399c7adab CC-3426: apache log errors from plupload 
- Updated code so the errors in the log are fixed.
- Performed sanity test on large file size that exceed disk space
  and normal uploads that are small enough to be copied
 2012-03-14 11:14:22 -04:00
Daniel a65ea6d058 CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- updated the code to remove the empty declaration of $results
- updated parameters so the name has p_ prepended to it
- fixed a weird bug where $con was not sent to updateScheduleStatus
- modified previous element logic so I only store the index and after the loop test if it was set and then do the formating.
 2012-03-13 17:46:13 -04:00
Daniel 927e5033c8 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 detection of ogg or mp3 files
 2012-03-13 14:12:14 -04:00
Daniel 48c8607d17 CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song 
-added brackets around other if condition
 2012-03-13 11:34:43 -04:00
Daniel 13e3197ebf CC-3423: nowPlaying getCurrentPlaylist doesn't work for next song 
- added brackets to an statement
 2012-03-13 11:31:24 -04:00
Daniel 9e850838ca CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- Updated ApiController to use Schedule's GetPlayOrderRange which has better performance.
 2012-03-13 10:36:11 -04:00
Daniel 1e4d34447a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/Schedule.php
 2012-03-13 10:23:44 -04:00
Daniel cbaeda1d6b CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table 
- Updated the logic in GetPlayOrderRange now I get the previous, current and next shows and tracks to be played.
- This information is then sent back to the caller.
	- if the previous track is null the previous show is sent back as an example of the algorithm.
 2012-03-13 10:21:01 -04:00
Naomi Aro 6830af574a CC-3174 : showbuilder 
fixing some merge stuff.
 2012-03-13 12:52:41 +01: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 c0b0e8079b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-12 11:33:28 -04:00
Naomi Aro 3145c24ba2 CC-3174 : showbuilder 
changing queries for datatables to use the Datatables model class.
 2012-03-12 15:32:24 +01: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 41a46b3144 CC-3174 : showbuilder 2012-03-12 15:02:34 +01:00
Naomi Aro f28f6659dc CC-3403 : Replace Now Playing with the new Timeline screen 2012-03-12 14:23:03 +01:00
Naomi Aro 3b32a16813 CC-3174 : showbuilder 
setting a timeout to refresh when the first item on the timeline starts incse there is no "current" item.
 2012-03-12 13:25: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 7c63387dd5 CC-733 : broadcast logs 
adding the export table tools.
 2012-03-09 13:39:12 +01:00
Naomi Aro c66b55ec17 CC-733 : playout history 
translating mDataProp values to be able to search table on backend
 2012-03-09 11:13:32 +01: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 fe3c340a90 CC-3174 : showbuilder 
making library table only scroll on the table part.
 2012-03-07 18:27:32 +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
Naomi Aro a4d07b3060 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
 2012-03-07 10:33:00 +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
Martin Konecny 5f4738dc7a CC-3389: Login page says copyright is 2010-2011 rather than 2010-2012 
-fixed
 2012-03-06 11:46:42 -05:00
Naomi Aro 157078b963 Merge branch 'CC-3174' into devel 
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
 2012-03-06 13:51:37 +01:00
Naomi Aro 6c5f710329 CC-3174 : showbuilder 
making each separate widget scrollable (playlist, library, timeline)
 2012-03-06 13:19:20 +01:00
Martin Konecny c0f83a0e02 CC-3387: Error with accessing database on Now Playing view 
-fixed
 2012-03-06 00:05:06 -05:00
Martin Konecny 0dfcb77f1a CC-3386: array access for "media_played" flag is hardcoded to 0 
-fixed
 2012-03-05 23:53:25 -05:00
Martin Konecny 348011dbc3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-05 19:03:23 -05:00
Martin Konecny 9715de11f5 CC-3372: Improved pypo cache delete 
-Done
 2012-03-05 19:02:46 -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 a246f85a5b CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- Merged with devel, removed js from StoredFile.php
 2012-03-05 19:00:14 -05:00
Daniel 51f004933b CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- updated icon in library
 2012-03-05 19:00:14 -05:00
Daniel 2de81c6027 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- updated logic removed when doing a rebase with devel
 2012-03-05 19:00:14 -05:00
Daniel aacbac4757 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) 
- Updated functionality so user can play a track and in jplayer and jump around it.
 2012-03-05 19:00:14 -05:00
Daniel 7d95e4ffa7 CC-2430 : Preview tracks in the library + better preview (ability to jump around in clip) 
- added accept ranges header to the response to enable seek ahead in the music file.
 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
Daniel dd3b7afff2 Updated library so I can play a song. 2012-03-05 19:00:14 -05:00
Naomi Aro a832a40c75 CC-3174 : showbuilder 
making the library a separate scrollable from playlist
 2012-03-05 18:14:10 +01:00
Daniel 228a9787a8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-05 10:59:43 -05:00
Paul Baranowski d250e2a297 CC-3380 Better names for items in the System menu 2012-03-02 17:50:52 -05:00
Martin Konecny df22ab21a6 CC-3359: Now Playing -> Day view has a bug with supporting UTC time 
-fixed
 2012-03-02 16:32:16 -05:00
Naomi Aro 29b03c1181 CC-3174 : showbuilder 
creating smart refresh timeout for now playing.
 2012-03-02 16:27:14 +01: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 f61afb0216 CC-3373 : Timeline: only lock the currently playing track and the one after 2012-03-02 14:01:02 +01:00
Naomi Aro 6c749075ac CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table 
chaning column name to playout_status
 2012-03-02 12:22:08 +01:00
Martin Konecny d03d01bce9 CC-3366: Pypo: Use local files instead of downloading them 
-done
 2012-03-01 18:00:46 -05:00
Martin Konecny 508c623850 -remove comments that should not have been committed 2012-03-01 18:00:46 -05:00
Daniel f8e7d6eae3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-01 15:35:21 -05:00
Martin Konecny 323aec218f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-03-01 12:16:04 -05:00
Martin Konecny d9967b9a77 -function incorrectly capitalized 2012-03-01 12:15:58 -05:00
Naomi Aro b68204751e CC-3174 : showbuilder 
making sure recorded shows aren't editable.
 2012-03-01 17:49:11 +01:00
Naomi Aro b813ba1035 CC-3174 : showbuilder 
making a time filled formatter to take the code out of show builder.
 2012-03-01 17:25:37 +01:00
Naomi Aro 1c43edb40b CC-3174 : showbuilder 2012-03-01 17:05:50 +01:00
Naomi Aro 3bfbe036c7 CC-3174 : showbuilder 
using the new status column in cc_schedule to colour boundary/overbooked tracks.
 2012-03-01 15:09:13 +01:00
Naomi Aro 0f9800a6bd CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table 2012-03-01 14:59:06 +01:00
Naomi Aro f8608f3511 CC-3174 : showbuilder 
percent calculation for shows was off.
 2012-03-01 12:13:21 +01:00
Naomi Aro b7e5bfe4aa CC-3174 : showbuilder 
changing cues/cliplengths to be interval column type.
 2012-03-01 11:48:57 +01:00
Martin Konecny 92f19139b9 CC-3336: Refactor schedule API used by pypo 
-done
 2012-02-29 21:27:42 -05:00
Naomi Aro 99b490129c CC-3174 : showbuilder 
making a dialog on the calendar page.
 2012-03-01 00:19:59 +01:00
Daniel 8b540017a5 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-29 14:55:30 -05:00
Daniel 1deee3cb65 CC-3365: Airtime API returns a non-null value for next item when there is no next item. 
- Improved check for determining if there is another element in the result set which is used to compute the next value.
 2012-02-29 14:54:54 -05: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
Naomi Aro 0f91f91c41 CC-3174 : showbuilder 
adding checks to enable/disable buttons for playlist & timeline.
 2012-02-29 15:47:11 +01:00
Martin Konecny a6413f2d1a CC-3336: Refactor schedule API used by pypo 2012-02-28 22:33:19 -05:00
Martin Konecny 057e377c5f Merge branch 'cc-3336-refactor-pypo' into devel 2012-02-28 19:49:48 -05:00
Martin Konecny 497715df44 Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo 
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py
 2012-02-28 19:22:13 -05:00
Naomi Aro 5257711866 CC-3174 : showbuilder 
fixing order of scheduled/playlist data when added via group dragging.
 2012-02-28 23:52:20 +01:00
Martin Konecny b572b26b68 CC-3336: Refactor schedule API used by pypo 
-make sure that empty arrays are objects and not arrays
-clean up some comments
 2012-02-28 15:32:18 -05:00
Martin Konecny 11f31effca CC-3336: Refactor schedule API used by pypo 2012-02-28 15:04:24 -05:00
Naomi Aro 4386690b54 CC-3174 : showbuilder 
prevents scheduling outside a show.
 2012-02-28 20:58:06 +01:00
Martin Konecny a53d856e8d CC-3336: Refactor schedule API used by pypo 
-add comment
 2012-02-28 14:56:21 -05:00
Martin Konecny 99c24ed038 CC-3336: Refactor schedule API used by pypo 
-removed export_source
-rewrote GetScheduledPlaylists()
 2012-02-28 14:52:44 -05:00
Martin Konecny 322d1bfa99 CC-3336: Refactor schedule API used by pypo 
-initial commit
 2012-02-28 14:43:39 -05:00
Martin Konecny 413d669bbf Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo 
Conflicts:
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/pypofetch.py
	python_apps/pypo/pypopush.py

-weird conflict. I must have committed while I had my changes git-stash'ed
 2012-02-28 13:58:10 -05:00
Daniel 15552319aa CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI 
- updated formating of file, removed tabs in favour of four spaces for some lines.
 2012-02-28 13:47:57 -05:00
Naomi Aro 31abc21aaa CC-3174 : showbuilder 
make sure the scheduled item still exists, if not throw an error.
 2012-02-28 17:16:43 +01:00
Naomi Aro b5f510de85 CC-3174 : showbuilder 
making sure an item is not added outside of a show.
 2012-02-28 16:57:53 +01:00
Naomi Aro 997782c73c CC-3354 : playlist drag and drop 
improving apperance of playlist drag and drop.
 2012-02-28 13:13:40 +01:00
Martin Konecny 4514967ccd CC-3359: Now Playing -> Day view has a bug with supporting UTC time 
-fixed
 2012-02-27 21:37:23 -05:00
Daniel fc2b18923e CC-3337: Optimize Schedule/get-current-playlist/format/json 
- I've updated the time interval used to search for the next, current and previously secheduled shows to 24 hours before and after from 1 hour.
 2012-02-27 18:09:30 -05: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 20a82abb23 CC-3174 : showbuilder 
forgot to return value, was getting NOW as the returned time instead.
 2012-02-27 22:26:17 +01:00
Naomi Aro 99d3699e71 CC-3174 : showbuilder 
fades displayed in seconds.
 2012-02-27 21:40:04 +01: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 6ecf2f94b0 CC-3356 : Library & Timeline : remove zero prefixes from numbers 2012-02-27 20:26:47 +01:00
Naomi Aro 564575d657 CC-3174 : showbuilder 
fixing timezone calculations if browser/server is different.
 2012-02-27 20:14:12 +01:00
Martin Konecny e8f329aef1 CC-3336: Refactor schedule API used by pypo 2012-02-27 13:52:35 -05:00
Naomi Aro f01a872bea CC-3174 : showbuilder 
remove extra ;
 2012-02-27 14:59:48 +01:00
Naomi Aro 318a0345bb CC-3174 : showbuilder 
make sure recorded files only display year in the table.
 2012-02-27 14:59:16 +01:00
Naomi Aro 9c248bb34d CC-3174 : showbuilder 
fixing scheduling rebroadcasts, show content.
 2012-02-27 14:33:56 +01:00
Naomi Aro 4a02d12600 CC-3174 : showbuilder 
fixing now playing to remove the playlist part.
 2012-02-27 12:53:21 +01:00
Naomi Aro 8ae303de83 CC-3174 : showbuilder 
need up to date version of datatables.
 2012-02-27 12:42:04 +01:00
Naomi Aro 3cc1506086 CC-3358 : Metadata Qtip 2012-02-27 12:23:22 +01:00
Naomi Aro 36cf8ded18 CC-3174 : showbuilder 
change columns sample rate and bitrate to be integers so they sort properly in the library.
 2012-02-27 12:07:46 +01:00
James 446233fbd4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-24 14:15:06 -05:00
James 2f689ed583 CC-3346: Recorder: Merge recorder with pypo 
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
 2012-02-24 14:11:35 -05:00
James 695535ae64 CC-3346: Recorder: Merge recorder with pypo 
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
 2012-02-24 13:12:50 -05:00
Naomi Aro 194de3c2bf Merge branch 'CC-3174' into devel 2012-02-24 18:22:59 +01:00
Naomi Aro 4286de7b42 CC-3174 : showbuilder 
bit rate & sample rate formatters
 2012-02-24 18:22:07 +01:00
Naomi Aro 09ce2bc8c5 Merge branch 'CC-3174' into devel 2012-02-24 16:18:39 +01:00
Naomi Aro 3ff7d1ac18 CC-3174 : showbuilder 
forgot to set cueout when scheduling just files.
 2012-02-24 16:18:15 +01:00
Naomi Aro b9e99afc5d Merge branch 'CC-3174' into devel 2012-02-24 16:07:12 +01:00
Naomi Aro c6edfc3208 CC-3174 : showbuilder 
removing columns that no longer should be in cc_schedule.

changing cc_files length column to be of type interval.

adding length formatter to showbuilder.
 2012-02-24 16:05:01 +01:00
Naomi Aro 0446fcfb25 Merge branch 'CC-3174' into devel 2012-02-24 15:07:38 +01: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
Naomi Aro bc8106c5fa Merge branch 'CC-3174' into devel 2012-02-24 00:56:46 +01:00
Naomi Aro 28bb97acfa CC-3174 : showbuilder 
allow user to filter library by

files/playlists or all.
 2012-02-24 00:55:20 +01:00
Naomi Aro 8b02f3d902 Merge branch 'CC-3174' into devel 2012-02-23 22:54:41 +01:00
Naomi Aro e0134ed6d1 CC-3174 : showbuilder 
made width not inline.
 2012-02-23 22:54:13 +01:00
Naomi Aro 9c6bd4bf4d Merge branch 'CC-3174' into devel 2012-02-23 22:24:17 +01:00
Naomi Aro c665a3fa03 CC-3333 : showbuilder track colouring 
tracks coloured if boundry/over.

needs better colour selection.
 2012-02-23 22:23:21 +01:00
Paul Baranowski e99b23434e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-23 15:24:40 -05:00
Paul Baranowski 1682ce8879 Updated copyright date. 2012-02-23 15:24:20 -05:00
Martin Konecny 4631e199cc CC-3336: Refactor schedule API used by pypo 
-add comment
 2012-02-23 15:20:25 -05:00
Martin Konecny c433b08158 CC-3336: Refactor schedule API used by pypo 
-removed export_source
-rewrote GetScheduledPlaylists()
 2012-02-23 15:20:25 -05:00
Martin Konecny bb300676cf CC-3336: Refactor schedule API used by pypo 
-initial commit
 2012-02-23 15:20:24 -05:00
Naomi Aro d93041edb9 CC-3174 : showbuilder 
change default value to prevent apache error logs.
 2012-02-23 18:06:08 +01:00
Naomi Aro 753c05ce5b CC-3335 : Timeline: Drag and drop usability improvements 
cursor must be used to add tracks to timeline, not check boxes.
 2012-02-23 17:46:07 +01:00
Naomi Aro b357b80054 CC-3174 : showbuilder 
created controller Usersettings, noticed hosts couldn't
save datatables setting through pref controller.

starting to use new cursor arrows.
 2012-02-23 12:13:00 +01:00
Naomi Aro aabcaafff0 CC-3174 : showbuilder 
nowplaying uses current datatables.
 2012-02-23 11:10:49 +01:00
Naomi Aro 4bc51cbad1 CC-3174 : showbuilder 
forgotten unused var.
 2012-02-23 11:01:52 +01:00
Martin Konecny da012af6ed CC-3336: Refactor schedule API used by pypo 
-removed export_source
-rewrote GetScheduledPlaylists()
 2012-02-22 20:41:24 -05:00
Martin Konecny c5c1dce4d6 CC-3336: Refactor schedule API used by pypo 
-initial commit
 2012-02-22 17:29:49 -05:00
Naomi Aro a1e8903a64 CC-3174 : showbuilder 
fixing some errors found in apache log.
 2012-02-22 22:25:14 +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 bb49914294 CC-3174 : showbuilder 
bug fixed in datatables - thanks Allan!
 2012-02-22 21:09:24 +01:00
Daniel 8bbccb6f44 CC-3338: Optimize week display 
The response time of the calendar varies depending on whether the week/day views filter or the month filter is used because of the additional percentage scheduled calculation per show instance. This added calculation results in more and heavier hits to the database, I've included the time_filled column in the original show query and have used that to calculate percentage and saved the db call.
 2012-02-22 14:32:59 -05:00
Naomi Aro d4c7b832c9 CC-3174 : showbuilder 
fixing up library table to include all interesting columns if a user would like to choose to see them.
query is done with propel.
 2012-02-22 18:38:33 +01:00
Daniel 80e33ee533 CC-3337: Optimize Schedule/get-current-playlist/format/json 
- I've updated the logic to query the cc_schedule table directly for the previous, next, current shows which makes look up time much faster. If that doesn't work then I revert back to the previous logic, incase nothing is scheduled within an hour of the current time.
 2012-02-22 11:36:48 -05: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 2aae318a5a CC-3174 : showbuilder 
remembering state for the timeline datatable.
 2012-02-22 12:42:24 +01:00
Naomi Aro 5703508beb CC-3174 : showbuilder 
col reorder resize isn't new enough to work with the new save/load callbacks.
switched to just the col reorder plugin written by Allan( datatables author)
 2012-02-22 11:43:37 +01:00
Naomi Aro 5f89975c64 CC-3174 : showbuilder 
datatables state restore needs real booleans not strings.
 2012-02-22 00:02:35 +01:00
Naomi Aro 9b5a0fc565 CC-3174 : showbuilder 
working on trying to save/load state serialized into the db for datatables.
 2012-02-21 17:31:54 +01:00
Naomi Aro a633d69c8d Merge branch 'CC-3174' into devel 2012-02-20 20:09:49 +01:00
Naomi Aro c0f16fac3c CC-3174 : showbuilder 
improving playlist functionality/error checking like the showbuilder.
will send last modified ts to make sure user has a current copy of the open playlist.
 2012-02-20 18:24:04 +01:00
Naomi Aro 17c3cdcfb2 CC-3174 : showbuilder 
fix ordering problem with track column.
 2012-02-20 11:41:44 +01:00
Daniel 664584ec6b CC-3331 : Optimize "Now Playing" to load in less than 1/2 second 
- updated the CreateDatatableRows do perform a check and set on the last items end time. If the end time of the last item exceeds the show time's end I set the items end time to the show's end time.
 2012-02-17 17:58:19 -05:00
Daniel c7f4b17e81 CC-3331: Optimize "Now Playing" to load in less than 1/2 second 
- cleaned up sql statement Schedule's getScheduleItemsInRange
 2012-02-17 17:08:47 -05:00
Daniel 5dd94ce12c Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-17 16:49:44 -05:00
Daniel 5cb99e9532 CC-3331: Optimize "Now Playing" to load in less than 1/2 second 
- Reorganized the now playing to find all the scheduled items within two time frames instead of in a loop per show id.
- I've cut the time in half
 2012-02-17 16:47:12 -05:00
James 0db3a45fcf SAAS-196: Stats: Check if easy_install installation method detection 
is working properly

- fixed
 2012-02-17 15:40:37 -05:00
James 2ef6d230f9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-17 15:39:50 -05:00
James bb1cdc4a8f SAAS-196: Stats: Check if easy_install installation method detection 
is working properly

- fixed
 2012-02-17 15:39:31 -05:00
Daniel 6d71ec8c9c CC-3331 : Optimize "Now Playing" to load in less than 1/2 second 
- The logic to build the NowPlaying list was updated to refactor the quering of the database for playlist tracks played from in the loop per show ID to outside the loop for a given duration. The resulting list was then partitioned off for each show.
 2012-02-17 11:13:34 -05:00
Naomi Aro 09ae26a531 CC-3174 : showbuilder 
fixing bug moving item to beginning of show
 2012-02-17 12:19:42 +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 9bed56a2c3 CC-3174 : showbuilder 
incorrect variable name fixed for updating last scheduled timestamp.
 2012-02-17 11:14:44 +01:00
Naomi Aro b2d0565ec4 CC-3174 : showbuilder 
checking to make sure UI is up to date with db
 2012-02-16 19:46:14 +01:00
Naomi Aro e1d5d6de73 CC-3174 : showbuilder 
checking modification time before deleting items.
Throws a ScheduleOutdatedException
 2012-02-16 16:29:11 +01:00
Naomi Aro f14ebce239 CC-3174 : showbuilder 
adding new column last_scheduled to cc_show_instance
changing column time_filled to be of type interval.
 2012-02-15 18:27:59 +01:00
Daniel 190490d6f4 CC-3329: Library: Add "track number" to the list of available columns to show (was in 1.9, disappeared in 2.0) 
- updated the view columns to include track_number from db as track
- updated sql query to include track_number from db
 2012-02-15 11:21:21 -05: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
Daniel 14a9225b97 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-14 18:12:51 -05:00
Daniel 14cd9ed0e9 CC-323: Show appropriate error message if disk is full when attempting to upload files via the web UI 
- Updated the StoreFile logic so it won't die while trying to copy a file, and instead pass error messages to the controller which can decide if it wants to die, which 	I've set ApiController and PluploadController todo on receipt of error code.
 2012-02-14 18:12:29 -05: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
Naomi Aro eba84ee878 CC-3174 : showbuilder 
disabling editing of past/current shows.
 2012-02-14 14:44:46 +01:00
Naomi Aro b7b1c401f6 CC-3174 : showbuilder 
fixing classes on show footer, selector for the select all.
only adding a checkbox on a row if a user is allowed to schedule there.
 2012-02-14 13:33:25 +01:00
Naomi Aro 4f5b5d8562 CC-3174 : Show Content Builder 
adding time filled/empty row data.
 2012-02-13 18:29:39 +01:00
Martin Konecny 3df396756f CC-3323: Don't send description text to Full Calendar since it is never used. 
-Done
 2012-02-13 12:10:23 -05:00
Martin Konecny fbd6df1986 CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade. 2012-02-12 15:31:17 -05:00
Martin Konecny 5059d13156 -handle case gracefully when pypo hasn't registered with Airtime server yet. 2012-02-12 01:34:53 -05:00
Martin Konecny eadf68cb61 CC-3318: When changing stream settings (Liquidsoap + Pypo restart), sometimes Airtime does not resume playback 
-fixed
 2012-02-10 18:43:40 -05:00
Martin Konecny babfa1830c CC-3317: PHP Undefined variable error in SystemstatusController 
-fixed
 2012-02-10 13:12:18 -05: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 fdd962f5ce CC-3174 : showbuilder 
replacing context menus on calendar screen.
 2012-02-09 21:19:21 +01:00
Daniel a4a41f301f Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-09 15:05:36 -05:00
Daniel b603726a39 CC-3289: Widgets should have a version string so users can make sure widgets are up to date 
-I've updated the messages used to notify the user to be more explicit.
-I've moved the constant used to track widget api versioning to /application/configs/constants.php
 2012-02-09 15:04:52 -05:00
Naomi Aro 4691799326 Merge branch 'devel' into CC-3174 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
 2012-02-09 19:41:31 +01:00
Daniel 9fc0ed198e CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI 
- moved the logic used to test that the destination folder has enought space to copy the given audio file into.
 2012-02-09 12:45:39 -05:00
Naomi Aro e07ad45b1a incorrect path for the new qtip. 2012-02-09 18:07:32 +01:00
Daniel 73555714b8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-02-08 17:56:42 -05:00
Daniel cdc72beb6b CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI 
- Updated the code to get the remaining free disk space and compare it to the size of the file to be uploaded and notify the user if the file is larger then diskspace.
 2012-02-08 17:56:26 -05:00
James 33fcbddcb9 CC-3284: Don't make browser users clear their cache when Airtime is upgraded 
- use airtime version string instead of filemtime function

Conflicts:

	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/ScheduleController.php
 2012-02-08 16:21:57 -05:00
Martin Konecny 0f9d3021cd Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 16:17:35 -05:00
Martin Konecny 6254467e02 CC-3305: 404 Error after meta data edit on Airtime Pro 
-Fixed
 2012-02-08 16:17:18 -05:00
James ba3cc45d36 CC-3284: Don't make browser users clear their cache when Airtime is upgraded 
- use airtime version string instead of filemtime function
 2012-02-08 15:57:42 -05:00
Daniel b1a281be4e Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 14:59:11 -05:00
Daniel 5d31e4c2a0 CC-3289: Widgets should have a version string so users can make sure widgets are up to date 
- I updated the ApiController.php file to add a widgetsVersion value used in the response to widgets
- I updated the widgets jquery.showinfo.js file to check the version and report back to the user.
 2012-02-08 14:57:48 -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
Naomi Aro d257ddf482 CC-3285 : Nowplaying 
nowplaying didn't show correct start date if show crossed 0:00 boundry.
 2012-02-08 16:00:37 +01:00
Naomi Aro 252777c3f9 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-02-08 15:14:33 +01:00
Naomi Aro c23491b257 CC-3285 : show over booked error message 
checking if percentage is over 100.
 2012-02-08 15:13:17 +01:00
Naomi Aro a2f38b94a2 CC-3174 : showbuilder 
changing show context menus
 2012-02-08 13:12:08 +01:00
Naomi Aro 581f86a1de CC-3174 : showbuilder 
show editing menu added.
 2012-02-08 12:53:46 +01:00
Naomi Aro 216ce80ceb CC-3174 : showbuilder 
have to replace context menus on calendar page.
 2012-02-08 11:16:23 +01:00
Naomi Aro 3728ffaddc CC-3174 : showbuilder 
upgraded full calendar to 1.5.3 so that it works with jquery 1.7.1

need to replace context menu on the page, old one doesn't work anymore anyways.
 2012-02-07 23:58:36 +01:00
Naomi Aro 668e214371 CC-3174 : showbuilder 
unsetting playlist id in the session properly.
 2012-02-07 18:42:34 +01:00
Naomi Aro 529f3fa52f CC-3174 : showbuilder 
forgot to actually return fades.... heh
 2012-02-07 17:52:04 +01:00
Naomi Aro aa7afce245 CC-3174 : showbuilder 
modifying times to work with scheduling times.
 2012-02-07 17:29:52 +01:00
Naomi Aro 251f3a3e5b CC-3174 : showbuilder 
testing newly returned times, fixing the secondsToPlaylistTime method
to not drop subsecond precision for the calculations.
 2012-02-07 14:58:16 +01:00
Naomi Aro f651024a6e CC-3174 : showbuilder 
overriding some propel setter/getters to support subseconds
or using fades in ss.uuuuuu time as a default.
 2012-02-07 13:29:50 +01:00
Martin Konecny 5dcb033c84 CC-3297: Depend on zendframework and php-pear as external packages 
-Remove dependency on included Zend files.
-Remove included Zend files
-Zend is now external dependency
 2012-02-06 20:28:38 -05:00
Martin Konecny 51e181b445 CC-3297: Depend on zendframework and php-pear as external packages 
-removed pear files
 2012-02-06 15:16:57 -05:00
Martin Konecny c229097470 CC-3297: Depend on zendframework and php-pear as external packages 
-DB dependency should now be externalized
 2012-02-06 15:10:03 -05:00
Martin Konecny 58b4576ae1 CC-3297: Depend on zendframework and php-pear as external packages 
-DB dependency should now be externalized
 2012-02-06 14:18:03 -05:00
Naomi Aro d9947b622a CC-3174 : showbuilder 
fixing times in CcPlaylistContents
 2012-02-06 18:46:53 +01:00
Naomi Aro 613006e69c CC-3174 : showbuilder 
merge
 2012-02-06 12:57:08 +01:00
Naomi Aro e487b4a444 CC-3174 : showbuilder merges 
adjusting format of default fade to not confuse DateTime.
 2012-02-06 12:48:53 +01:00
Naomi Aro 9e08f857bf CC-3174 : showbuilder 
fixing merge with playlist tooltip
 2012-02-06 11:59:20 +01:00
Naomi Aro 776d1b65e8 CC-3174 : showbuilder 
fixing merge, testing that affected functionality still works.
 2012-02-06 11:23:10 +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 8212624c4a CC-3174 : showbuilder 
fixed moving an item to an earlier position in a show,
timeline needs a width or connected list doesn't work.
place holder still has problems with floats.
 2012-02-06 01:51:22 +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 fbec92cb0d CC-3174 : showbuilder/library 
soundcloud icon stuff is back.
 2012-02-05 19:48:23 +01:00
Naomi Aro 6c2475bf1f CC-3174 : showbuilder 
mostly done with new context menu, need to finish
add/delete button actions on lib table for both screens.
 2012-02-05 18:19:22 +01:00
Naomi Aro da5e1ac302 CC-3174 : showbuilder/library 
adding new context menu, link to view on soundcloud doesn't seem to work.
 2012-02-05 13:56:07 +01:00
Naomi Aro e8f2506474 CC-3174 : showbuilder 
changing playlist table to remove unused columns, adding foreign key to user, adding aggregate length column.
 2012-02-04 21:26:21 +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 bdc9707052 CC-2970 : playlist drop indicator 
looking into customizing the placeholder, connected library to playlist sortable.
 2012-02-04 02:07:32 +01:00
Daniel d6bf95500c CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences 
- didn't change much fixed two bugs and changed formating.
- I introduced a but in Playlist.changeFadeInfo because for the general playlist fade in and out I didn't realize that these values are being set to the first and last elements. So I added a guard.
- I also updated the logic for Playlist.moveAudioClip so if new and old position are the same we just return
 2012-02-03 18:19:13 -05: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 1deebedf11 CC-3174 : showbuilder 
throwing an exception if playlist doesn't exist.
 2012-02-03 18:28:35 +01:00
Naomi Aro 0afa904ffe CC-3174 : showbuilder 
refactoring playlists for the group add/delete
 2012-02-03 18:15:10 +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 7317b1d5af CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences 2012-02-02 15:59:35 -05:00
Daniel Franklin 09ccac3384 CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences 
- Fixed refresh bug that results in storing to database a 00.000000 value instead of 00:00:00
 2012-02-02 15:30:05 -05:00
Daniel Franklin 61fb8a4fb9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2012-02-02 14:49:08 -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 0fee577c67 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2012-02-02 14:13:04 -05:00
Martin Konecny 11e0f3ead8 CC-3296: Sometimes the Current Playing Item on the top Panel in the UI incorrectly shows "Nothing Scheduled" 2012-02-02 14:11:03 -05:00
Naomi Aro 60ac01dd41 CC-3174 : show builder 
scheduled item keeps same id after being moved.
 2012-02-02 18:38:56 +01:00
Naomi Aro e001cd24c1 CC-3174 : show builder 
darg into and drag around in the timeline is now working.
need to change schedule table to not have auto incrementing ids
to preserve an item's id for REST.
(might find another way)
 2012-02-02 18:13:20 +01:00
Naomi Aro 0199f572bd CC-3174 : showbuilder 
dragging into timeline is working
need to replace jjmenus
 2012-02-02 15:51:15 +01:00
Naomi Aro 942cfaac25 CC-3174 : show builder 
moving columns around in library to look better.
 2012-02-02 01:29:50 +01:00
Naomi Aro 3aab811a3e CC-3174 : showbuilder 
fixing some css/js for display.
 2012-02-01 23:33:20 +01:00
Naomi Aro f5b2a23eb1 CC-3174 : showbuilder 
group add/delete is working
 2012-02-01 18:47:08 +01:00
James df73726961 CC-3293: Stream settings page does not remember the stream metadata format 
- fixed
 2012-02-01 12:10:31 -05:00
James 026bdebacc CC-3293: Stream settings page does not remember the stream metadata format 
- fixed
 2012-02-01 12:09:59 -05:00
James 3643c9caaf SAAS-174: Ability to add Google Analytics to the demo instance 
- done
 2012-02-01 11:44:20 -05:00
James 4ffe79a286 CC-3290: A file should be removed from playlists if it is removed 
through the interface

- fixed
 2012-02-01 10:59:04 -05:00
Daniel Franklin 5d02581d38 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI 
Modified the error message to prepend a The, simple change.
 2012-02-01 10:59:04 -05:00
Daniel Franklin d495eac326 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI 
-fixed using the return result of the rename call to verifty the upload worked.
 2012-02-01 10:59:04 -05:00
James 8e40c95e9a SAAS-174: Ability to add Google Analytics to the demo instance 
- done
 2012-02-01 10:57:38 -05:00
Martin Konecny b2ed751e9e Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-01-31 21:24:23 -05:00
Martin Konecny 7ee17ba07e CC-3291: Airtime is missing Australia and Arctic timezones 
-fixed
 2012-01-31 21:24:01 -05:00
Naomi Aro 3d502b748f CC-3174 : showbuilder 
removing items recalulates everything correctly.
 2012-01-31 21:39:34 +01:00
Daniel Franklin de7bbbb479 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI 
Modified the error message to prepend a The, simple change.
 2012-01-31 15:17:53 -05:00
Daniel Franklin 026f49ab31 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI 
-fixed using the return result of the rename call to verifty the upload worked.
 2012-01-31 14:54:03 -05:00
Naomi Aro fbda0e733b CC-3174 : showbuilder 
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
 2012-01-31 18:59:27 +01:00
James b644a94363 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-30 16:29:50 -05:00
James 80970efa9c SAAS-174: Ability to add Google Analytics to the demo instance 
- done
 2012-01-30 16:29:35 -05:00
James c5f3e40397 SAAS-174: Ability to add Google Analytics to the demo instance 
- done
 2012-01-30 16:28:27 -05:00
james e05e2ea49c CC-3284: Version the javascript directories so that upgrades 
work correctly for clients.

- appended timestamp of last modified time on all js and css file import

Conflicts:

	airtime_mvc/application/controllers/LibraryController.php
 2012-01-27 15:37:53 -05:00
james 9f2d0fc8d5 CC-3284: Version the javascript directories so that upgrades 
work correctly for clients.

- appended timestamp of last modified time on all js and css file import
 2012-01-27 15:30:44 -05:00
Naomi Aro 3f3117cf0e CC-3174 : Show builder 
creating a scheduling system to work with the new timeline in mind using propel.
 2012-01-27 21:06:04 +01:00
Naomi Aro f5761fd03c CC-3174 : show builder 
status icon on left side of table
static check mark in the footer currently
 2012-01-26 19:10:37 +01:00
Naomi Aro b0c3bace1c CC-3174 : show builder 
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
 2012-01-26 15:21:04 +01:00
James 5026da56cb SAAS-178: Demo instance should prevent changing of admin password 
- Error msg is returned when try to update admin account
 2012-01-25 14:14:27 -05:00
James 192c30bacc Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-01-25 14:12:42 -05:00
James 2027db3609 SAAS-178: Demo instance should prevent changing of admin password 
- Error msg is returned when try to update admin account
 2012-01-25 14:12:19 -05:00
Naomi Aro 1080bf692f CC-3277 : Overbooking a show to include 24+ hours of audio 
truncating time values greater that the max allowed for time without timezone
 2012-01-24 18:08:39 +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 863de54fc8 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-18 10:29:19 -05:00
Yuchen Wang 93dfb253c1 CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter 
Fixed
 2012-01-18 10:28:41 -05:00
Naomi Aro cc20db5d30 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-18 16:22:22 +01:00
Naomi Aro fa872894f3 CC-3259 : change repeating state of show. 2012-01-18 16:21:46 +01: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 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
Naomi Aro 3588cca654 CC-3258 : Deleting a rebroadcasting show deletes also the recorded show 2012-01-17 14:11:12 +01:00
Naomi Aro a69be24831 CC-3256 : Recorded/repeated/rebroadcast is invalid after show update 
only the original rebroadcasts are left when toggling the repeat option.
 2012-01-17 12:45:05 +01:00
Naomi Aro 424206b9a9 CC-3174 : Show Builder 
data tables column resizing, starting separating out events.
 2012-01-17 11:18:17 +01: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 c82394b7a0 CC-3246: Hardware audio output cannot be switched off 
- fixed
 2012-01-13 16:57:02 -05:00
James ccef97190a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-13 16:56:29 -05:00
James bcbbf42f62 CC-3246: Hardware audio output cannot be switched off 
- fixed
 2012-01-13 16:56:02 -05:00
Yuchen Wang d753b0bb02 CC-3226: Record cancel dialog says "stop playback?" instead of "stop recording?" 
Done
 2012-01-13 16:46:37 -05:00
Yuchen Wang 9629e2bbae Merge branch 'group_action_playlist_builder' into devel 2012-01-13 14:21:29 -05:00
Yuchen Wang 258521ffbf CC-1977: Allow multiple files to be selected and acted upon in the library and playlist 
- Fixed issues in "Manage Users" page
- Moved some code to more appropriate place
 2012-01-13 14:17:39 -05:00
James 41b072b412 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-01-12 17:55:25 -05: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
James 09d50e7e25 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-12 16:38:21 -05:00
James 04b592b831 CC-3245: upgrade 1.8->2.0 cause error in show recorder 
- fixed
 2012-01-12 16:36:14 -05:00
Yuchen Wang 044f511455 SAAS-141: Tweaks for trial balloon 
Done
 2012-01-12 15:47:08 -05:00
Yuchen Wang 6b7523513e Merge branch 'group_action_playlist_builder' into devel 2012-01-12 14:28:12 -05:00
Yuchen Wang 186aa9e898 CC-1977: Allow multiple files to be selected and acted upon in the library and playlist 
Fixed bugs introduced by backend changes from before
 2012-01-12 14:27:43 -05:00
Yuchen Wang 4a372715a3 CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter 
Fixed
 2012-01-12 12:19:05 -05:00
Martin Konecny 67ddda4a2d -Remove phing path from conf.php 2012-01-12 12:16:10 -05:00
Martin Konecny 79141fa070 CC-3240: When playlist is longer than a show, the now playing bar shows as if the playlist is still playing after show ends 
-Fixed
 2012-01-12 12:14:38 -05:00
Martin Konecny d1de836a92 -make rabbitmq_host configurable via $_SERVER var (.htaccess etc.) 2012-01-11 16:28:03 -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 d5d4d50a9e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/models/airtime/om/BaseCcFiles.php
	airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php
 2012-01-11 12:31:54 -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 f3ce8e77d1 Merge branch 'group_action_playlist_builder' into devel 2012-01-11 10:42:35 -05:00
Yuchen Wang cf045652ec CC-1986: Configurable columns for media search 
- Fixed some hardcoded array access
- Fix js error in ColReorder
 2012-01-11 10:41:58 -05:00
Yuchen Wang ef141625a3 Merge branch 'group_action_playlist_builder' into devel 2012-01-10 14:46:31 -05:00
Yuchen Wang d1d01e55ce CC-1986: Configurable columns for media search 
- added column 'utime' (upload time) and 'lptime' (last played time) in the tables cc_files and cc_playlist
 2012-01-10 14:45:43 -05:00
Yuchen Wang 7f6d3cd942 Merge branch 'group_action_playlist_builder' into devel 2012-01-10 09:54:55 -05:00
Yuchen Wang 7d9aa3ca5d CC-2299: Better column options in playlist/file list on playlist builder 
- allow columns to be re-ordered; note that the 1st two columns are fixed in-place to avoid some
problem with the ColVis plugin
 2012-01-10 09:52:32 -05:00
Martin Konecny c3430e5411 -various optimizations 2012-01-09 17:47:58 -05:00
Yuchen Wang 7a27be878b CC-1986: Configurable columns for media search 
- Added "Year" column
- Added "Upload Time" column
- Fixed some formatting issue
 2012-01-08 22:31:18 -05:00
Yuchen Wang a1ccb9c42a CC-1986: Configurable columns for media search 
- Upgraded ColVis plugin to 1.7, as this one contains some bug-fix that we need
- Added CSS file for ColVis plugin, so that we don't have to modify the plugin code
- Added the Configure Columns UI code
 2012-01-08 10:33:11 -05:00
Yuchen Wang 8833f4462e CC-1977: Allow multiple files to be selected and acted upon in the library and playlist 
- Added checkbox column to playlist builder
- Added the ability to add multiple songs to playlist by using checkboxes and "Add" button
- Added the ability to delete multiple songs/playlists by using checkboxes and "Delete" button
- Make them look nice by adjusting CSS and datatable
 2012-01-07 23:37:37 -05:00
James 61c5355e8a cc-2977: getting close!!! 2012-01-06 15:47:11 -05:00
Yuchen Wang 1044881666 CC-3114: Show Content Dialog doesn't display total time 
Somehow this file didn't get committed...
 2012-01-05 10:30:37 -05:00
Martin Konecny 14b7fd03bb -remove show-recorder from status page if saas enabled. 2012-01-04 18:57:28 -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 1c9b134748 CC-3183: recorder shows have extra 1ms which cause the now playing to report the show exceeding its time 
Done
 2012-01-04 17:10:14 -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 476484a269 CC-2985: Pop-up metadata box in Playlist Builder does not show Language field 
Done
 2012-01-04 17:08:38 -05:00
Yuchen Wang a63d975fce CC-2355: Repeating show should default to 'No End' 
Done
 2012-01-04 17:06:58 -05:00
Martin Konecny e9634f94a1 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2012-01-04 14:31:50 -05:00
Martin Konecny 7247f75563 SAAS-135: Airtime status page reporting free space being incorrectly for Gluster FS mounts 
-Done
 2012-01-04 14:18:40 -05:00
James 5fa92f3d17 - temp commit on group action 2012-01-04 12:47:27 -05:00
Naomi Aro 905775552d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-27 14:34:27 -08:00
Naomi Aro 53d504f26e CC-3110 : Password reset 2011-12-27 14:33:22 -08:00
james 9216da7f03 Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-24 11:03:02 -05:00
james c9c6a08a1c CC-3220: Stream Setting: Status box is stuck on waiting if nothing is 
changed and click save

- done
- liquidsoap_update_error and liquidsoap_update_connection functions are
combined into one function, liquidsoap_update_status, in various place
- created various telnet commands in liquidsoap( connection check for each
stream, connection status for all streams)
- In liquidsoap, shoutcast stream doesn't use default id. It is more
informative by using id with "shoutcast_stream_#{stream_number}
 2011-12-24 10:59:09 -05:00
Martin Konecny f4449865cc Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-22 17:21:43 -05:00
Martin Konecny a55b47efff -Allow etc and stor directories to be configurable 2011-12-22 17:21:18 -05: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
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
James 7086444247 SAAS-94: Phone home metrics: Gather info about streaming setup 
- fixed comment
 2011-12-19 15:45:44 -05:00
James 018fa1d79c CC-3213: Customer is unable to save Fade Out/Cue out for playlists 
- fixed cue out/in issue
 2011-12-19 14:55:23 -05:00
Martin Konecny cdcdd9227d -add vhost support 2011-12-19 00:11:45 -05:00
Martin Konecny 8d369e662d -make airtime.conf selectable in conf.php 2011-12-18 23:44:19 -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
Yuchen Wang 150ea0baaf Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x 2011-12-14 22:21:58 -05:00
Yuchen Wang b42d217684 CC-3193: context menu "Delete This Instance and All Following" doesn't make sense when appearing on a non-repeating show 
Show the menu item when the show is rebroadcasting.
 2011-12-14 22:21:02 -05:00
James 7c81fa29eb CC-3192: Problem with web uploads for Airtime 2.0.0 beta2 
- The bug was introduced with CC-3086. When file is large enough so
the pluload use chucking, it would create different temp name for each
chuck.
- Fixed it by using unique_name feature on plupload
 2011-12-14 15:58:26 -05:00
Yuchen Wang 7542d86b94 CC-3193: context menu "Delete This Instance and All Following" doesn't make sense when appearing on a non-repeating show 
Fixed by checking if the show is a repeating show.
 2011-12-14 10:12:17 -05:00
Martin Konecny 9bbe1d14fa -remove persistent connections from DB connections 2011-12-13 17:16:45 -05:00
Naomi Aro e81c14c1db CC-3185 : Live show can be dragged into a future date after the rebroadcasting 2011-12-13 13:04:03 +01: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
Naomi Aro 9275b21f48 CC-3177 : editing a show in the calendar brakes show edit form 2011-12-13 11:10:04 +01:00
Naomi Aro c887fec86b CC-3179 : shows populated date must be timestamp. 2011-12-12 21:11:05 +01:00
Naomi Aro 85b2bf6e55 CC-3181 : re-uploaded to soundcloud creates the file name in a different format 2011-12-12 16:04:16 +01:00
Naomi Aro 72952024b7 CC-3177 : editing a show in the calendar brakes show edit form 
will only update shows if the duration is 24:00 or less.
 2011-12-12 12:11:31 +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 e583511b21 SAAS-57: Add LiveChat to Airtime Pro 
Didn't consider the case of client_id being an empty string,
thus making the javascript syntax invalid
 2011-12-09 12:37:31 -05:00
Yuchen Wang 343cd8274d SAAS-57: Add LiveChat to Airtime Pro 
Forgot to remove the code from ApiController...
 2011-12-09 11:25:50 -05:00
Yuchen Wang 764d6c3347 SAAS-57: Add LiveChat to Airtime Pro 
Create a javascript variable to hold the client_id
 2011-12-09 11:12:42 -05:00
Yuchen Wang 2d04d7eb83 SAAS-57: Add LiveChat to Airtime Pro 
Fixing the issue of livechat showing up in the stream player pop-up
 2011-12-08 18:04:32 -05:00
Yuchen Wang 83f02c3408 SAAS-57: Add LiveChat to Airtime Pro 
Adding client_id getter/setter to preference
 2011-12-08 17:23:46 -05:00
Yuchen Wang c49cd436fa Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-08 16:46:13 -05:00
Yuchen Wang 201667936c SAAS-57: Add LiveChat to Airtime Pro 
Adding code to non-saas side
 2011-12-08 16:45:11 -05:00
Naomi Aro 36d9b15435 CC-3150 : Editor box still open with show details for a deleted show 2011-12-08 17:49:00 +01:00
James fd10393b01 SAAS-94: Phone home metrics: Gather info about streaming setup 
- changes in Airtime repo side
- phone home stat sends stream info to data collection server
 2011-12-07 10:31:16 -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 73c0408315 CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed. 
-fixed
 2011-12-05 12:56:16 -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
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
Martin Konecny 2bf4c93e5c CC-3160: Once Hardware dropdown is changed, stream information does not refresh 
-Fixed one error...a few more to go.
 2011-12-04 21:47:11 -05:00
Martin Konecny 5a4b4ba421 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-12-02 16:23:03 -05:00
Martin Konecny efbaebbbf5 CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed. 
-fixed
 2011-12-02 16:22:54 -05:00
Martin Konecny 82f3a25f69 -set log path earlier 2011-12-02 15:06:21 -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
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
Naomi Aro 966dd49610 CC-3094 : Rebroadcast editing problems 2011-12-02 16:24:11 +01:00
Naomi Aro 198340ac67 CC-3094 : Rebroadcast editing problems 2011-12-02 13:31:54 +01:00
Naomi Aro 878fa3461d CC-3094 : Rebroadcast editing problems 2011-12-02 12:06:09 +01:00
Naomi Aro b7a9e89095 CC-3143 : Allow content to be scheduled in an overlapping show. 
removing check for scheduling an overlapping show, doesn't make sense with new resize rules.
 2011-12-01 11:37:55 +01: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
Yuchen Wang 0d4e1d21e2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-30 16:12:53 -05:00
Yuchen Wang 0193eec89e CC-3139: Undefined index errors in Live stream player after fresh install 
Got SQL syntax mixed up with PHP...
 2011-11-30 16:10:40 -05:00
James 48d9d2d93b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 20:16:01 -05:00
James 9c65bfeba7 CC-3131: Latency of stream authentication warning in Stream Settings page 
- it compares boot time of liquidsoap and the time user clicks on "Save"
on stream setting page. The status only gets updated if the
"boot_time" > "user update time"
- as soon as a user click on save, status is set to "wating"
- since there is no timing issue, quering interval is reduced to 1 sec
 2011-11-29 20:15:38 -05:00
Yuchen Wang 4d6c3fdbf4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 16:25:43 -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
Martin Konecny bc7553a5fc CC-3099: Does Airtime upgrade work when the database username + password is changed from default? 
-fixed for non-install issues as well.
 2011-11-29 16:07:38 -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
Naomi Aro dbc65983e2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 17:22:23 +01:00
Naomi Aro 5b7788957e CC-3137 : Cleaning Up Old Playlist Stuff 
unused view.
 2011-11-29 17:22:17 +01:00
Yuchen Wang fc24380526 CC-3132: Live stream window needs a space in the title 
Fixed
 2011-11-29 11:17:29 -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
Naomi Aro 22e48d042a CC-3137 : Cleaning Up Old Playlist Stuff 2011-11-29 16:35:52 +01:00
Naomi Aro 01576b33c8 CC-3137 : Cleaning Up Old Playlist Stuff 
when a user clicks new the intermediate playlist metadata screen in gone now, just can edit title/desciption inline on the main editor.
 2011-11-29 16:20:09 +01:00
Naomi Aro c17be6d938 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-29 15:30:30 +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
Yuchen Wang 329c735ea4 CC-3125: Small capitalization errors on SoundCloud text labels 
Fixed
 2011-11-28 16:20:34 -05:00
Naomi Aro f1e1b747ad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-26 13:32:05 +01:00
Naomi Aro 5828b2037d CC-3102 : Show Editing, how it uses day of the week 2011-11-26 13:31:42 +01:00
Martin Konecny b16fa16042 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-26 00:06:29 -05:00
Martin Konecny 317bed8643 CC-3094: Rebroadcast editing problems 
-Fixed
 2011-11-26 00:06:17 -05: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
Yuchen Wang 41eeefe427 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-25 21:34:05 -05:00
Yuchen Wang f03b875e06 CC-3084: After canceling a repeating show that is being played currently, the progress bar is still going at the top 
Deleted show was being returned because we don't delete it from database if it's repeating, nor do we check
if it's modified when querying the db.

Fixed by checking modified_instance column; only return it if modified_instance != TRUE
 2011-11-25 21:33:42 -05:00
Martin Konecny ff998ea6f2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-25 17:36:23 -05:00
Martin Konecny b1193318ed CC-3105: Settings dates (the popup select date calendar) shows Today by local machine timezone and not Airtime timezone. 
-fixed
 2011-11-25 17:36:11 -05:00
James 267d48f640 SAAS-82: Add "airtime-system --status" command 
- add a function that returns just global data of stream setting
 2011-11-25 17:33:59 -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
Naomi Aro c21cbeb73b CC-3102 : Show Editing, how it uses day of the week 2011-11-25 16:07:03 +01:00
Yuchen Wang 5222fe71a5 CC-3089: Link to manual in Help menu should point to manuals.sourcefabric.org rather than flossmanuals.net 
Updated per Paul's comment
 2011-11-24 17:10:56 -05:00
Yuchen Wang 370d6e1fba CC-3104: Timezone issues in the widget 
Added is_numeric check
 2011-11-24 17:08:52 -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
Yuchen Wang ee3a6ecd84 CC-3089: Link to manual in Help menu should point to manuals.sourcefabric.org rather than flossmanuals.net 
Fixed
 2011-11-24 14:10:04 -05:00
Yuchen Wang b84c51212a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-24 14:05:38 -05:00
Yuchen Wang 276607c302 CC-3104: Timezone issues in the widget 
For a previous ticket, I changed the code so that both "Today's Program" widget
and "Now Playing" widget both use the liveInfoAction, but forgot that for "Now Playing" widget, it retrieves
the shows within next 48 hours instead of within end of day today...

Fixed by passing GET parameters to liveInfoAction, specify whether we want to retrieve shows within an
interval or end of day. Also added a GET parameter for specifying the number of shows to display.
 2011-11-24 13:54:58 -05:00
Naomi Aro 40b99dfc0f CC-3085 : Repeating shows get added to the wrong days 2011-11-24 19:39:08 +01:00
Naomi Aro 54ef9f2b03 CC-3102 : Show Editing, how it uses day of the week 
not sure if this change should be here anymore yet.
 2011-11-24 17:10:49 +01:00
Naomi Aro e68d7afa3f CC-3102 : Show Editing, how it uses day of the week 2011-11-24 16:20:17 +01:00
Naomi Aro 5c7828c1f5 CC-3102 : Show Editing, how it uses day of the week 2011-11-24 11:56:24 +01:00
Martin Konecny 37c89d96d9 CC-3095: Context menu of rebroadcasting show doesn't work 
-fixed
 2011-11-23 18:24:11 -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 980c8b2fae Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 16:17:40 -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
James 7ac13d26f0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 14:12:34 -05:00
James ab0dc64ba9 CC-3086: When uploading a file to /tmp filename collisions can occur 
- mktemp is used to generate temp name within /tmp dir
- it generate temp file when the file gets uploade to /tmp and then copy to
organize folder as original file name
 2011-11-23 14:12:14 -05:00
Naomi Aro 87886b039f CC-3083 Must convert to UTC start/end times using the timezone start/end times 2011-11-23 19:11:48 +01:00
Naomi Aro ab98bad5b4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 18:53:47 +01: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
Naomi Aro 685e5e03c4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 18:49:13 +01:00
Naomi Aro 65fb00ad8d CC-3083 Must convert to UTC start/end times using the timezone start/end times 2011-11-23 18:47:44 +01:00
Yuchen Wang 161fa80d64 CC-3091: Widget "Today's Program" doesn't show any content 
It's not showing anything because I thought it's not suppose to display the currently playing show.
Fixed by retrieving the currently playing show along with next shows, and display them.

todayInfoAction is no longer needed since liveInfoAction does the same thing.
 2011-11-23 12:00:54 -05:00
Yuchen Wang 37da2bf0c5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 10:39:40 -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
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
Martin Konecny 212205b0ff CC-3070: Scheduling show on the 31st of a month causes problem to months that don't have 31 days 
-fixed.
 2011-11-22 18:03:47 -05:00
Yuchen Wang 72553a257d CC-3066: "Now Playing" Widget doesn't display the currently playing show when it should be 
Convert to UTC time before calling model functions
 2011-11-21 18:10:29 -05:00
Yuchen Wang ac74ca2449 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-21 18:04:19 -05:00
Yuchen Wang 86729475f6 CC-3067: Shows in frontend widgets appear on the wrong day after changing timezone 
- Converting times to UTC timezone in ApiController before sending them to model functions

- Added utility functions in DateHelper.php

- GetShowsByDayOfWeek has been removed due to bugs caused by using local timezone
based variable like $day, which represents day of the week in local time, in db query,
which has times saved in UTC timezone. Converting stuff like day of the week from local
to UTC is messy. GetNextShows(...) can do the job so WeekInfoAction now uses it instead
 2011-11-21 18:03:56 -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 d4a02a655c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-21 11:39:42 -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
Martin Konecny 21bbb983ac CC-3065: When editing a show after changing timezone, the time listed under "When" displays time in old timezone 
-fixed
 2011-11-20 14:46:01 -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 b30c95887f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-18 14:07:00 -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
Martin Konecny 9ab47d5eba CC-3036: Deleted Show instances reappear 
-Renamed deleted_instance to modified_instance
 2011-11-18 12:20:25 -05:00
Martin Konecny c773c5c674 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-18 11:59:27 -05:00
Martin Konecny f3e1f63226 CC-3060: Apache errors: Undefined index: deleted_instance 
-fixed
 2011-11-18 11:59:15 -05:00
James e5ac2b75d4 CC-3059: Record and Rebroadcast: not able to set rebroadcast too close to 
recorded show

- fixed.
- extra fix: layout was broken when error is displayed
 2011-11-18 11:36:20 -05:00
Yuchen Wang 15c84ddfdb CC-2950: Tell users if they are running an out-of-date version or not 
- changed default url to "http://airtime.sourcefabric.org"
 2011-11-17 23:25:46 -05:00
Yuchen Wang 52052bd573 CC-2950: Tell users if they are running an out-of-date version or not 
- added error checking to curl call
- added regex validation when storing link to latest version
 2011-11-17 15:33:29 -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 ad708d9983 CC-2156: Searching for a host and hitting ENTER submits the show form 
- done. Had to port the code manually
 2011-11-16 18:14:10 -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 1fd29def27 CC-2436: Save pulldown settings 
Move the code that updates the database for the "show entries" dropdown to
a more appropriate place.
 2011-11-16 16:12:58 -05:00
Yuchen Wang 4820bb617b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-16 15:52:31 -05:00
Yuchen Wang a0bf7c90ba CC-2436: Save pulldown settings 
Fixing the issue of "show entries" dropdown setting not being saved.
After some investigation, it seems like we're destroying the calendar
everytime we modify the dropdown value, and create a new one,
which explains why the new setting is not being saved.

Fixed by moving the code that handles the updating to the place after
we create the new calendar. This makes the code cleaner as well.
 2011-11-16 15:52:05 -05:00
Martin Konecny 4f2adc3068 CC-3050: Comb through source code for dates being generated with date() function 
-done
 2011-11-16 14:06:59 -05:00
Martin Konecny 2f63a65e03 CC-3054: After recording show, recorded file is not imported properly. 
-fixed
 2011-11-16 13:34:58 -05:00
Martin Konecny a5939afd3f -fix minor typo 2011-11-16 12:59:01 -05:00
Martin Konecny 1e79363263 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-16 12:35:44 -05:00
Martin Konecny 17e59f61be CC-3036: Deleted Show instances reappear 
-Make sure we ignore deleted show instances in
 all areas of Airtime.
 2011-11-16 12:35:02 -05:00
Naomi Aro 12172e5ad5 CC-3035 : Should be able to resize a show, have it affect all future instances of the show 
added a new resize function to Shows.php,
should not use ShowInstance resize method, since you cannot resize just one instance currently.
 2011-11-16 16:32:04 +01: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 aafd53b456 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-15 16:27:54 -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
Martin Konecny e257c1043a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-15 16:14:18 -05:00
Martin Konecny e5fc5d623d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/models/DateHelper.php
	airtime_mvc/application/models/Show.php
 2011-11-15 16:14:00 -05:00
James 3374e09242 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-15 16:10:58 -05:00
Martin Konecny a0217f715f CC-3037: Nowplaying bar not showing current show 
-fixed
 2011-11-15 16:10:45 -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 fdff88cb76 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-15 12:38:18 -05:00
Yuchen Wang f6f58c9399 CC-3044: Error in system status seen in apache log 
- Added check for length > 0 before trying to get property
- Got rid of repeating code
 2011-11-15 12:37:54 -05:00
Naomi Aro 4bdf866aca CC-3035 : Should be able to resize a show, have it affect all future instances of the show 
resizing is only working for single instance currently like the past.
 2011-11-15 18:22:21 +01:00
Naomi Aro 63d0163f15 CC-3047 : getting full calendar events setting editable flag incorrectly 2011-11-15 16:32:07 +01:00
Naomi Aro 6f91a9b107 CC-3046 : Show contents for Rebroadcast in wrong timezone 2011-11-15 15:56:52 +01:00
Naomi Aro 61d8fa7baa CC-3034 Record/Rebroadcast Shows have time problems 
fixing some UTC to non UTC comparisons,
adding offsets properly to create a rebroadcast show's start/end time.
 2011-11-15 15:20:33 +01:00
Martin Konecny fe5191eac1 CC-3042: Disappearing shows from beginning when clicking edit. 
-initial commit
 2011-11-15 00:34:48 -05:00
Martin Konecny e3395ae1e5 CC-3036: Deleted Show instances reappear 
-done.
 2011-11-14 23:54:47 -05:00
Martin Konecny c19b7f7c6e Merge branch '1.9.1' into devel 
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/MusicDir.php
	install_full/ubuntu/airtime-full-install
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
 2011-11-14 21:19:56 -05:00
Yuchen Wang 709582b47d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-14 17:53:37 -05:00
Yuchen Wang 51c563f80b CC-2950: Tell users if they are running an out-of-date version or not 
1. changed the behavior so that the tooltip comes up on hover
2. changed stat server link to "http://stat.sourcefabric.org/airtime_latest_version"
3. only updates the db if version returned by stat server is valid
 2011-11-14 17:52:50 -05:00
James 00f37296e8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-14 16:23:42 -05:00
James 2529570546 SAAS-67: "Hardware Audio Out" shows when SaaS is enabled 
- minor fix.
- it was returning error when saving stream setting.
 2011-11-14 16:23:23 -05:00
Martin Konecny de33d3ccaf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-14 16:08:54 -05:00
Martin Konecny 60281f4e90 CC-2972: Find better way to determine domain which pypo should download from. 
-fixed
 2011-11-14 16:08:45 -05:00
James 11a38476c3 SAAS-43: Automatically fill in customer info in the automated feedback system 
on signup, do not display popup on login

- title needs to update with db access since airtime-saas can change title
- storing it to session variable is not an option
 2011-11-14 16:05:19 -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 8e283c9e02 SAAS-66: Ability to set the stream values from the command line 
- done
- extra fix: Fixed a javascript issue when it always changed bitrate to 48,
when type is set to ogg
 2011-11-13 15:34:26 -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
Martin Konecny 20fc49b7be CC-3027: Current Show progress bar is wrong 
-looks like it's working.
 2011-11-12 00:04:37 -05:00
Martin Konecny 1a45a38055 -add function comments to Show.php 2011-11-11 22:55:46 -05:00
Martin Konecny f7fb6ddff0 -better naming of show instance functions 2011-11-11 22:24:37 -05:00
Martin Konecny 42cde33648 CC-3030: Repeating shows is broken in devel branch. 
-working towards using only DateTime objects
 2011-11-11 17:25:49 -05:00
Martin Konecny 74d3c3aebc CC-3030: Repeating shows is broken in devel branch. 2011-11-11 10:58:27 -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
James 56a6da51a9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-10 15:35:52 -05:00
James b04b7ff010 CC-2848: Misc bugs from demo service 
- Handling concurrency issue playlist section and show(canlendar) section
 2011-11-10 15:35:27 -05:00
James 17016e5d40 CC-3028: Entry in a cc_show table never gets deleted 
- fixed
 2011-11-10 15:17:06 -05:00
Yuchen Wang 5d741d84ee CC-3001: Preferences->"Submit" button renamed to "Save", and should be at the top and the bottom of the screen 
Changed all other buttons that says "Submit" to "Save.
Also added some CSS stuff so that the "Save" button at the top of Preference page
have some space between itself and the form below.
 2011-11-09 16:03:32 -05:00
Yuchen Wang 38719b1a4e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-09 15:36:09 -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
James c3d35df55c CC-3026: Schedule Media: The show time displayed in this window is UTC time 
- fixed
 2011-11-09 14:29:52 -05:00
James 6c740effde SAAS-52: New auto-feedback metrics: 1) Debian or manual install, 
2) SaaS or Non-SaaS

- done
 2011-11-09 13:13:21 -05:00
James a551e08fce - cleaning up a dirty code 2011-11-09 11:27:17 -05:00
James 4b12b4e01e SAAS-63: airtime-saas: Something is broken in Preference.php 
- fixed
 2011-11-09 10:15:44 -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
Yuchen Wang 963976b87e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-04 16:58:01 -04:00
Yuchen Wang 6ffecf80c8 CC-2965: Frontend widget displays shows in UTC time 
Not only were frontend widgets showing UTC time,
the SQL query was also comparing UTC timestamp with local timestamps,
causing widgets to display shows in the wrong day, etc.

Another problem was that "On air today" widget was simply calling
GetNextShows which returns shows within next 48 hours.

Fixed by:
1. Under models/Show.php:
In the GetCurrentShow/GetNextShows/GetShowsByDayOfWeek functions,
added code to convert UTC timestamp to local timestamp or vice versa,
depending on which one is more suitable, in SQL queries, thus
removing inconsistency in timezones. Also, before returning query result,
added code to convert result to local timezone.

In GetNextShows, added an optional parameter endTime to limit the interval
of shows to get. This is useful for the "On air today" widget.

2. Under models/DateHelper.php:
Added a few timezone functions to help converting timezones easier in Show.php.

3. Under controller/ApiController.php:
Added todayInfoAction which is to be used by "On Air Today" widget.
 2011-11-04 16:57:24 -04:00
James 9448728d63 CC-2904: Space missing between two boxes on "Playlist Builder" 
- fixed
 2011-11-03 16:08:01 -04:00
James 6eff9d124e CC-2994: Upgrade: database change for SoundCloud upload 
- changed soundcloud_link_to_file length to 4096
 2011-11-03 10:30:01 -04:00
Martin Konecny 4c5386c0f3 1.9.5 preparations 2011-11-02 15:19:27 -04:00
James 8f6804155f CC-2934: Phone Home Stat: it should work with new airtime-check-system 
- initial commit
 2011-11-01 14:52:27 -04:00
Martin Konecny 56edfe4e68 CC-2758: Make airtime-install script Debian/Ubuntu compatible 
-uninstall script added
 2011-10-28 12:35:58 -04:00
Martin Konecny 153e0df409 CC-2989: airtime-check-system should deal with the case when the web server is not accessible 
-fixed some more inaccessible issues
 2011-10-27 17:13:36 -04:00
James 0188dc6c06 CC-2995: Remove "Done Editing" button 
- done
 2011-10-27 10:20:57 -04:00
James 5d4486b08f CC-2926: Clicking "Choose File" in support settings to upload image 
defaults to "Audio/MPEG" type in Chrome

- done
 2011-10-27 10:14:39 -04:00
Martin Konecny d26e410799 CC-2997: Daylight savings time affects repeating shows. 
-should work now
 2011-10-25 16:49:44 -04:00
Martin Konecny 08b97c4583 CC-2991: Repeating a show is broken 
-working
 2011-10-24 17:26:45 -04:00
Martin Konecny 04b88d4344 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-24 16:59:16 -04:00
Martin Konecny 858990eb8c CC-2991: Repeating a show is broken 2011-10-24 16:58:55 -04:00
Yuchen Wang a65fb97aec CC-2986: Long show description causes Add Show or Edit Show to fail silently 
Added StringLength validators for the UI fields. This way when user gave more than what
they should gave as the input, it's going to display an error msg.

The maximum length for the fields is queried from the database before the
fields were initialized.
 2011-10-24 13:27:53 -04:00
Yuchen Wang 6d15308e1d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-24 12:06:18 -04:00
Yuchen Wang 4db6636b06 CC-2646: Set a calendar view default (Day/week/month) that's remembered 
1. If the preference is not user-specific, or if id is null, set subjid to null

2. Rewrote the code for the setValue logic, added comments. Should be easier
to read and understand
 2011-10-24 12:05:55 -04:00
James f2bf92297a CC-2745: Show status of liquidsoap/icecast connection on Stream Settings page 
- fixed a case where it was displaying "OK" when liquidsoap was not running
 2011-10-23 06:29:06 -04:00
James fb8735588d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-22 11:34:43 -04:00
James f160ded6bc CC-2993: Playlist Builder: add "View on SoundCloud" option on the menu 
- fixed
- extra fix: handles the case when username or password is empty
 2011-10-22 11:34:04 -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
Yuchen Wang d2fe46baf0 CC-2436: Save pulldown settings 
For week and day views under Calendar page, save the change to pref db table when
user updates the interval dropdown. Same thing goes for the "show XXX entries"
dropdown found under Playlist Builder page.

When visiting these pages, we retrieves the entry from database for current user
and use those values. Defaults to 30m for interval and 10 entries for "show xxx entries"
if values were never set.
 2011-10-18 10:10:35 -04:00
Martin Konecny 959a239118 Merge branch '1.9.1' into devel 2011-10-17 13:36:40 +02:00
Martin Konecny 7548abc1b1 -fix undefined function error 2011-10-17 13:36:16 +02:00
Martin Konecny 74e8abe820 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-15 00:27:34 +02:00
Yuchen Wang 8b2a23b88a CC2646: Set a calendar view default (Day/week/month) that's remembered 
Updated the calendar page so that when user chooses a different time scale to display(day/week/month),
the new setting is stored in the pref database. Each user id has its own entry in the database.

When visiting the calendar, we retrieves the entry from database for current user
and show that time scale; defaults to monthly view if no entry found.
 2011-10-14 14:17:06 -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
Martin Konecny 5a83c5b81e Merge branch '1.9.1' into devel 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
 2011-10-14 01:38:52 +02:00
Martin Konecny f1864e79d8 CC-2973: Api key is being used for downloads in the "Show Content" window + "Playlist Builder" page. 
-fixed
 2011-10-14 00:12:33 +02:00
Martin Konecny d8bcb3f03d CC-2972: Find better way to determine domain which pypo should download from. 
-Done
 2011-10-14 00:07:53 +02:00
Martin Konecny 33d33a19d8 Merge branch '1.9.1' into devel 2011-10-13 23:37:04 +02:00
Martin Konecny 38f2290214 CC-2972: Find better way to determine domain which pypo should download from. 
-remove basePort and baseUrl from code + config file, since it isn't used anywhere.
 2011-10-13 23:35:18 +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 600c480ac3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 17:27:12 -04:00
James 701094b743 CC-2946: "Record" should be renamed to "Record from Line In" 
- fixed
 2011-10-11 17:26:56 -04:00
Yuchen Wang 45aa38111c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 16:48:56 -04:00
Yuchen Wang 37e4fac560 CC-2387: Changing admin password requires entering first / last name 
Entering first and last name is no longer required when changing password.
 2011-10-11 16:47:53 -04:00
James 20e9002310 CC-2956: Undefined variable: endDateTime in 
/usr/share/airtime/application/models/Show.php on line 807,
referer: http://localhost/Schedule

- fixed
 2011-10-11 16:36:01 -04:00
James efbd2f53d0 CC-2745: Show status of liquidsoap/icecast connection on Stream 
Settings page

- temp commit
 2011-10-11 14:40:30 -04:00
james d3833f9a32 CC-2745: Show status of liquidsoap/icecast connection on Stream Settings 
page

- initial commit
 2011-10-10 20:14:27 -04:00
James 1059cee80c CC-2922: Manage media folders text 
- done
 2011-10-06 15:39:42 -04:00
James 04bcd47a31 CC-2936: Soundcloud: handle the case where the soundcloud server 
is not responsive

- fixed
 2011-10-05 17:48:25 -04:00
James c35f77a9aa CC-2932: Recorder: When show is recorded, the file name is generated 
with UTC time.

- fixed
- new pybundle is created with 'pytz' package
 2011-10-05 17:27:00 -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
James b90b69ebde CC-2926: Clicking "Choose File" in support settings to upload image 
defaults to "Audio/MPEG" type in Chrome

- fixed
- extra fix: removing debugging code from api_client.py
 2011-10-05 11:21:13 -04:00
James 3f495e7532 CC-2795: Give option to set download flag of recorded shows uploaded 
to Soundcloud by default

- changed function name
- changed database flag name
 2011-10-04 17:38:21 -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
martin 7dd14efe27 CC-2750: Ability to query health status for pypo, 
liquidsoap, media monitor, and recorder
 2011-10-04 15:49:02 -04:00
martin d54066fca8 -undo weird automerge by git. 2011-10-04 14:11:20 -04:00
martin cb3060623c Merge branch '1.9.1' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
 2011-10-04 14:01:48 -04:00
martin 5190a0c24c Merge branch '1.9.1' into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/MusicDir.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
 2011-10-04 13:59:27 -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 b4d4c54c31 CC-2795: Give option to set download flag of recorded shows uploaded 
to Soundcloud by default

- fixed name of Soundcloud Model class
 2011-10-03 18:02:01 -04:00
James d4063a8234 CC-2873: Soundcloud plugin doesn't log any error when there is an 
error with soundcloud uploading through api controller

- changed constant name to 'SOUNDCLOUD_NOT_UPLOADED_YET'
 2011-10-03 17:38:57 -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 0e29dfa617 CC-2917: Adding show, when inputting time and specifying a bogus 
time (like 55555), then Nan-Nan-Nan shows up(possibly when tabbing)

- fixed by implementing masking on the fields
- used meioMask jquery plugin
 2011-10-03 16:43:32 -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 1d172ca630 CC-2904: Space missing between two boxes on "Playlist Builder" 
- fixed
 2011-10-03 14:26:10 -04:00
James dcda08e17a CC-2919: Media Monitor: recorded show doesn't show on library after 
recording is done

- fixed
- extra fix: Airtime wasn't updating file when updating metadata

Conflicts:

	airtime_mvc/application/controllers/LibraryController.php
 2011-10-03 14:17:56 -04:00
James 83e8a610df Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-03 14:13:15 -04:00
James 5e9aec93a8 CC-2919: Media Monitor: recorded show doesn't show on library after 
recording is done

- fixed
- extra fix: Airtime wasn't updating file when updating metadata
 2011-10-03 14:10:47 -04:00
martin 27892c8b46 CC-2906: Airtime Volume Control is invisible when turned on. 
-fixed
 2011-09-30 15:48:12 -04:00
martin 20c2405f20 CC-2907: Stream player window gets a 404 when clicked 
from "Stream settings" page

-fixed
 2011-09-30 14:46:09 -04:00
martin 1bdcff1119 CC-2750: Ability to query health status for pypo, 
liquidsoap, media monitor, and recorder

-renamed CcComponent to CcServiceRegister
 2011-09-30 14:08:15 -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
martin 421f543f99 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-29 18:19:08 -04:00
martin b9863e660e CC-2806: Create upgrade template file 
-initial commit
 2011-09-29 18:18:08 -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 bf15b4cf0d Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-09-29 15:22:40 -04:00
James 3775e5f4a7 CC-2882: Airtime cannot delete watched folder when is been renamed 
- done
 2011-09-29 15:02:34 -04:00
James 46146d1216 cc-2882: Airtime cannot delete watched folder when is been renamed 
- initial commit

Conflicts:

	airtime_mvc/application/models/MusicDir.php
 2011-09-29 15:02:30 -04:00
James 89a4c2e1e3 - Changing -3 to PHP constant 2011-09-29 14:47:07 -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
James 1c652b6416 CC-2873: Soundcloud plugin doesn't log any error when there is an error 
with soundcloud uploading through api controller

- Changed constant names
- added -1 constant
 2011-09-29 10:30:40 -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 4e105e6151 CC-2891: Unicode error with metadata that contains unicode strings 
-fixed
 2011-09-28 16:04:40 -04:00
James 28f1d885f2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-28 13:46:10 -04:00
James d1542b0d89 CC-2882: Airtime cannot delete watched folder when is been renamed 
- done
 2011-09-28 13:45:21 -04:00
martin f697e475fd CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder 
-remove icecast monitoring for now
 2011-09-28 12:45:19 -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
James b1fa8901ca cc-2882: Airtime cannot delete watched folder when is been renamed 
- initial commit
 2011-09-27 14:49:03 -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
martin df4bf9e1c7 CC-2833: Use ClassLoaders for PHP Files 2011-09-26 17:01:43 -04:00
martin fb9ab448b7 CC-2833: Use ClassLoaders for PHP Files 2011-09-26 15:43:58 -04:00
martin 685cc87951 CC-2833: Use ClassLoaders for PHP Files 
-temporarily reenable some files from being always loaded
 2011-09-26 15:32:56 -04:00
martin 9e6a1ebf44 CC-2833: Use ClassLoaders for PHP Files 
-autoload DateHelper class
 2011-09-26 15:29:12 -04:00
martin b8838a5bda CC-2833: Use ClassLoaders for PHP Files 
-autoload AtSoundcloud class
 2011-09-26 15:25:03 -04:00
martin dfe43c98bb CC-2833: Use ClassLoaders for PHP Files 
-autoload RabbitMq class
 2011-09-26 15:19:23 -04:00
james e1fe877ac6 CC-2873: Use PHP constants 
- done
 2011-09-25 17:29:57 -04:00
martin 5cc7de95ee CC-2833: Use ClassLoaders for PHP Files 
-Done for class User
 2011-09-23 17:00:55 -04:00
martin 1e9a8a28fe CC-2833: Use ClassLoaders for PHP Files 
-Done for class Schedule and ScheduleGroup
 2011-09-23 16:50:00 -04:00
martin cd95170b06 CC-2807: Remove AIRTIME_VERSION from constants.php and use the value in the database instead 
-done
 2011-09-23 16:26:19 -04:00
martin e60db9e031 CC-2860: When recording a show, UTC time is displayed on the 
text field of right progress bar.
 2011-09-23 15:37:45 -04:00
martin 1dd78d0584 CC-2833: Use ClassLoaders for PHP Files 
-Found out ClassLoaders only want one class per file. Moved
 ShowInstance class to its own .php file.
-Merged Show_DAL class into Show class
 2011-09-23 12:33:28 -04:00
martin 693c72c396 -change Shows.php to Show.php 2011-09-23 10:56:12 -04:00
martin 9bb901945e CC-2833: Use ClassLoaders for PHP Files 
-shows.php
 2011-09-23 10:54:20 -04:00
martin 7bb9e92ac9 cc-2864: upgrade from 1.7 broken 
-fixed
 2011-09-22 17:30:05 -04:00
James e722ff8c36 CC-2873: soundcloud error log to DB 
- fixed
 2011-09-22 16:59:13 -04:00
Paul Baranowski 48b08893f0 CC-2306: Uploading a file that already exist error message does not have styling 
Tweaked message to the user.
 2011-09-22 15:31:21 -04:00
James 965a649d0e CC-2591: Change function name 
- done
- extra fix: fix was needed due to class name change
 2011-09-22 14:01:05 -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