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

136 Commits

Author SHA1 Message Date
Duncan Sommerville 936d11b367 Merge branch '2.5.x-albertenhancements' into saas 2015-02-27 17:21:20 -05:00
Duncan Sommerville 78c7170c4e Reformatted logo remove button to use Zend 2015-02-27 17:19:37 -05:00
Albert Santoni 562c2f0100 Remove widget JS snippet animation because it's bugged 2015-02-24 15:18:39 -05:00
Albert Santoni e13e4413ea Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas 2015-02-24 15:03:06 -05:00
Duncan Sommerville 5e256df061 Added remove button for station logo on preferences page 2015-02-24 12:12:30 -05:00
Albert Santoni 7c28b66ce9 Merge branch '2.5.x-albertenhancements' into saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/Preferences.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-15 16:32:29 -05:00
Albert Santoni f9bf71a349 Moved the Station Logo field to GeneralPreferences, and stopped using 
AJAX on the general prefs form
 2015-01-15 16:28:18 -05:00
Albert Santoni d5b969f94f Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
 2015-01-13 21:31:57 -05:00
Duncan Sommerville af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -05:00
Duncan Sommerville 4dab2abf4e Replaced reoccurring strings with string formatting to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville 4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -05:00
Duncan Sommerville 3046003a1b Removed unnecessary cookie declaration for default locale 2014-11-05 17:27:41 -05:00
Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas 
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
 2013-12-17 17:20:38 -05:00
denise 0b66f62045 Removed old jquery syntax 2013-09-06 11:08:01 -04:00
Martin Konecny 254d3b8950 Merge branch '2.4.x' into 2.4.x-saas 2013-05-22 16:09:02 -04:00
Daniel James 717cda984a Fixed 'steam' typo in stream settings tooltip 2013-05-22 10:21:27 +01:00
Martin Konecny 3b9b23a7dd Merge branch '2.3.x-saas' into 2.4.x-saas 
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/models/Schedule.php
	python_apps/pypo/airtime-playout
 2013-05-21 16:40:10 -04:00
Martin Konecny ae41a4f9ff more persistent links (won't be invalid if title changes) 2013-05-17 13:20:28 -04:00
Naomi b0cdc606f8 CC-5096 : Add "i" (info) icon to stream output type 2013-05-15 15:38:46 -04:00
Naomi 393c8abb95 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 18:14:51 -04:00
Naomi 7d5177d77d CC-5096 : Add "i" (info) icon to stream output type 2013-05-14 18:14:38 -04:00
Martin Konecny 70a8d3d5dd CC-5146: 
Output Stream Settings: Please disable options opus and aac when streaming server is SHOUTcast

-fixed
 2013-05-14 16:16:58 -04:00
denise a3eda62bb2 CC-5113: Preferences -> Mail Server Config: Error present will cause web form read-only 2013-05-10 15:18:54 -04:00
Martin Konecny 43ffa2aece Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/SystemstatusController.php
 2013-03-06 13:47:21 -05:00
Martin Konecny 5ceeb88899 Merge branch '2.3.x' into devel 2013-03-06 13:46:01 -05:00
Martin Konecny 0ef1a5ffda CC-4976: Cannot select Ogg/Vorbis output stream after selecting SHOUTcast then selecting Icecast 
-fixed
 2013-03-05 18:19:08 -05:00
Martin Konecny 8bec9dea55 Merge branch '2.3.x' into 2.3.x-saas 2013-02-20 14:41:55 -05:00
Naomi 542553bbc1 Merge branch '2.3.x' into devel 2013-02-15 17:05:36 -05:00
Martin Konecny bb7e56e39e CC-4943: Raspberry Pi optimization: don't create new background AJAX request until the previous one has returned 
-fixed
 2013-02-14 12:58:31 -05:00
denise 525b2dcb33 CC-4895: Remove all json die() statements from code 
- removed json_encode
 2013-02-07 15:41:47 -05:00
Martin Konecny 0a198ae424 Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/models/User.php
 2013-01-30 18:31:45 -05:00
Martin Konecny b15c4569eb CC-4894: Need to filter output for potential XSS exploits 
-fixed few areas
 2013-01-29 15:17:29 -05:00
Martin Konecny 7c327e4c75 Merge branch '2.3.x' into 2.3.x-saas 2013-01-25 12:12:21 -05:00
denise 1873022a13 CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page? 
-fixed
 2013-01-25 11:21:34 -05:00
Martin Konecny 784cb390d3 Merge branch 'devel' into 2.3.x-saas 2013-01-17 10:56:18 -05:00
denise f7e8fd33fd CC-4848: Streaming server passwords should be hidden with dots, once entered 
-fixed
 2013-01-16 14:36:56 -05:00
Martin Konecny c57e19983c -fix merge mistakes from devel 2013-01-15 14:06:02 -05:00
Martin Konecny 8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
 2013-01-15 13:44:44 -05:00
Martin Konecny fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead 
-Make '/' the default root
 2013-01-14 16:00:38 -05:00
Martin Konecny c11edea253 CC-4802: Preferences -> Soundcloud settings: Sub-options can be checked before major one 
-fixed
 2013-01-11 13:13:36 -05:00
denise 9755ea6a20 CC-4814: System->Streams: Tool tips' content of output stream's admin user field is not listed in airtime.po file 
-fixed
 2013-01-08 16:47:00 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page 
- done
 2013-01-03 17:58:50 -05:00
James 0f4ddc904f CC-4756: System -> Streams: "Addtional Options" is not expandable when connection error happens 
- fixed
 2013-01-03 14:54:07 -05:00
Martin Konecny f7bcc8a4ed Merge branch 'patch-2' of https://github.com/havban/Airtime into devel 2013-01-02 16:24:04 -05:00
james cf38e2c596 CC-4754: Replay gain modifier 
- done
 2012-12-27 22:58:41 -05:00
james c0665e4748 CC-4754: Replay gain modifier 
- Initial commit
 2012-12-27 00:36:11 -05:00
Febiansyah Hidayat 5e9d5bd71a Update airtime_mvc/public/js/airtime/preferences/streamsetting.js 
Update statement to remove "disabled" attribute to be compatible with chrome and firefox browser.

Perform commit in devel branc as requested in: https://github.com/sourcefabric/Airtime/pull/21#issuecomment-11144375
 2012-12-08 09:25:19 +09:00
Martin Konecny b1985e2bdf SAAS-290: Hosted SaaS widgets + javascript code generation 
-fix code box not automatically expanding on page refresh
 2012-12-04 17:42:28 -05:00
denise 1846f17bbc CC-4731: Cannot save support feedback settings 2012-12-04 16:21:45 -05:00
denise 89e0458500 CC-4728: Support Feedback save action does not use ajax 
-done
 2012-12-03 17:15:47 -05:00