Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,412 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

5183 Commits

Author SHA1 Message Date
drigato ee2bfe7664 SAAS-945: Language + Timezone Setup Popup 2015-07-27 07:06:22 -04:00
Duncan Sommerville ce0cc946ab Disable password reset in saas-dev (moved to saas-email branch) 2015-07-23 13:00:34 -04:00
Duncan Sommerville 5c4803ddf2 SAAS-781 - password reset 2015-07-22 13:48:47 -04:00
Duncan Sommerville abdc94ccc3 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-07-22 11:19:41 -04:00
Duncan Sommerville a1a2bf9368 Test out existing email functionality 2015-07-22 11:19:37 -04:00
drigato ce7765a8cb Merge branch 'saas' into saas-dev 2015-07-21 11:03:31 -04:00
drigato 6f09ef4af1 Change usability hint wording 2015-07-21 07:27:26 -04:00
Duncan Sommerville ba90b1f1eb Merge branch 'saas-dev' into saas-showbuilder 
Conflicts:
	airtime_mvc/public/css/styles.css
 2015-07-20 12:23:11 -04:00
drigato 7f4fbf65e1 SAAS-960 Change hint for currently playing linked show 2015-07-17 12:48:57 -04:00
drigato 07f02260db Fix undefined index: nextMediaName 2015-07-17 09:57:24 -04:00
drigato ec74e17ebe Merge branch 'saas' into saas-dev-july-16 2015-07-17 07:40:15 -04:00
Duncan Sommerville 1816be156f SAAS-922 - change file extensions in pypo based on mime-type, update lists of accepted mime types 2015-07-16 16:26:52 -04:00
Duncan Sommerville 0dd2958333 SAAS-922 - urlencode content headers to ensure compatibility 2015-07-16 14:43:22 -04:00
Duncan Sommerville 041053b171 SAAS-922 - urlencode content headers to ensure compatibility 2015-07-16 14:24:07 -04:00
Duncan Sommerville 452c17650c SAAS-951 - fix SoundCloud capitalization 2015-07-16 11:05:39 -04:00
Duncan Sommerville 40d8212c13 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-07-16 11:03:53 -04:00
Duncan Sommerville c5e7d6734e SAAS-951 - fix SoundCloud capitalization 2015-07-16 11:03:30 -04:00
drigato dd5d6342a7 Merge branch 'saas-dev-usability-hints' into saas-dev 2015-07-16 11:00:04 -04:00
Duncan Sommerville 8609934861 Merge branch 'saas-dev' into saas-showbuilder 2015-07-15 18:54:55 -04:00
Duncan Sommerville ba38618235 Merge branch 'saas' into saas-dev 2015-07-15 18:54:38 -04:00
Duncan Sommerville 71ca2b0668 Merge branch 'saas-dev' into saas-showbuilder 2015-07-15 18:53:39 -04:00
Duncan Sommerville d7d9a994d5 SAAS-948 - ShowBuilder redesign initial commit 2015-07-15 18:53:19 -04:00
Albert Santoni ffaa076767 Second fix for SAAS-922, file extension improvements for S3 2015-07-15 17:51:37 -04:00
Albert Santoni 064e1bd4e0 Fix SAAS-922 for files on S3 too 2015-07-15 17:33:33 -04:00
drigato fd09941223 Merge branch 'saas-dev' into saas-dev-usability-hints 2015-07-15 13:59:43 -04:00
drigato 8276b1762e Updated outdated public airtime api setting message on preferences page 2015-07-15 13:47:54 -04:00
Albert Santoni 7ecabffbe8 Avoid double dot in extension for SAAS-922 2015-07-15 13:41:03 -04:00
Albert Santoni ffb55de566 SAAS-922 take 2 2015-07-15 13:12:56 -04:00
Duncan Sommerville 27fe32a3b4 Use mime-type array when checking for acceptable extensions 2015-07-15 12:58:05 -04:00
Duncan Sommerville 7ce3082fa2 Fix upgrade being run from unit tests 2015-07-15 11:46:52 -04:00
drigato 6a01205034 SAAS-940: Provide usability hints to user 
Fixed bug where sometimes the hint would not show up
 2015-07-15 11:35:59 -04:00
drigato e07d62b020 Small comments fix 2015-07-15 10:41:01 -04:00
drigato 7b237a2e65 SAAS-940: Provide usability hints to user 
Changed some hint wording
 2015-07-14 12:14:00 -04:00
drigato 8309289356 Merge branch 'saas-dev-usability-hints' of https://github.com/sourcefabric/Airtime into saas-dev-usability-hints 2015-07-14 11:52:10 -04:00
drigato 2de831a37f SAAS-940: Provide usability hints to user 
Made hints more specific
 2015-07-14 11:45:37 -04:00
Albert Santoni 2693c9f02c Small bugfix for CC-6064 2015-07-14 11:25:11 -04:00
Albert Santoni 5a2ef8d3db Merge branch 'saas-dev-usability-hints' of github.com:sourcefabric/Airtime into saas-dev-usability-hints 2015-07-14 10:35:47 -04:00
Albert Santoni 66caf2574a CC-6064: Allow shows to be started "now" 2015-07-14 10:35:21 -04:00
drigato 71e8909365 SAAS-940: Provide usability hints to user 
Fixed bug where hints were not showing up sometimes
 2015-07-14 10:08:56 -04:00
drigato 25ef70767b SAAS-940: Provide usability hints to user 
Customized hints depending on what page the user is on and what action
they just completed.
 2015-07-13 17:02:31 -04:00
Duncan Sommerville 683c1a4641 SAAS-876 - use baseurl for default host value 2015-07-13 15:52:04 -04:00
Albert Santoni 8e15dd5e99 Merge branch 'saas-dev' into saas-dev-usability-hints 2015-07-13 15:34:06 -04:00
Duncan Sommerville 755ec79e7d SAAS-876 - frontend tweaks 2015-07-13 15:17:47 -04:00
Duncan Sommerville 56585fb01c Add default icecast pass to settable params in ProvisioningController 2015-07-13 13:28:27 -04:00
Duncan Sommerville c05d4bac2f Merge branch 'saas-dev' into saas-stream-settings 2015-07-13 13:27:34 -04:00
Duncan Sommerville 9fdc08f88a SAAS-876 - reset to default settings when using Airtime Pro streaming 2015-07-13 12:28:58 -04:00
drigato 33bd1ec605 Merge branch 'saas-dev-saas-924-show-edit-problem' into saas-dev 2015-07-13 11:19:42 -04:00
drigato 48547ee347 SAAS-940: Provide usability hints to user 
Refactored some code
 2015-07-13 11:19:04 -04:00
drigato 721cd5a31b SAAS-924: Cannot edit repeating show if first instance has ended 
Added safeguard in case we don't find a future show instance
 2015-07-13 09:04:49 -04:00
drigato 55999a07ec SAAS-940: Provide usability hints to user 2015-07-13 08:06:41 -04:00
Duncan Sommerville c99165a8dd SAAS-876 - better implementation of toggle between Airtime Pro/Custom streaming options 2015-07-10 13:17:20 -04:00
Duncan Sommerville 37ed35f5b2 Merge branch 'saas-dev' into saas-stream-settings 
Conflicts:
	airtime_mvc/application/models/Preference.php
 2015-07-10 10:29:38 -04:00
Duncan Sommerville e4720b5992 Remove incorrect sql in 2.5.14 upgrade 2015-07-10 10:27:28 -04:00
drigato 670395bb2e SAAS-939: Add option to preferences to display login button on radio page 
Change option to ON by default
 2015-07-09 15:16:54 -04:00
drigato 0601bd675e SAAS-939: Add option to preferences to display login button on radio page 2015-07-09 14:38:44 -04:00
Albert Santoni 1efa591d67 Fixed double HTML encoding on embedded schedule widget 2015-07-09 12:49:49 -04:00
drigato 1b3a9f6e6a SAAS-924: Cannot edit repeating show if first instance has ended 
Reverted old behaviour where we set the show start and end date/time to
the next repeating instance start and end.
 2015-07-09 12:18:21 -04:00
Albert Santoni d2ca10294f Two Add Show form bugfixes 
* Fixed the Show Source mount name not showing up in Add Show form
* Use Airtime Authenticaiton by default
 2015-07-09 10:18:21 -04:00
Albert Santoni 4b8944f221 Improved explanation for live streaming form 2015-07-09 09:22:49 -04:00
Duncan Sommerville ac2e1a2d4b SAAS-876 - More work on stream settings page 2015-07-08 16:04:09 -04:00
Duncan Sommerville 6b9d9e8063 Merge branch 'saas-dev' into saas-stream-settings 2015-07-08 12:47:24 -04:00
Duncan Sommerville 3cebbaf29a Add aac mime-types into audio mime map 2015-07-07 16:15:35 -04:00
Duncan Sommerville e12494ef5f Fix show source mount error 2015-07-07 15:55:35 -04:00
Duncan Sommerville 776596d5b6 SAAS-922 - replace large conditionals with single public mime-type map 2015-07-07 15:48:22 -04:00
Duncan Sommerville e246771af0 SAAS-922 - additional mime-type coverage 2015-07-07 15:09:06 -04:00
Duncan Sommerville 92c9fd30b5 SAAS-922 - expose mime-based file extensions from /rest/media 2015-07-07 13:54:19 -04:00
drigato 0d27011e65 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-07-07 09:21:54 -04:00
drigato b200a29f43 SAAS-928: Time strings on Radio Page are not localized 2015-07-07 09:21:44 -04:00
Duncan Sommerville 5cb396e512 SAAS-923 - 2.5.14 schema upgrade to add partial unique index on cc_pref's keystr column (when subjid is null) 2015-07-06 18:03:44 -04:00
Duncan Sommerville 999f03ea1e Merge branch 'saas' into saas-dev 2015-07-06 16:54:39 -04:00
drigato a5a91c25e0 SAAS-929: Shows don't show up on schedule widget on Firefox 2015-07-06 12:53:15 -04:00
drigato ec0fbd2d61 Fix for schedule widget weekdays going out of order 2015-07-06 10:47:04 -04:00
drigato f86c50a834 SAAS-916: Localize schedule widget dates 
Fix to use existing locale strings
 2015-07-06 10:30:16 -04:00
drigato 71b2a4e946 Removing duplicate locale strings 2015-07-06 10:29:02 -04:00
drigato 6914e16165 SAAS-916: Localize schedule widget dates 
Forgot to commit msg strings for this
 2015-07-06 10:21:27 -04:00
drigato e69eb9c2b1 SAAS-916: Localize schedule widget dates 2015-07-06 09:33:04 -04:00
Duncan Sommerville db7e4086ba Re-add favicon headlink 2015-07-04 01:16:58 -04:00
Duncan Sommerville cb0593370a Quick fix 2015-07-04 00:38:53 -04:00
Duncan Sommerville 457230ba07 SAAS-876 - Initial commit 2015-07-03 13:32:41 -04:00
Albert Santoni 00dfd64677 Merge pull request #117 from sourcefabric/saas-dev-schedule-widget-angular 
Saas dev schedule widget angular
 2015-07-01 15:05:59 -04:00
Duncan Sommerville f87fe11a24 SAAS-908 - Break source URL strings into host/port/mount fields 2015-06-30 12:14:33 -04:00
Duncan Sommerville 04fe265538 Task manager update to run individual tasks 2015-06-30 11:46:58 -04:00
drigato 5f925f2f1f Merge branch 'saas-dev' into saas-dev-schedule-widget-angular 2015-06-30 09:46:36 -04:00
drigato 6db75550cc SAAS-870: Schedule widget displays shows in wrong timezone 
Timezone conversion done in frontend
 2015-06-30 09:38:53 -04:00
Albert Santoni 1c8ccbf0cd Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-06-29 16:36:38 -04:00
Albert Santoni cffc3b7e59 Add semi-colon to Shoutcast URLs to make them work with our player 2015-06-29 16:36:19 -04:00
Duncan Sommerville 04290e28dc Fix error getting current schedule information if connected to master source 2015-06-29 14:25:00 -04:00
Duncan Sommerville 4be34ea94b Add version string to favicon to force refresh 2015-06-29 10:26:52 -04:00
Duncan Sommerville 5cc8774e56 Merge branch 'saas-dev' into soundcloud 
Conflicts:
	airtime_mvc/application/configs/constants.php
 2015-06-29 10:02:58 -04:00
drigato 0a4651f752 SAAS-870: Schedule widget displays shows in wrong timezone 
Have angularjs hooked in
 2015-06-26 15:25:44 -04:00
Duncan Sommerville 5fe70754bd Replace all timestamp strings with constant 2015-06-26 14:42:52 -04:00
Duncan Sommerville 9d60a3d130 Move Help Translate Airtime link to help menu 2015-06-26 14:27:27 -04:00
Duncan Sommerville 881471c6b8 SAAS-793 - Prevent show image upload when editing single instance of a repeating show 2015-06-26 14:23:45 -04:00
Duncan Sommerville 7e0b6ac7ba Add transifex link constant 2015-06-26 13:28:05 -04:00
Duncan Sommerville 3a51e66b07 Add transifex link to login page 2015-06-26 13:25:19 -04:00
Duncan Sommerville 6b9899d11c SAAS-882 - Switch edit user page to use new-style csrf generation 2015-06-26 10:45:26 -04:00
Duncan Sommerville c44bae8140 Merge branch 'saas-dev' into soundcloud 
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
 2015-06-26 10:37:30 -04:00
Duncan Sommerville 6497bc28c5 Show collapsible sections (other than 'dangerous settings') by default on preferences page 2015-06-25 17:43:15 -04:00
Duncan Sommerville 87bdc01318 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-06-25 14:13:25 -04:00
Duncan Sommerville 6fb9c6a30c SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences 2015-06-25 14:13:09 -04:00
Duncan Sommerville d91b05a0ae SoundCloud - Add release_year metadata field and set default sharing and license types 2015-06-25 10:53:35 -04:00
Duncan Sommerville 67155b136a Add downgrade action to UpgradeController, fix SoundCloud schema and bugs 2015-06-24 18:38:04 -04:00
Duncan Sommerville 8fcaf7fc74 Merge branch 'saas-dev' into soundcloud 
Conflicts:
	airtime_mvc/application/configs/constants.php
 2015-06-24 16:35:06 -04:00
Duncan Sommerville adff664e87 Fix sending null fields to SoundCloud 2015-06-24 16:13:04 -04:00
Duncan Sommerville e44e0de534 Add fields to SoundCloud upload 2015-06-24 15:46:53 -04:00
Albert Santoni d54eb37317 Merge branch 'saas' into saas-dev 2015-06-24 15:19:38 -04:00
Duncan Sommerville f26559c0c6 Fix permissions for SoundCloud functionality 2015-06-24 14:48:38 -04:00
Duncan Sommerville 616cf143d5 SAAS-877 - Fix live-info-v2 behaviour 2015-06-24 14:28:04 -04:00
Duncan Sommerville ef957fe0aa SAAS-877 - Fix errors 2015-06-24 13:07:13 -04:00
Duncan Sommerville fd8194e7d8 Fix error getting media 2015-06-24 12:40:51 -04:00
Duncan Sommerville ffc3ef1bc9 SAAS-877 - Update live-info-v2 api 2015-06-24 12:31:32 -04:00
Duncan Sommerville 7645f67515 SAAS-877 - Update live-info-v2 api 2015-06-24 12:18:52 -04:00
Duncan Sommerville 065988f703 Return default value for disk quota if none set 2015-06-23 19:08:49 -04:00
Duncan Sommerville 4c797cf100 Update installer to work with saas branch 2015-06-23 19:02:55 -04:00
Duncan Sommerville d48e594dcd Fix upload to SoundCloud button remaining disabled after upload failure 2015-06-23 19:02:28 -04:00
Duncan Sommerville 70f6cbbc71 Fixes to airtime-celery setup 2015-06-23 15:10:02 -04:00
Albert Santoni 1bb6ee63dc SAAS-867: Embedded player spins in endless loop if connection is refused 2015-06-19 15:30:51 -04:00
Albert Santoni 74b403897d Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-06-19 14:23:46 -04:00
Albert Santoni 19adb062cf SAAS-879 and add FAQ to Help menu 
* SAAS-879: When trying to save changes in the user setting pages
  changes do not save and goes to a "an error hass occured page"
 2015-06-19 14:22:58 -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 de184d761e Rename variable 2015-06-18 13:49:25 -04:00
Duncan Sommerville 6439bc9ad5 Add timestamp on SoundCloud upload success 2015-06-18 13:32:43 -04:00
Duncan Sommerville 02e0537be9 Merge branch 'saas-dev' into soundcloud 2015-06-18 13:29:59 -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 afb02301c1 SAAS-868 - Fixes for pull request #115 - https://github.com/sourcefabric/airtime/pull/115 2015-06-17 17:16:21 -04:00
Duncan Sommerville 89e3eaa986 Merge branch 'saas-dev' into soundcloud 2015-06-17 17:00:15 -04:00
Duncan Sommerville af2f757985 Move misplaced tag 2015-06-17 14:52:04 -04:00
Duncan Sommerville b42d773b5d Merge branch 'saas-dev' into soundcloud 2015-06-17 13:45:33 -04:00
Duncan Sommerville 4b3b3b5b93 SAAS-872 - Load disk information statically 2015-06-17 13:44:14 -04:00
Duncan Sommerville 27bebb9168 Remove logging statement 2015-06-17 13:09:56 -04:00
Duncan Sommerville 3a1d34dffe Merge branch 'saas-dev' into soundcloud 2015-06-17 10:14:03 -04:00
Albert Santoni 627343a626 Fixed the status page 2015-06-16 18:18:34 -04:00
Duncan Sommerville e033360a4e Fix error when deleting SoundCloud tracks 2015-06-16 16:21:31 -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
Duncan Sommerville 0cd9b1d0e5 Merge branch 'saas-dev' into soundcloud 2015-06-16 15:10:14 -04:00
Duncan Sommerville 8d2e476ff1 SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager 2015-06-16 15:10:08 -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 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
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 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
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
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
Duncan Sommerville 15c7ef5885 Celery backend and support for dev-env worker parallelization 2015-06-12 12:31:55 -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 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
Duncan Sommerville c1b5b53a16 Fix merge errors; use Celery status messages + handle fail case better 2015-06-10 17:11:42 -04:00
Duncan Sommerville 8163608666 Merge branch 'saas-dev' into soundcloud 2015-06-10 16:25:30 -04:00
drigato 3ecad162e3 Serve radio page font style over https 2015-06-10 16:12:53 -04:00
Duncan Sommerville 459f9494c3 Merge saas-dev into soundcloud 2015-06-10 16:08:52 -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
Duncan Sommerville 626489bb3b SAAS-853 - Celery backend for SoundCloud uploads 2015-06-10 15:04:49 -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
Albert Santoni 3996e757b7 Merge branch 'saas-dev' into saas-installer-albert 2015-06-10 12:02:08 -04:00
drigato 0796f58878 Merge branch 'saas-dev' into saas-landing-page 2015-06-10 11:14:02 -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
Albert Santoni 6126e8a51c Merge branch 'saas' into saas-dev 2015-06-10 11:02:59 -04:00
drigato ca8ca0abed Merge branch 'saas-dev' into saas-landing-page 2015-06-10 09:07:12 -04:00
Albert Santoni fb1fc6fb00 CC-6056: Station Metadata API returns wrong streaming links for Shoutcast servers 2015-06-09 17:14:33 -04:00
Duncan Sommerville f031d13867 Merge branch 'saas-dev' into soundcloud 2015-06-09 14:03:03 -04:00
Duncan Sommerville 49165e91d9 SAAS-854 - celery-based SoundCloud backend uploader 2015-06-09 14:02:29 -04:00
drigato d181a931b8 Fix schedule widget layout by removing table structure 2015-06-09 10:30:47 -04:00
drigato 87920c1fc1 SAAS-855: Default station description in Preferences 2015-06-09 09:01:15 -04:00
Albert Santoni 23dd6d4021 CC-6054: live-info-v2 returns future shows without ordering by start time 2015-06-08 16:38:17 -04:00
Albert Santoni 02d49864fa Squash some error notices in UserController 2015-06-08 15:17:48 -04:00
drigato 060280d5a5 Merge branch 'saas-dev' into saas-landing-page 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/IndexController.php
 2015-06-08 14:55:24 -04:00
drigato 1974774e0c SAAS-851: Embed schedule widget loses format with long show names 2015-06-05 14:35:27 -04:00
Albert Santoni ada6b97873 CC-6050: User management bugfix 2015-06-05 12:34:51 -04:00
Duncan Sommerville 14f37909d1 More robust error handling in show-logo action 2015-06-05 11:55:06 -04:00
Albert Santoni dd4cbe5b63 CC-6051 - Route / generates invalid navigation bar links 2015-06-05 11:52:51 -04:00
Duncan Sommerville f6e23ab075 Add more error handling to show-logo api 2015-06-04 18:45:00 -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
Duncan Sommerville 63b726e6b2 SAAS-848 - Modify SoundCloud code to use external redirect 2015-06-04 11:38:46 -04:00
Duncan Sommerville b0b6e037ac CC-6046, CC-6045, CC-6047 - New SoundCloud implementation 2015-06-03 16:57:17 -04:00