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

1024 Commits

Author SHA1 Message Date
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 82f087c84d CC-84: Smart Playlists 
- changed db query so it's lazy loading
 2012-07-19 14:45:15 -04:00
James 266d86d9e4 CC-84: Smart Playlists 
- fixed a bug
- change LIKE to ILIKE
 2012-07-18 16:12:06 -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
James 2a38527161 CC-84: Smart Playlists 
- propel usage chage
- cleaning up code
- some js changes
 2012-07-18 11:52:09 -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
Vladimir 1e76845e9c more sophisticated remote_addr determining 2012-07-17 13:34:48 -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
Rudi Grinberg 20e32b98ba Merge branch 'devel' into mediamonitor2 
Conflicts:
	python_apps/api_clients/api_client.py
 2012-07-16 17:41:36 -04:00
James fc09baacd7 CC-84: Smart Playlists 
- static playlist is done.
 2012-07-16 17:18:37 -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
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 b4f1cc13c0 CC-430: Audio normalization (Replaygain Support) 
make code simpler (don't download database to file)
 2012-07-15 22:19:16 -04:00
Martin Konecny 794cf2c845 CC-4090: Make code style PSR compliant 
-run psr-cs-fixer
 2012-07-15 21:17:13 -04:00
James 601263b7a0 CC-84: Smart Playlists 
- adding propel files for playlistcriteria table
 2012-07-13 16:16:07 -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
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
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
Martin Konecny bd51b4db02 CC-4100: Make number of shows displayed in widget customizable 
-fixed
 2012-07-11 19:31:24 -04:00
James 93b34bb079 CC-84: Smart Playlists 
- controller skeleton
- playlist model dummy functions
 2012-07-11 16:14:11 -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
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 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
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
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
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
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 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 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
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 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
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 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
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 f433fd89fe CC-3970: Password Reset: No UI error msg for no mail server founded 
-done
 2012-06-13 16:04:57 -04:00
denise 9cabd4d32c CC-3921: Add mobile phone number field to user record 
-done
 2012-06-13 13:39:54 -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
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 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 6316c23b25 CC-3954: apache log errors part3 
- bug fix
 2012-06-11 16:10:51 -04:00
James c78ba0faf6 CC-3954: apache log errors part3 
- fixed
 2012-06-11 15:52:39 -04:00
denise d498c51814 Merge branch '2.1.x' into devel 2012-06-11 15:10:33 -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
Martin Konecny 0416c05f9c add reason why Propel connection failed 2012-06-08 12:06:54 -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 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 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
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 74e9f70506 CC-3928: Use liquidsoap to test whether file is playable on upload. 
-done
 2012-06-05 11:24:40 -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 89c0583849 CC-3926: System -> Stream setting: input ' into "Name/Description" will cause PDOException 2012-06-03 22:39:42 -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 8b4c876c5b CC-3884 : UI constantly refreshes when filtered by a show in a timerange 2012-05-24 17:33:15 +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
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
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 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 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
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
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 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 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
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