Commit Graph

207 Commits

Author SHA1 Message Date
denise 25ddd083bc CC-1960: Internationalize Airtime / Support translations
-added language option in preferences
2012-11-21 12:44:50 -05:00
denise f88a7bdb31 Merge branch '2.2.x' into devel 2012-11-21 10:54:17 -05:00
denise 48253b8d14 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs.
-fixed
2012-11-21 10:19:21 -05:00
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
Martin Konecny 9c612d17a3 CC-4694: Apache/Zend error only specific to some users 2012-11-19 18:41:31 -05:00
Martin Konecny d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
denise 796274e4ef CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths
-fixed
2012-11-02 15:51:36 -04:00
denise 7d8079f770 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
2012-10-19 12:50:36 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
James 45801e5dc4 - fix spelling of some function name 2012-10-17 15:16:03 -04:00
Rudi Grinberg e5085f0df3 Cleaned up code. 2012-09-19 16:34:46 -04:00
Rudi Grinberg ae1ae80d36 in_array -> array_key_exists 2012-09-17 16:40:22 -04:00
Rudi Grinberg ed45011b40 needle <-> haystack 2012-09-17 14:21:13 -04:00
Rudi Grinberg fef949f6ea band aided some bug 2012-09-17 12:50:04 -04:00
Martin Konecny 3ced92db7a CC-4415: Smart Block audio preview doesn't work 2012-09-14 16:51:14 -04:00
Martin Konecny 78460703a2 CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-done
2012-09-14 14:53:25 -04:00
Martin Konecny e3c1a3ac0e CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-initial commit
2012-09-14 12:09:40 -04:00
Martin Konecny 203378e60a More exception handling 2012-09-13 14:56:03 -04:00
denise 3b43efefe0 CC-4413: Unused local variables in models.
-done
2012-09-12 17:26:41 -04:00
Rudi Grinberg 57b59a3290 Cleaned up preference.php 2012-09-11 14:33:50 -04:00
Rudi Grinberg 1304111682 Shortened code with if -> ? 2012-09-11 14:10:13 -04:00
Rudi Grinberg 63b1ead363 Undefined index error fixed by returning a default error if none is set in the database. 2012-09-11 13:56:48 -04:00
Martin Konecny d8b0de4ffa CC-4387: NULL is set to default Station Name
-fixed
2012-09-10 17:17:52 -04:00
Martin Konecny 101c28f9c3 remove unused variable (PHP 5.4 warning) 2012-09-07 16:50:52 -04:00
James 7d3ac8eb07 CC-4346: Prepared statements - part 2
- done
2012-09-06 16:46:22 -04:00
Martin Konecny f036c84a64 CC-4348: Prepared statements - part 4
-StreamSetting.php
2012-09-05 15:15:56 -04:00
Martin Konecny 8b5f94fa9f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-29 11:05:14 -04:00
Martin Konecny 4848717d4d CC-4090: Make code style PSR compliant - part 4
-models dir
2012-08-29 10:58:03 -04:00
denise 3d20ded170 CC-4307: Add "Never show again" to the pop-up registration prompt
-done
2012-08-28 17:30:34 -04:00
denise 9d90e8c531 CC-4300: System -> Preference: Please add a option let user choose if the SMTP server requires User Authentication
-done
2012-08-28 16:17:37 -04:00
James c2d475e6d8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
2012-08-23 10:43:28 -04:00
James de0aeee594 CC-4254: Library: advanced search on library
- initial commit
2012-08-23 10:41:40 -04:00
Martin Konecny 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -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 ee3447f903 CC-4090: Make code style PSR compliant
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
Martin Konecny e91c96b90e CC-4090: Make code style PSR compliant
StreamSetting.php
2012-07-09 23:32:21 -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
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 b0e93005e5 Merge branch '2.1.x' into devel 2012-06-15 15:04:18 -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 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 ca8187c9c2 CC-3718: Please enable user to input the mail server settings
-done
2012-06-11 12:53:09 -04:00
Martin Konecny 0416c05f9c add reason why Propel connection failed 2012-06-08 12: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 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 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
Martin Konecny eb4207dd1d CC-3863: Stats should not send version number with extra characters
-fixed
2012-05-23 17:25:16 -04:00
James 01439663d9 CC-3863: Stats should not send version number with extra characters
- fixed
2012-05-23 15:06:22 -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
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 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
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 195d0d8311 SAAS-223: Airtime Usage Metric: Amount of time spent broadcasting
-calculated scheduled usage
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
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
denise 96fa5ac715 SAAS-157: Automated metrics: gather info about soundcloud usage
-added soundclound_enabled check
2012-05-07 12:01:36 -04: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
Martin Konecny 1f214747b2 -catch all exceptions in Preference model and make header 503 2012-05-05 22:29:16 -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 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
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
Naomi Aro b6bed6ce7a CC-3667 : Preferences pages should have an option to enable/disable password recovery option 2012-04-25 15:22:38 +02:00
Naomi Aro 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 cba253439a CC-1927: Remove PEAR DB
-various fixes
2012-04-19 16:54:38 -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
denise 8588857def CC-3674: Cannot add songs to 'Now Playing' nor Playlists
-fixed
2012-04-18 16:49:32 -04:00
James 58f4727f17 CC-3666: Default Playlist fade in/out time is not zero.
- fixed
2012-04-18 16:06:23 -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
Martin Konecny 83d78eb0dd -check if exec function is available before using it 2012-04-12 13:36:36 -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
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 12b23443db CC-3547 : Refactoring Views, removing action stack to better work with permissions. Reorganizing Statistics Dialog. 2012-03-29 16:27:08 +02: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 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
James 79f8eabe2b CC-3405: Display to users how to connect a live stream to Airtime
- Done
2012-03-14 14:43:10 -04:00
James 540f262a77 CC-3224: "On-the-fly" stream rebroadcasting
- removed "Allow override" checkbox from show live stream section.
- removed "auto enable live stream" checkbox from stream setting page.
- implemented authentication functionality of live dj source connection.
2012-03-14 14:43:10 -04:00
James f193047a1c CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
are connected and give user the ability to block those streams

- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
James 128a497059 CC-3224: "On-the-fly" stream rebroadcasting
- frond-end implementation for master dj and live dj
- db implementation
- liquidsoap is broken on this commit
2012-03-14 14:41:00 -04:00
James 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
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
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 7247f75563 SAAS-135: Airtime status page reporting free space being incorrectly for Gluster FS mounts
-Done
2012-01-04 14:18:40 -05:00
Naomi Aro c887fec86b CC-3179 : shows populated date must be timestamp. 2011-12-12 21:11:05 +01: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
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
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 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
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