2d577dbcb0
Small fix to embed player metadata
2015-05-27 10:09:13 -04:00
793e959cae
SAAS-811: Insert extra radio page buttons onto player bar
2015-05-27 10:08:51 -04:00
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
e86e1cb4ac
Merge branch 'saas-dev' into saas-speedy
2015-05-21 15:10:01 -04:00
2b8e40a12c
Merge branch 'saas' into saas-speedy
2015-05-21 15:09:57 -04:00
a8bf8e5ec9
SAAS-786: Implement Landing Page Design
...
Fixed player iframe to bottom of screen
2015-05-19 16:03:59 -04:00
5b6a88f7fd
Fix bad merge that added soundcloud settings back into preferences page
2015-05-19 15:51:04 -04:00
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
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
1c88d6dccd
Merge branch 'saas' into saas-dev
2015-05-19 12:18:54 -04:00
20649f73bd
Added missing translation for disk quota error message
2015-05-19 12:18:01 -04:00
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
479dbc5525
SAAS-786: Implement Landing Page Design
...
Implemented logo, station name and description
2015-05-15 09:01:20 -04:00
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
612aa37738
Merge branch 'saas' into saas-dev
2015-05-13 19:32:53 -04:00
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
15bebc6267
Dangerous options subform on Preferences page and Delete all tracks button
2015-05-13 15:56:08 -04:00
10ca987a51
SAAS-762: Implement schedule widget design
2015-05-12 11:56:35 -04:00
24ebc8c8e4
Merge branch 'saas' into saas-landing-page
2015-05-11 15:54:02 -04:00
77241bb6fc
Merge branch '2.5.x' into saas
2015-05-11 14:57:58 -04:00
2953576921
CC-5997: Tracks get scheduled outside of the show start and end time
2015-05-11 14:57:20 -04:00
9ad0628efa
SAAS-732: Clean up weekly program widget
2015-05-05 15:07:12 -04:00
8b380086c3
Merge branch 'saas-dev' into saas-speedy
2015-05-04 13:09:51 -04:00
f375115825
Merge branch 'saas' into saas-landing-page
2015-05-04 09:40:26 -04:00
272bb11fcf
Fixed player displaying nothing (instead of Offline) when no show is scheduled
2015-04-30 14:36:33 -04:00
0418cdbc04
Nerf a player console.log call
2015-04-29 17:26:51 -04:00
85cc373328
Embedded player: Display the show name during master/show source
2015-04-29 16:03:36 -04:00
e73a6df796
Fix for invalid date format issue in Firefox
2015-04-29 15:23:29 -04:00
1215eb1895
Prevent NaN from causing problems with player timeout
2015-04-29 12:58:32 -04:00
c72cdbc19d
More preventative coding for the player and fixed the live-info-v2 API
2015-04-29 12:17:44 -04:00
c0bd28f6d5
Prevent negative timeouts in player
2015-04-29 11:59:17 -04:00
9019377d0e
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-04-29 11:48:15 -04:00
b3a19ae49e
Bugfix for embedded player sending too many requests on load, quieter logging for boto
2015-04-29 11:46:44 -04:00
94fc2131ff
SAAS-738 - Changed disk quota exceeded link to point to billing/upgrade
2015-04-27 16:19:15 -04:00
9b7acb24c6
SAAS-728: Make schedule widgets embeddable
2015-04-22 12:46:41 -04:00
de8edf982a
SAAS-723: Add compatibility chart to player page
2015-04-20 10:52:49 -04:00
9cee7bcc86
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-04-20 10:05:55 -04:00
926d1704bf
SAAS-723: Add compatibility chart to player page
2015-04-20 09:59:17 -04:00
82a129285c
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-04-17 15:23:56 -04:00
1515984664
Merge remote-tracking branch 'origin/saas-suspend' into saas
2015-04-17 15:23:40 -04:00
6dc8837aff
Removed unused status page stuff for Pro and cleanup for code review
2015-04-17 11:17:35 -04:00
7c7bacfcaf
Remove console.log
2015-04-15 14:20:31 -04:00
d5dfa9af81
player testing console.log
2015-04-15 13:53:24 -04:00
880cca4733
SAAS-715: Indicate errors on the player
...
Fix error handling in flash mode
2015-04-15 13:21:54 -04:00
66a236a842
Better error handling for player in flash mode
2015-04-14 10:51:52 -04:00
83c21d4381
SAAS-715: Indicate errors on the player
...
logging for flash testing
2015-04-13 14:29:39 -04:00
24b6751eeb
Remove unused code from player
2015-04-13 09:18:36 -04:00
988fcae989
Remove console.log
2015-04-10 18:17:22 -04:00
63c3236e7a
Player metadata fix
2015-04-10 17:38:39 -04:00
088ada1d2c
Reformatted Bootstrap, added Station Suspended notice
2015-04-10 17:14:56 -04:00
b8e8a1a983
Player HTML5 error handling fix
2015-04-10 16:44:51 -04:00
1d79f13716
Player HTML5 error handling fix
2015-04-10 16:06:19 -04:00
c80d437601
Fixed player HTML5 error handling
2015-04-10 15:25:49 -04:00
9e62c71690
Fix player's manual mode
2015-04-10 10:52:40 -04:00
f238faa937
SAAS-712: UI Improvements
2015-04-09 14:22:50 -04:00
84231f811a
SAAS-720: Player can't be accessed unless a user has a valid session
2015-04-09 12:25:27 -04:00
4429117f6a
SAAS-712: UI Improvements
2015-04-09 09:43:15 -04:00
78b2631980
Remove stream url js escaping and do it on server side instead
2015-04-08 15:19:22 -04:00
94a7643ebc
Escape stream urls in the player js
2015-04-08 15:00:02 -04:00
23bf866211
SAAS-712: UI Improvements
2015-04-08 14:01:57 -04:00
f6d5b34cca
Embed player - code review fixes
2015-04-07 17:49:21 -04:00
481d21ff70
SAAS-662: Make player auto-connect if there is a problem with the stream
...
HTML5 error handling
2015-04-07 11:34:21 -04:00
e8c8fde8bd
Fix airtime.pro link on player
2015-04-02 15:27:01 -04:00
fdd8cdfaea
Fixed Airtime badge spacing
2015-04-02 14:35:13 -04:00
eaeed9be77
SAAS-669: Long station names overlap with link to airtime.pro
2015-04-01 12:50:49 -04:00
c1038cd92f
SAAS-706: Remove volume bar from player
2015-04-01 11:25:58 -04:00
220f21ab22
Merge branch 'saas' into saas-embed-player
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-03-31 17:44:14 -04:00
15a8e3fa1f
Moved html5 error listener to MusesPlayer constructor
2015-03-31 17:20:42 -04:00
778df97d3c
SAAS-662: Make player auto-connect if there is a problem with the stream
...
Kind of working in HTML5 mode
2015-03-31 16:51:14 -04:00
d0f7f820a7
SAAS-675: Implement "auto" mode
2015-03-27 16:34:04 -04:00
040eb1443d
CSS fixes to make page header more responsive
2015-03-25 17:29:28 -04:00
3d2b189dba
removed logging statement
2015-03-25 11:47:23 -04:00
17358a761f
SAAS-663: Integrate player design
2015-03-25 11:44:28 -04:00
3d03f837d2
Trial->Paid conversion tracking with GTM
...
* Added trial to paid conversion tracking with GTM
* Removed WHMCS roundtrip from Showbuilder
* Moved all Analytics code into common/GoogleAnalytics.php
* Added a new Thank You page after plan changes to capture conversions
* Added a ConversionTracking plugin to facilitate that
* Also backported some minor staticBaseDir compatibility changes
* Fixed a logic error in creating the baseDir
2015-03-24 10:11:25 -04:00
e32744668f
SAAS-661: Add mobile stream identifier on Stream Settings page
2015-03-23 16:06:35 -04:00
5a373ac604
Merge branch 'saas' into saas-embed-player
2015-03-23 15:46:03 -04:00
2ae4d6c1c3
Embed Player
...
Added stream modes
Unhardcoded some values
Disabled opus streams
2015-03-23 12:37:22 -04:00
32aa962138
Fixed error logging and refactored ErrorController to get invoked
...
correctly when using API key authentication
* Along with the bugfixes, backported improved ErrorController from upstream branch,
including style improvements.
2015-03-20 17:20:34 -04:00
28786e7bf1
SAAS-655: Extract muses player events into our own js object
...
Moved player creation into musesPlayer constructor
2015-03-20 07:41:10 -04:00
20d774874e
SAAS-655: Extract muses player events into our own js object
...
Added skeleton functions for setVolume and setURL
2015-03-20 07:35:18 -04:00
16ddf09d6d
SAAS-655: Extract muses player events into our own js object
2015-03-19 16:59:05 -04:00
875ed0e41e
Got muses working without a skin
...
Had to leave the skin visible but "hide" it by setting the width and
height to 1px
2015-03-19 13:42:19 -04:00
bafd9eeb6f
Cleaning up player code
2015-03-18 15:03:34 -04:00
ed891fb145
Committing lots of trial and error embed player code changes
2015-03-18 14:23:38 -04:00
1f2f8a27a5
SAAS-650: Fix up player page UI in Airtime
2015-03-16 13:24:58 -04:00
dc0855de18
SAAS-643: Embed Player -> Restrict the setting of an OPUS stream
2015-03-16 11:29:24 -04:00
694430f542
SAAS-637: Un-hardcode all player variables
2015-03-12 15:45:53 -04:00
ac2181a52d
Merge branch 'saas' into saas-embed-player
2015-03-11 17:13:04 -04:00
6c46f0a156
Added player preview to view
...
Everything is hardcoded right now
2015-03-10 16:32:35 -04:00
936d11b367
Merge branch '2.5.x-albertenhancements' into saas
2015-02-27 17:21:20 -05:00
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -05:00
c57d4e3fc4
Check if station is on a trial plan before displaying the trial box
2015-02-26 13:30:35 -05:00
2272451e08
Added placeholders for player embed code and preview
2015-02-25 17:10:41 -05:00
cf11291877
Merge branch 'saas' into saas-embed-player
2015-02-25 12:13:41 -05:00
e13e4413ea
Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas
2015-02-24 15:03:06 -05:00
5e256df061
Added remove button for station logo on preferences page
2015-02-24 12:12:30 -05:00
69d588d2f6
Merge branch '2.5.x' into 2.5.x-albertenhancements
2015-02-24 10:45:52 -05:00
4fd7b4c622
SAAS-585: Create Embeddable Player form
...
Added stream urls - hardcoded for now
2015-02-17 11:48:43 -05:00
56cae34259
Fix typo
2015-02-12 14:20:54 -05:00
c261182c8f
Skeleton player form/view/controller
2015-02-12 14:08:06 -05:00
drigato
Albert Santoni
Duncan Sommerville