Duncan Sommerville
|
e36c8a16d4
|
CC-6060 - Fix breaking tooltips when viewing context menu in library
|
2015-06-22 10:46:29 -04:00 |
|
Duncan Sommerville
|
62b4de5162
|
Merge branch 'saas' into saas-dev
Conflicts:
airtime_mvc/application/views/scripts/systemstatus/index.phtml
|
2015-06-18 10:24:44 -04:00 |
|
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 |
|
Duncan Sommerville
|
080c2c43b5
|
Add soundcloud callback file for saas routing
|
2015-06-17 17:39:37 -04:00 |
|
Duncan Sommerville
|
af2f757985
|
Move misplaced tag
|
2015-06-17 14:52:04 -04:00 |
|
Duncan Sommerville
|
92ad5bde6d
|
Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup
|
2015-06-17 14:49:12 -04:00 |
|
Duncan Sommerville
|
8f59d18f34
|
Merge branch '2.5.x-installer' into saas-dev
|
2015-06-17 14:11:30 -04:00 |
|
Duncan Sommerville
|
4b3b3b5b93
|
SAAS-872 - Load disk information statically
|
2015-06-17 13:44:14 -04:00 |
|
Albert Santoni
|
627343a626
|
Fixed the status page
|
2015-06-16 18:18:34 -04:00 |
|
Albert Santoni
|
8d114c7d6e
|
Merge branch '2.5.x' into 2.5.x-installer
|
2015-06-16 16:34:22 -04:00 |
|
Albert Santoni
|
0f58e315e6
|
Merge branch 'saas-cc-6055' into saas
|
2015-06-16 16:13:40 -04:00 |
|
Albert Santoni
|
0b6fb9882a
|
Fix provisioning
|
2015-06-16 16:04:20 -04:00 |
|
drigato
|
a338616aca
|
Add max-width to logo on radio page
|
2015-06-16 15:38:21 -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 |
|
Albert Santoni
|
90bd0a1ab4
|
Attempt at fixing Sentry error logging
|
2015-06-16 14:35:29 -04:00 |
|
drigato
|
709b9bbeec
|
CC-6059: Default station logo broken in Audio Preview popup
|
2015-06-16 13:37:05 -04:00 |
|
drigato
|
68a02e3c95
|
Radio page background scrolling issue on small screens
|
2015-06-16 12:53:07 -04:00 |
|
drigato
|
4bebe1e0fb
|
Radio page fixes
|
2015-06-16 12:50:40 -04:00 |
|
Albert Santoni
|
91d391c80c
|
Merge branch '2.5.x-installer' into saas-dev
Conflicts:
airtime_mvc/public/.htaccess
|
2015-06-16 11:32:45 -04:00 |
|
Albert Santoni
|
674d748149
|
CC-6058: htaccess should be combined into apache site config
|
2015-06-16 11:32:09 -04:00 |
|
Albert Santoni
|
609f073a25
|
Merge branch '2.5.x-installer' into saas-dev-plus
Conflicts:
airtime_mvc/public/css/styles.css
airtime_mvc/public/index.php
|
2015-06-16 11:20:43 -04:00 |
|
Albert Santoni
|
57d63ebb19
|
Backport some CSS fixes
|
2015-06-16 11:17:41 -04:00 |
|
Albert Santoni
|
8c9981a155
|
Merge branch '2.5.x' into 2.5.x-installer
Conflicts:
airtime_mvc/public/index.php
|
2015-06-16 10:37:06 -04:00 |
|
Albert Santoni
|
aa286efee4
|
Testing htaccess fix and fixed background cover scrolling issue in Chrome on Android
|
2015-06-15 17:54:28 -04:00 |
|
drigato
|
7d84e92b1b
|
Undo last commit
|
2015-06-15 16:40:47 -04:00 |
|
drigato
|
cd6e326e13
|
Radio page fix for background image on android
|
2015-06-15 16:36:29 -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
|
507268a563
|
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
|
2015-06-15 14:42:56 -04:00 |
|
drigato
|
ad5121f2ca
|
Radio Page improvements
|
2015-06-15 14:42: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 |
|
Albert Santoni
|
f4ff00355d
|
Added Radio Page link
|
2015-06-12 17:21:46 -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 |
|
drigato
|
1cdeddc3b3
|
Changed radio page background image
|
2015-06-12 14:50:22 -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
|
505d6fbc57
|
Fixed some issues with embedded schedule widget style
|
2015-06-11 15:04:59 -04:00 |
|
Albert Santoni
|
1efc47beb9
|
Tweaked layout of the embed widgets page
|
2015-06-11 14:30:52 -04:00 |
|
Albert Santoni
|
9c3979f3ba
|
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
|
2015-06-11 14:22:03 -04:00 |
|
Albert Santoni
|
6007daf601
|
Adapted the default schedule widget skin to be more like the player skin
|
2015-06-11 14:21:56 -04:00 |
|
drigato
|
2dbed71681
|
SAAS-860: Schedule widget embed src is wrong
|
2015-06-11 12:37:51 -04:00 |
|
drigato
|
832f70d663
|
SAAS-859: Schedule widget -> Shows can display on the wrong day
|
2015-06-11 10:10:03 -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 |
|
Albert Santoni
|
7dafb0e280
|
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
|
2015-06-10 17:55:15 -04:00 |
|
Albert Santoni
|
0f3b68eed7
|
Default the Public Airtime API to being on
|
2015-06-10 17:55:04 -04:00 |
|