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
|
e44e0de534
|
Add fields to SoundCloud upload
|
2015-06-24 15:46:53 -04:00 |
|
Duncan Sommerville
|
616cf143d5
|
SAAS-877 - Fix live-info-v2 behaviour
|
2015-06-24 14:28:04 -04:00 |
|
Duncan Sommerville
|
ef957fe0aa
|
SAAS-877 - Fix errors
|
2015-06-24 13:07:13 -04:00 |
|
Duncan Sommerville
|
fd8194e7d8
|
Fix error getting media
|
2015-06-24 12:40:51 -04:00 |
|
Duncan Sommerville
|
ffc3ef1bc9
|
SAAS-877 - Update live-info-v2 api
|
2015-06-24 12:31:32 -04:00 |
|
Duncan Sommerville
|
7645f67515
|
SAAS-877 - Update live-info-v2 api
|
2015-06-24 12:18:52 -04:00 |
|
Duncan Sommerville
|
065988f703
|
Return default value for disk quota if none set
|
2015-06-23 19:08:49 -04:00 |
|
Duncan Sommerville
|
76a7aa9a24
|
Fix SoundCloud and TaskManager bugs, switch tasks to use acks_late, and provide feedback from SoundCloud context menu items
|
2015-06-18 18:18:48 -04:00 |
|
Duncan Sommerville
|
0cd9b1d0e5
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-16 15:10:14 -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 |
Albert Santoni
|
5b6f4ca12a
|
SAAS-863: Streams not disabled properly in Liquidsoap config when downgrading
|
2015-06-15 12:19:03 -04:00 |
|
Duncan Sommerville
|
706d7db2b2
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-15 11:03:37 -04:00 |
|
Duncan Sommerville
|
15c7ef5885
|
Celery backend and support for dev-env worker parallelization
|
2015-06-12 12:31:55 -04:00 |
|
Albert Santoni
|
0f3b68eed7
|
Default the Public Airtime API to being on
|
2015-06-10 17:55:04 -04:00 |
|
Duncan Sommerville
|
459f9494c3
|
Merge saas-dev into soundcloud
|
2015-06-10 16:08:52 -04:00 |
|
Duncan Sommerville
|
626489bb3b
|
SAAS-853 - Celery backend for SoundCloud uploads
|
2015-06-10 15:04:49 -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
|
3996e757b7
|
Merge branch 'saas-dev' into saas-installer-albert
|
2015-06-10 12:02:08 -04:00 |
|
drigato
|
0796f58878
|
Merge branch 'saas-dev' into saas-landing-page
|
2015-06-10 11:14:02 -04:00 |
|
Albert Santoni
|
6126e8a51c
|
Merge branch 'saas' into saas-dev
|
2015-06-10 11:02:59 -04:00 |
|
drigato
|
ca8ca0abed
|
Merge branch 'saas-dev' into saas-landing-page
|
2015-06-10 09:07:12 -04:00 |
|
Albert Santoni
|
fb1fc6fb00
|
CC-6056: Station Metadata API returns wrong streaming links for Shoutcast servers
|
2015-06-09 17:14:33 -04:00 |
|
Duncan Sommerville
|
f031d13867
|
Merge branch 'saas-dev' into soundcloud
|
2015-06-09 14:03:03 -04:00 |
|
Duncan Sommerville
|
49165e91d9
|
SAAS-854 - celery-based SoundCloud backend uploader
|
2015-06-09 14:02:29 -04:00 |
|
drigato
|
87920c1fc1
|
SAAS-855: Default station description in Preferences
|
2015-06-09 09:01:15 -04:00 |
|
Albert Santoni
|
23dd6d4021
|
CC-6054: live-info-v2 returns future shows without ordering by start time
|
2015-06-08 16:38:17 -04:00 |
|
Albert Santoni
|
ada6b97873
|
CC-6050: User management bugfix
|
2015-06-05 12:34:51 -04:00 |
|
Duncan Sommerville
|
b0b6e037ac
|
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
|
2015-06-03 16:57:17 -04:00 |
|
drigato
|
305cb894c3
|
SAAS-841: Default station logo to the Airtime logo
|
2015-06-03 11:53:32 -04:00 |
|
Albert Santoni
|
01ea6f27ae
|
Merge branch 'saas-dev' into saas-installer-albert
Conflicts:
python_apps/api_clients/api_clients/api_client.py
|
2015-06-02 15:40:57 -04:00 |
|
drigato
|
b5e72d673f
|
Next track in dashboard was wrong sometimes
Was not filtering by playout_status
|
2015-06-02 09:48:43 -04:00 |
|
drigato
|
182b12e0e3
|
SAAS-794: Schedule/get-current-playlist can take too long to respond
Fix for incorrect previous/next metadata when tracks are shuffled around
in current playing show.
|
2015-05-28 09:47:58 -04:00 |
|
drigato
|
532bd1ea85
|
SAAS-772: Send metadata to Tunein
Made Improvement so Airtime always makes a request to TuneIn every 4
minutes so TuneIn does not turn metadata off
|
2015-05-25 15:37:45 -04:00 |
|
Albert Santoni
|
6fad0a3ee6
|
Merge branch 'saas-dev' into saas-installer-albert
|
2015-05-22 19:09:30 -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
|
c85457ec0b
|
SAAS-794: Schedule/get-current-playlist can take too long to respond
Fix for undefined variable
|
2015-05-22 10:53:29 -04:00 |
|
drigato
|
099537a1b7
|
SAAS-794: Schedule/get-current-playlist can take too long to respond
Renamed function
Removed old function
|
2015-05-22 09:47:55 -04:00 |
|
drigato
|
8b02002f5e
|
Merge branch 'saas-dev' into saas-temp-testing
|
2015-05-22 08:56:43 -04:00 |
|
drigato
|
c9a6260cc0
|
SAAS-794: Schedule/get-current-playlist can take too long to respond
Removed commented code
|
2015-05-22 08:53:29 -04:00 |
|
drigato
|
5330859f00
|
SAAS-794: Schedule/get-current-playlist can take too long to respond
small fix
|
2015-05-22 08:51:32 -04:00 |
|
drigato
|
b80c102e99
|
SAAS-794: Schedule/get-current-playlist can take too long to respond
Fixes for webstreams
|
2015-05-22 08:09:59 -04:00 |
|
Albert Santoni
|
e86e1cb4ac
|
Merge branch 'saas-dev' into saas-speedy
|
2015-05-21 15:10:01 -04:00 |
|
Albert Santoni
|
2b8e40a12c
|
Merge branch 'saas' into saas-speedy
|
2015-05-21 15:09:57 -04:00 |
|
drigato
|
537fd2f148
|
SAAS-794 Schedule/get-current-playlist can take too long to respond
Replaced GetPrevCurrentNext function with new one that is much simpler
and less taxing on the database and web server.
|
2015-05-20 16:10:31 -04:00 |
|
Albert Santoni
|
b8dd7f0df3
|
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
|
2015-05-19 16:21:16 -04:00 |
|
Albert Santoni
|
ae3fef383e
|
Removed station_domain from messages to airtime_analyzer, unused.
|
2015-05-19 16:20:51 -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 |