Commit Graph

135 Commits

Author SHA1 Message Date
denise 80bdc95cd5 -redoing a commit undo 2012-09-10 17:24:18 -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