Duncan Sommerville
|
298ee30e9d
|
Move misplaced tag
|
2015-06-18 10:03:12 -04:00 |
|
Duncan Sommerville
|
88bd3c9bc2
|
SAAS-872 - Load disk information statically
|
2015-06-18 10:03:05 -04:00 |
Albert Santoni
|
627343a626
|
Fixed the status page
|
2015-06-16 18:18:34 -04:00 |
|
Albert Santoni
|
0f58e315e6
|
Merge branch 'saas-cc-6055' into saas
|
2015-06-16 16:13:40 -04:00 |
|
Albert Santoni
|
61272cd42c
|
Handle 404s with the correct error page, and don't log them
|
2015-06-16 14:58:27 -04:00 |
drigato
|
4bebe1e0fb
|
Radio page fixes
|
2015-06-16 12:50:40 -04:00 |
|
drigato
|
4c6ba869e3
|
Fix Radio Page schedule widget iframe size
|
2015-06-15 16:07:42 -04:00 |
|
drigato
|
0c4888fbd6
|
Radio Page fixes
Added scrolling back to radio page
|
2015-06-15 15:03:34 -04:00 |
|
drigato
|
ad5121f2ca
|
Radio Page improvements
|
2015-06-15 14:42:37 -04:00 |
|
Albert Santoni
|
0b5b2329ed
|
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
|
2015-06-12 16:06:04 -04:00 |
|
Albert Santoni
|
b4c9a77e7c
|
CC-6055: Improved escaping
|
2015-06-12 13:48:54 -04:00 |
|
Albert Santoni
|
abc81a92b4
|
XSS prevention for Radio Page
|
2015-06-12 13:11:28 -04:00 |
|
drigato
|
ba2aeae7b4
|
Radio page changes
Moved login button to top right corner.
Changed background image.
|
2015-06-12 13:07:47 -04:00 |
|
Albert Santoni
|
53b67d0826
|
Disabled most of status page for Airtime Pro and fixed HTML syntax errors
|
2015-06-12 10:36:27 -04:00 |
|
Albert Santoni
|
980e2ad767
|
Unbreak the design from my last commit
|
2015-06-11 15:09:44 -04:00 |
|
Albert Santoni
|
1efc47beb9
|
Tweaked layout of the embed widgets page
|
2015-06-11 14:30:52 -04:00 |
|
drigato
|
2dbed71681
|
SAAS-860: Schedule widget embed src is wrong
|
2015-06-11 12:37:51 -04:00 |
|
drigato
|
255bbf74b7
|
CC-6057: Empty show schedule should show message in Schedule Widget
|
2015-06-11 09:16:59 -04:00 |
|
Albert Santoni
|
7c6f15984d
|
Small consistency changes for the embeddable widgets
|
2015-06-10 18:02:25 -04:00 |
|
drigato
|
d1ac78be68
|
Fix for station logo....again...
|
2015-06-10 16:01:16 -04:00 |
|
drigato
|
357e17f3b4
|
Fix for station logo not displaying correctly
|
2015-06-10 15:57:09 -04:00 |
|
drigato
|
fe5b20c29e
|
Fix for default station logo not displaying
|
2015-06-10 15:51:31 -04:00 |
|
Albert Santoni
|
24db599afe
|
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
|
2015-06-10 15:03:21 -04:00 |
|
Albert Santoni
|
c18e728583
|
Merge branch 'saas-installer-albert' into saas-dev
|
2015-06-10 15:03:11 -04:00 |
|
drigato
|
ffcd15190f
|
Default station logo was not displaying
|
2015-06-10 14:46:27 -04:00 |
|
drigato
|
ad40ea5c71
|
Disable removing UI elements from radio page when the login button is clicked
|
2015-06-10 12:56:31 -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
|
042e441708
|
Radio Page Code Review Changes
Reset stylesheets in index controller.
Removed hardcoded days of week in WidgetHelper.
Display schedule widget with 6 days after the current day.
|
2015-06-10 11:13:03 -04:00 |
|
drigato
|
d181a931b8
|
Fix schedule widget layout by removing table structure
|
2015-06-09 10:30:47 -04:00 |
|
drigato
|
1974774e0c
|
SAAS-851: Embed schedule widget loses format with long show names
|
2015-06-05 14:35:27 -04:00 |
|
drigato
|
8386145cb9
|
SAAS-836: Create a new schedule widget skin
|
2015-06-04 16:09:19 -04:00 |
|
drigato
|
cae5f85b0a
|
Fix typo
|
2015-06-04 12:17:48 -04:00 |
|
drigato
|
6528a9b0a3
|
SAAS-843: Create Embeddable Schedule Widget View
Replaced player controller with embeddablewidgets controller.
Replaced 'Player' page with 'Widgets' page.
Added schedule widget to the widgets page.
|
2015-06-04 12:00:23 -04:00 |
|
drigato
|
305cb894c3
|
SAAS-841: Default station logo to the Airtime logo
|
2015-06-03 11:53:32 -04:00 |
|
drigato
|
3de1d90241
|
Unhardcode premium style player
Had this is for testing purposes
|
2015-06-03 10:02:27 -04:00 |
|
drigato
|
3bf6619696
|
SAAS-833: Radio page UI improvements/fixes
Undo some previous css changes
|
2015-06-03 09:38:07 -04:00 |
|
drigato
|
9a42c4bf36
|
SAAS-833: Radio page UI improvements/fixes
Added width and height to schedule widget iframe tag
|
2015-06-03 09:18:38 -04:00 |
|
drigato
|
2cf6cb549e
|
SAAS-833: Radio page UI improvements/fixes
Moved player bar buttons to float right
|
2015-06-02 16:27:37 -04:00 |
|
drigato
|
30b81c398f
|
SAAS-814: Decide what to do with new Login Page
We decided to link to the existing login page for now
|
2015-05-29 14:25:00 -04:00 |
|
drigato
|
24bfdbaa7f
|
SAAS-811: Insert extra radio page buttons onto player bar
Insert extra buttons onto player bar once the iframe has loaded
|
2015-05-29 13:40:07 -04:00 |
|
drigato
|
77e518eec0
|
SAAS-821: Wire up new player bar with muses
Got metadata displaying
|
2015-05-29 09:40:50 -04:00 |
|
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 |