Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
15098 commits 3 branches 0 tags 405 MiB
Commit graph

47 commits

Author SHA1 Message Date
Lucas Bickel
baa0f9ba77 Make CORS great again 
This fixes CORS to work properly with most 2.5 api endpoints while keeping the JSONP format available.

* [x] return JSONP or JSON with proper CORS headers from API
* [x] Field in Genereal Preferences Form to configure CORS enabled URLs

See #17 for what triggered this refactor. I beleive this should make integrating the APIs on the client side trivial without mandating the use of JSONP.
 2017-03-10 15:10:56 +01:00
Duncan Sommerville
eae8c7b638 Temporary fix to make enclosure urls iTunes compatible 2015-11-17 21:06:51 -05:00
Duncan Sommerville
1571887928 Change how station logo default is returned 2015-11-17 18:58:58 -05:00
Duncan Sommerville
6580c12ad3 Add station podcast privacy toggle 2015-10-21 17:30:24 -04:00
drigato
0601bd675e SAAS-939: Add option to preferences to display login button on radio page 2015-07-09 14:38:44 -04:00
Duncan Sommerville
6fb9c6a30c SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences 2015-06-25 14:13:09 -04:00
drigato
8e8f8aa55b Radio Page Code Review Changes 
Defined a SAAS_PRODUCT_BRANDING_NAME constant.
Defined constants for default station logo.
 2015-06-10 12:23:19 -04:00
drigato
305cb894c3 SAAS-841: Default station logo to the Airtime logo 2015-06-03 11:53:32 -04:00
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
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
Albert Santoni
c4d3a8fa62 Massive simplification of the GeneralPreferences dialog 
* The purpose of this was so that we can use Zend_Form_Element
  decorators, which I need.
 2015-01-13 20:51:46 -05: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
Naomi
517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
Naomi
410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist. 
changing default fade to be a separate default fade in/out
 2013-04-29 16:55:08 -04:00
denise
712df8b12d Removed extra style element 2013-01-16 11:10:23 -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
Daniel James
771b9b9412 Fixed whitespace in Preferences page between 'Timezone' and colon 2013-01-07 11:41:29 +00: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
denise
b677130a3f CC-1960Internationalize Airtime / Support translations 
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
 2012-11-23 16:39:41 -05:00
denise
25ddd083bc CC-1960: Internationalize Airtime / Support translations 
-added language option in preferences
 2012-11-21 12:44:50 -05:00
Martin Konecny
4b09b289ce SAAS-290: Hosted SaaS widgets + javascript code generation 
Slight improvements to description as well as element
positioning
 2012-11-07 15:44:22 -05:00
Martin Konecny
1b0b124247 SAAS-290: Hosted SaaS widgets + javascript code generation 
-working code
 2012-11-07 12:49:17 -05:00
Martin Konecny
27d40ef4df SAAS-290: Hosted SaaS widgets + javascript code generation 2012-11-06 18:10:53 -05:00
denise
ca8187c9c2 CC-3718: Please enable user to input the mail server settings 
-done
 2012-06-11 12:53:09 -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
4cdfd33044 CC-3667 : Preferences pages should have an option to enable/disable password recovery option 2012-04-25 11:32:43 +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
3cd11c696f CC-3184 : Preferences: "Stream Label" needs to be moved to "Stream Settings"->"Global" 2011-12-13 12:10:25 +01: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
martin
4ca480ba5e Merge branch '1.9.1' into devel 2011-08-19 17:07:59 -04:00
James
30fcb0b95d CC-2704: Support settings UI tweaks 
- adding server name again under Preference
 2011-08-19 16:42:46 -04:00
James
8e0496d8c1 CC-2704: Support Setting UI tweak 
Merge branch '1.9.1' into devel

Conflicts:
	airtime_mvc/application/forms/GeneralPreferences.php
 2011-08-19 12:22:08 -04:00
James
db225dd610 CC-2704: Support settings UI tweaks 
- Move station name to "Support Settins" page
 2011-08-19 12:19:35 -04:00
martin
84ec62eeca CC-1942: Add ability to set timezone in preferences 
-Can change the timezone for PHP. Need to change for python as well.
 2011-08-15 10:06:42 -04:00
James
f95e881ec5 CC-2501:Registration:wording changes 
- fixed
 2011-07-14 16:06:13 -04:00
Naomi Aro
b6888489e0 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
adding music dirs concept to Airtime. New cc_music_dirs table/class.
 2011-06-21 10:24:02 +02:00
Naomi Aro
ea21da6b61 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 
recursively copying the audio_samples directory.
 2011-06-17 17:54:36 +02:00
Paul Baranowski
eb76bbe7f0 Merge branch 'master' of dev.sourcefabric.org:airtime 
Conflicts:
	VERSION
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/Shows.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/user/remove-user.phtml
	airtime_mvc/public/js/airtime/schedule/add-show.js
	airtime_mvc/public/js/airtime/schedule/schedule.js
	install/airtime-upgrade.php
	install/include/AirtimeInstall.php
	python_apps/api_clients/api_client.py
	utils/airtime-clean-storage
	utils/airtime-clean-storage.php
	utils/airtime-import
	utils/airtime-import.php
 2011-04-25 17:24:53 -04:00
martin
4b7ea32c7d -syntax errors discovered by eclipse 2011-04-21 17:23:59 -04:00
Paul Baranowski
b11cbd8159 CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly. 2011-04-14 18:55:04 -04:00
Renamed from application/views/scripts/form/preferences_general.phtml (Browse further)