drigato 5b6a88f7fd Fix bad merge that added soundcloud settings back into preferences page

2015-05-19 15:51:04 -04:00

..

cloud_storage

Refactored file storage code slightly to allow multiple download URLs

2015-03-30 11:31:07 -04:00

common

Merge branch 'saas-dev' into saas-tunein

2015-05-19 15:50:16 -04:00

configs

Merge branch 'saas-dev' into saas-tunein

2015-05-19 15:50:16 -04:00

controllers

Merge branch 'saas-dev' into saas-tunein

2015-05-19 15:50:16 -04:00

forms

Merge branch 'saas-dev' into saas-tunein

2015-05-19 15:50:16 -04:00

layouts/scripts

Merged 2.5.x into saas

2015-04-27 14:01:28 -04:00

logging

Fixed a bug in FTP upload hook, other minor improvements

2015-03-24 14:56:03 -04:00

models

Merge branch 'saas-dev' into saas-tunein

2015-05-19 15:50:16 -04:00

modules/rest

Fixed a bug in FTP upload hook, other minor improvements

2015-03-24 14:56:03 -04:00

services

Merge branch 'saas' into saas-dev

2015-05-13 19:32:53 -04:00

upgrade

Added 2.5.12 upgrader and increased show/show instance description field

2015-03-31 12:38:42 -04:00

validate

Fix SAAS-349 by preventing password changes in demo mode.

2013-09-26 16:23:22 -04:00

views

Fix bad merge that added soundcloud settings back into preferences page

2015-05-19 15:51:04 -04:00

Bootstrap.php

Merged 2.5.x into saas

2015-04-27 14:01:28 -04:00