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

94 Commits

Author SHA1 Message Date
Duncan Sommerville 12f6536e74 Merge branch 'saas-dev' into saas-dev-publishing 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
 2015-10-19 16:18:19 -04:00
Albert Santoni 2713bd7beb Merge branch 'saas-dev' into saas-3.x-sessionoptimizations 2015-10-14 14:50:54 -04:00
Albert Santoni a90b97fb55 SAAS-1128: Logging in from www.airtime.pro doesn't trigger lang/timezone setup dialog 2015-10-14 14:28:39 -04:00
drigato c166b4f00e Merge branch 'saas-dev-publishing' into saas-dev-publishing-schema-change 
Conflicts:
	airtime_mvc/application/models/airtime/Podcast.php
 2015-10-14 11:04:41 -04:00
Duncan Sommerville c3c4abdd0c Merge branch 'saas-dev' into saas-dev-publishing 
Conflicts:
	airtime_mvc/public/css/dashboard.css
	airtime_mvc/public/css/styles.css
	airtime_mvc/public/js/airtime/library/library.js
	airtime_mvc/public/js/airtime/library/spl.js
 2015-09-30 16:26:02 -04:00
Albert Santoni 8b33acacd3 Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/UserController.php
	airtime_mvc/public/js/airtime/preferences/preferences.js
 2015-09-29 18:58:55 -04:00
drigato b00ac6750c Testing 2015-09-29 13:04:22 -04:00
Duncan Sommerville 67c20630a3 UI revamp what's new dialog 2015-09-28 17:19:02 -04:00
Duncan Sommerville 55d5fc62a2 SAAS-1071 - more work on celery backend 2015-09-22 20:22:06 -04:00
Duncan Sommerville cf1de5fb66 SAAS-1071 - initial work on podcast celery backend; tweak SoundCloud service 2015-09-22 15:26:08 -04:00
Duncan Sommerville f9ace20075 Simplify third-party/celery/soundcloud implementation 2015-09-21 17:03:46 -04:00
Daniel James ad2e26a1c3 IN-1956 Update Transifex project link 2015-09-21 17:44:00 +01:00
drigato 67db2c1d25 SAAS-1063: REST API for podcasts 
Hierarchy routing is working
Basic implentation of podcast INDEX and POST actions done
 2015-09-16 14:22:13 -04:00
drigato c4cb856283 CC-6078: Help page updates 
Added a 'File a Support Ticket' link
 2015-08-28 12:18:44 -04:00
Albert Santoni a08d5b71cf Calendar colour adjustments 
* CC-6099: Improve default show colour
* CC-6100: Choose show background colours randomly from a predefined  palette
 2015-08-27 20:02:32 -04:00
Duncan Sommerville ae66b2272b Fix editor styling and layout issues 2015-08-19 13:02:14 -04:00
Albert Santoni 8dd580e623 Applied context menu restyling globally 2015-08-12 17:47:55 -04:00
Albert Santoni 2a1d09bc08 Factor out default show background colour and fix some style issues 2015-08-12 12:55:39 -04:00
Albert Santoni ea2a6b3f68 Clean up and bugfixes for password reset (SAAS-1009) 2015-08-07 13:57:42 -04:00
Albert Santoni 1d39117b21 Merge remote-tracking branch 'origin/saas-email' into saas-dev 2015-08-05 14:50:58 -04:00
Albert Santoni e49d337db0 Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev 2015-08-05 14:50:31 -04:00
Duncan Sommerville 75aef986ea SAAS-781 - Code review fixes 2015-07-28 11:47:53 -04:00
Duncan Sommerville c5e7d6734e SAAS-951 - fix SoundCloud capitalization 2015-07-16 11:03:30 -04:00
Duncan Sommerville 683c1a4641 SAAS-876 - use baseurl for default host value 2015-07-13 15:52:04 -04:00
Duncan Sommerville 9fdc08f88a SAAS-876 - reset to default settings when using Airtime Pro streaming 2015-07-13 12:28:58 -04:00
Duncan Sommerville 5cb396e512 SAAS-923 - 2.5.14 schema upgrade to add partial unique index on cc_pref's keystr column (when subjid is null) 2015-07-06 18:03:44 -04:00
Duncan Sommerville 5cc8774e56 Merge branch 'saas-dev' into soundcloud 
Conflicts:
	airtime_mvc/application/configs/constants.php
 2015-06-29 10:02:58 -04:00
Duncan Sommerville 5fe70754bd Replace all timestamp strings with constant 2015-06-26 14:42:52 -04:00
Duncan Sommerville 7e0b6ac7ba Add transifex link constant 2015-06-26 13:28:05 -04:00
Duncan Sommerville d91b05a0ae SoundCloud - Add release_year metadata field and set default sharing and license types 2015-06-25 10:53:35 -04:00
Duncan Sommerville 8fcaf7fc74 Merge branch 'saas-dev' into soundcloud 
Conflicts:
	airtime_mvc/application/configs/constants.php
 2015-06-24 16:35:06 -04:00
Duncan Sommerville 7645f67515 SAAS-877 - Update live-info-v2 api 2015-06-24 12:18:52 -04:00
Duncan Sommerville 8d2e476ff1 SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager 2015-06-16 15:10:08 -04:00
Duncan Sommerville 3902c8c746 Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs 2015-06-15 15:12:37 -04:00
Duncan Sommerville 8163608666 Merge branch 'saas-dev' into soundcloud 2015-06-10 16:25:30 -04:00
Duncan Sommerville 459f9494c3 Merge saas-dev into soundcloud 2015-06-10 16:08:52 -04:00
drigato d1ac78be68 Fix for station logo....again... 2015-06-10 16:01:16 -04:00
Albert Santoni c18e728583 Merge branch 'saas-installer-albert' into saas-dev 2015-06-10 15:03:11 -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
Albert Santoni 11c6818e61 Merge branch '2.5.x-installer' into saas-installer-albert 
Conflicts:
	.gitignore
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/controllers/SystemstatusController.php
	airtime_mvc/application/controllers/UpgradeController.php
	airtime_mvc/application/upgrade/Upgrades.php
	airtime_mvc/application/views/scripts/systemstatus/index.phtml
	airtime_mvc/build/airtime.conf
	airtime_mvc/build/sql/defaultdata.sql
	airtime_mvc/public/index.php
	airtime_mvc/tests/application/helpers/AirtimeInstall.php
	install_minimal/airtime-install
	install_minimal/include/airtime-constants.php
	install_minimal/include/airtime-copy-files.sh
	install_minimal/include/airtime-db-install.php
	install_minimal/include/airtime-initialize.sh
	install_minimal/include/airtime-install.php
	install_minimal/include/airtime-installed-check.php
	install_minimal/include/airtime-remove-files.sh
	install_minimal/include/airtime-upgrade.php
	python_apps/media-monitor/install/media-monitor-copy-files.py
	python_apps/monit/monit-airtime-generic.cfg
	python_apps/pypo/airtime-playout
	python_apps/pypo/install/pypo-copy-files.py
	python_apps/pypo/liquidsoap/generate_liquidsoap_cfg.py
	python_apps/pypo/liquidsoap/ls_script.liq
	python_apps/pypo/pypo/__main__.py
	python_apps/pypo/pypo/media/update/replaygain.py
	python_apps/pypo/pypo/media/update/replaygainupdater.py
	python_apps/pypo/pypo/media/update/silananalyzer.py
	python_apps/python-virtualenv/airtime_virtual_env.pybundle
	python_apps/python-virtualenv/requirements
	utils/airtime-check-system.php
 2015-05-22 16:05:29 -04:00
drigato a2a9e54553 Merge branch 'saas-dev' into saas-tunein 
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
 2015-05-19 15:50:16 -04:00
drigato cf24c141fd SAAS-772: Send metadata to Tunein 
This is pretty much working for scheduled metadata - just to need to
test with a TuneIn account.
 2015-05-13 16:05:37 -04:00
Duncan Sommerville fc36ff5797 Updated user manual constant to new manual url 2015-04-30 14:51:35 -04:00
Albert Santoni 088ada1d2c Reformatted Bootstrap, added Station Suspended notice 2015-04-10 17:14:56 -04:00
Albert Santoni f69e5afbff SAAS-576: Fixed the Sentry data sanitizer and moved DSN into a config file 2015-02-02 14:42:20 -05:00
drigato ca9750f415 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/ACL.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/build/sql/schema.sql
 2015-01-23 11:32:45 -05:00
Albert Santoni c03dd38c00 Merge branch '2.5.x' into 2.5.x-installer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Show.php
 2015-01-16 17:27:52 -05:00
Albert Santoni ee9163fa8e 2.5.2: Reorganize upgrade path so that 2.5.2 contains the show art schema changes 
* Also bump the system_version number to 2.5.2. This will be deprecated sooner or later...
 2015-01-15 12:42:36 -05:00
Daniel James cfe3527b93 Fix link to user manual 2015-01-15 16:33:03 +00:00
Duncan Sommerville 5e22f929c7 Reverted commit mistakenly changing file modifiers to 755 2015-01-14 20:45:03 -05:00