Duncan Sommerville 95aae317c6 Merge branch 'saas-dev' into saas-dev-publishing ...

Conflicts:
	airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
	airtime_mvc/public/css/dashboard.css
	airtime_mvc/public/js/airtime/library/spl.js

2015-10-29 11:21:24 -04:00

..

airtime

* SAAS-1084 - initial work on publishing API backend

2015-10-20 19:03:34 -04:00

formatters

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

tests

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

Auth.php

Added missing newline to password reset email

2015-08-07 14:29:10 -04:00

Block.php

SAAS-1058: Podcast table schema

2015-09-14 17:00:54 -04:00

Cache.php

Fixes for code review https://github.com/sourcefabric/Airtime/pull/84

2015-01-15 16:33:33 -05:00

Dashboard.php

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

Datatables.php

Handle error case with bad user timezone strings break advanced search

2015-10-20 11:45:26 -04:00

Email.php

Clean up and bugfixes for password reset (SAAS-1009)

2015-08-07 13:57:42 -04:00

Library.php

SAAS-948 - tab layout for right-hand pane

2015-07-31 18:28:16 -04:00

LibraryEditable.php

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

ListenerStat.php

Replace all timestamp strings with constant

2015-06-26 14:42:52 -04:00

LiveLog.php

Replace all timestamp strings with constant

2015-06-26 14:42:52 -04:00

Locale.php

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

LoginAttempts.php

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

MusicDir.php

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

Playlist.php

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

Preference.php

Add station podcast privacy toggle

2015-10-21 17:30:24 -04:00

RabbitMq.php

SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager

2015-06-16 15:10:08 -04:00

Schedule.php

SAAS-1095: Unknown schedule type: array

2015-09-29 11:49:53 -04:00

Scheduler.php

Merge branch 'saas-dev' into saas-dev-publishing

2015-10-29 11:21:24 -04:00

ServiceRegister.php

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

Show.php

Increase transaction isolation level to avoid duplicate shows, SAAS-1111

2015-10-19 15:23:50 -04:00

ShowBuilder.php

Factor out default show background colour and fix some style issues

2015-08-12 12:55:39 -04:00

ShowInstance.php

Merge branch 'saas-dev' into soundcloud

2015-06-29 10:02:58 -04:00

StoredFile.php

Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"

2015-09-14 18:29:43 -04:00

StreamSetting.php

Fix default Icecast hostname

2015-08-05 15:30:14 -04:00

Subjects.php

Reverted commit mistakenly changing file modifiers to 755

2015-01-14 20:45:03 -05:00

Systemstatus.php

Merge branch '2.5.x-installer' into saas-installer-albert

2015-05-22 16:05:29 -04:00

User.php

CC-6050: User management bugfix

2015-06-05 12:34:51 -04:00

Webstream.php

CC-5120: Can't add PLS webstreams

2015-05-11 11:08:43 -04:00