Commit Graph

1972 Commits

Author SHA1 Message Date
Duncan Sommerville 4c797cf100 Update installer to work with saas branch 2015-06-23 19:02:55 -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 02e0537be9 Merge branch 'saas-dev' into soundcloud 2015-06-18 13:29:59 -04:00
Duncan Sommerville 080c2c43b5 Add soundcloud callback file for saas routing 2015-06-17 17:39:37 -04:00
Duncan Sommerville 3a1d34dffe Merge branch 'saas-dev' into soundcloud 2015-06-17 10:14:03 -04:00
drigato a338616aca Add max-width to logo on radio page 2015-06-16 15:38:21 -04:00
Duncan Sommerville 0cd9b1d0e5 Merge branch 'saas-dev' into soundcloud 2015-06-16 15:10:14 -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
Duncan Sommerville 3902c8c746 Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs 2015-06-15 15:12:37 -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
Duncan Sommerville 706d7db2b2 Merge branch 'saas-dev' into soundcloud 2015-06-15 11:03:37 -04:00
Albert Santoni f4ff00355d Added Radio Page link 2015-06-12 17:21:46 -04:00
drigato 1cdeddc3b3 Changed radio page background image 2015-06-12 14:50:22 -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 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 6007daf601 Adapted the default schedule widget skin to be more like the player skin 2015-06-11 14:21:56 -04:00
drigato 255bbf74b7 CC-6057: Empty show schedule should show message in Schedule Widget 2015-06-11 09:16:59 -04:00
Duncan Sommerville 8163608666 Merge branch 'saas-dev' into soundcloud 2015-06-10 16:25:30 -04:00
Duncan Sommerville 459f9494c3 Merge saas-dev into soundcloud 2015-06-10 16:08:52 -04:00
Albert Santoni 890f30590c Reduced size of placeholder background PNG for Radio Page 2015-06-10 16:03:12 -04:00
drigato fe5b20c29e Fix for default station logo not displaying 2015-06-10 15:51:31 -04:00
drigato f9dd70ad27 Fix for incorrectly displaying the installer screen 2015-06-10 15:38:27 -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 816e620399 CSS fix on premium player 2015-06-10 13:04:51 -04:00
drigato d181a931b8 Fix schedule widget layout by removing table structure 2015-06-09 10:30:47 -04:00
drigato 1b0d69f3d7 SAAS-851: Embed schedule widget loses format with long show names
Applied fix for premium style sheet
2015-06-08 11:14:05 -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
Duncan Sommerville 80bfb7fd93 SAAS-848 - Add soundcloud_callback file 2015-06-04 12:01:04 -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
Duncan Sommerville b0b6e037ac CC-6046, CC-6045, CC-6047 - New SoundCloud implementation 2015-06-03 16:57:17 -04:00
drigato df501d7a38 SAAS-841: Default station logo to the Airtime logo
logo image file
2015-06-03 11:54:05 -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 1add10c657 SAAS-833: Radio page UI improvements/fixes
Fixed schedule widget scrolling
Inserted default station description
2015-06-03 08:29:03 -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