drigato
911c168765
SAAS-821: Wire up new player bar with muses
...
Play and stop is working
2015-05-29 09:14:23 -04:00
drigato
8f8b0b7f4d
Merge branch 'saas-dev' into saas-landing-page
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/views/scripts/embed/player.phtml
2015-05-28 13:25:18 -04:00
drigato
27868fbfe5
SAAS-813: Wire up schedule widget on Radio Page
2015-05-27 13:50:25 -04:00
drigato
a569387c5a
Removed extra white space
2015-05-27 10:19:15 -04:00
drigato
2d577dbcb0
Small fix to embed player metadata
2015-05-27 10:09:13 -04:00
drigato
793e959cae
SAAS-811: Insert extra radio page buttons onto player bar
2015-05-27 10:08:51 -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
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
a8bf8e5ec9
SAAS-786: Implement Landing Page Design
...
Fixed player iframe to bottom of screen
2015-05-19 16:03:59 -04:00
drigato
5b6a88f7fd
Fix bad merge that added soundcloud settings back into preferences page
2015-05-19 15:51:04 -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
4451c49c06
SAAS-772: Send metadata to Tunein
...
This is pretty much working except with master source metadata
2015-05-19 14:39:05 -04:00
Albert Santoni
1c88d6dccd
Merge branch 'saas' into saas-dev
2015-05-19 12:18:54 -04:00
Albert Santoni
20649f73bd
Added missing translation for disk quota error message
2015-05-19 12:18:01 -04:00
drigato
e91b520b42
SAAS-786: Implement Landing Page Design
...
- Separated embed player css from radio page css because I had to change
the responsive design a bit.
- Trying to embed the iframe on the radio page but there are some
conflicting styles
2015-05-15 16:19:18 -04:00
drigato
479dbc5525
SAAS-786: Implement Landing Page Design
...
Implemented logo, station name and description
2015-05-15 09:01:20 -04:00
drigato
b023f191e3
SAAS-772: Send metadata to Tunein
...
Added form validation by making a test request to the TuneIn API with
the user-entered values
2015-05-14 13:13:33 -04:00
Duncan Sommerville
612aa37738
Merge branch 'saas' into saas-dev
2015-05-13 19:32:53 -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
15bebc6267
Dangerous options subform on Preferences page and Delete all tracks button
2015-05-13 15:56:08 -04:00
drigato
10ca987a51
SAAS-762: Implement schedule widget design
2015-05-12 11:56:35 -04:00
drigato
24ebc8c8e4
Merge branch 'saas' into saas-landing-page
2015-05-11 15:54:02 -04:00
drigato
77241bb6fc
Merge branch '2.5.x' into saas
2015-05-11 14:57:58 -04:00
drigato
2953576921
CC-5997: Tracks get scheduled outside of the show start and end time
2015-05-11 14:57:20 -04:00
drigato
9ad0628efa
SAAS-732: Clean up weekly program widget
2015-05-05 15:07:12 -04:00
Duncan Sommerville
8b380086c3
Merge branch 'saas-dev' into saas-speedy
2015-05-04 13:09:51 -04:00
drigato
f375115825
Merge branch 'saas' into saas-landing-page
2015-05-04 09:40:26 -04:00
Duncan Sommerville
272bb11fcf
Fixed player displaying nothing (instead of Offline) when no show is scheduled
2015-04-30 14:36:33 -04:00
Albert Santoni
0418cdbc04
Nerf a player console.log call
2015-04-29 17:26:51 -04:00
Albert Santoni
85cc373328
Embedded player: Display the show name during master/show source
2015-04-29 16:03:36 -04:00
Duncan Sommerville
e73a6df796
Fix for invalid date format issue in Firefox
2015-04-29 15:23:29 -04:00
Albert Santoni
1215eb1895
Prevent NaN from causing problems with player timeout
2015-04-29 12:58:32 -04:00
Albert Santoni
c72cdbc19d
More preventative coding for the player and fixed the live-info-v2 API
2015-04-29 12:17:44 -04:00
Albert Santoni
c0bd28f6d5
Prevent negative timeouts in player
2015-04-29 11:59:17 -04:00
Albert Santoni
9019377d0e
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-04-29 11:48:15 -04:00
Albert Santoni
b3a19ae49e
Bugfix for embedded player sending too many requests on load, quieter logging for boto
2015-04-29 11:46:44 -04:00
Duncan Sommerville
94fc2131ff
SAAS-738 - Changed disk quota exceeded link to point to billing/upgrade
2015-04-27 16:19:15 -04:00
drigato
9b7acb24c6
SAAS-728: Make schedule widgets embeddable
2015-04-22 12:46:41 -04:00
drigato
de8edf982a
SAAS-723: Add compatibility chart to player page
2015-04-20 10:52:49 -04:00
drigato
9cee7bcc86
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-04-20 10:05:55 -04:00
drigato
926d1704bf
SAAS-723: Add compatibility chart to player page
2015-04-20 09:59:17 -04:00
Albert Santoni
82a129285c
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-04-17 15:23:56 -04:00
Albert Santoni
1515984664
Merge remote-tracking branch 'origin/saas-suspend' into saas
2015-04-17 15:23:40 -04:00
Albert Santoni
6dc8837aff
Removed unused status page stuff for Pro and cleanup for code review
2015-04-17 11:17:35 -04:00
drigato
7c7bacfcaf
Remove console.log
2015-04-15 14:20:31 -04:00
drigato
d5dfa9af81
player testing console.log
2015-04-15 13:53:24 -04:00
drigato
880cca4733
SAAS-715: Indicate errors on the player
...
Fix error handling in flash mode
2015-04-15 13:21:54 -04:00
drigato
66a236a842
Better error handling for player in flash mode
2015-04-14 10:51:52 -04:00
drigato
83c21d4381
SAAS-715: Indicate errors on the player
...
logging for flash testing
2015-04-13 14:29:39 -04:00
