b95ccd46e7
SAAS-1156: Podcast episode playback and download from Radio Page
...
Switched from using muses to jplayer for playback
2015-11-04 12:45:30 -05:00
b4ec3eeb3f
Add sharing token/download key to station podcast URL when set to private; tab middle click fix
2015-11-04 10:52:23 -05:00
b12b08f0f4
SAAS-1164 - styling for publishing frontend
2015-11-04 09:29:03 -05:00
6683b712c4
Fix a couple of station podcast bugs
2015-11-03 17:13:38 -05:00
a1d9902b2a
Cosmetic tweaks
2015-11-03 16:40:09 -05:00
22f8b0f328
* SAAS-1153 - more work on station podcast frontend. Add delete and edit button functionality for episode table
...
* Various fixes and backend updates
* Move station podcast creation to id getter in Preferences
2015-11-03 16:23:17 -05:00
c0d8b8b39c
* SAAS-1168, SAAS-1153 - work on station podcast frontend
...
* SAAS-1164 - Styling fixes for publishing and podcast editors
2015-11-03 13:18:55 -05:00
569ea00787
Fix for PodcastController index action when station podcast does not exist
2015-11-03 11:45:01 -05:00
335c2fea11
Fix for radio page when station podcast does not exist yet
2015-11-03 11:40:22 -05:00
51ec5a0df5
SAAS-1073: Schema upgrade for podcasts
...
Delete station podcast id from cc_pref in downgrade sql
2015-11-03 11:29:50 -05:00
d20574dfb1
SAAS-1073: Schema upgrade for podcasts
...
Upgrade and downgrade done.
2015-11-03 10:57:55 -05:00
def8e7280b
* SAAS-1161 - refactor backend so episodes are loaded separately from podcast data to speed up loading and improve API readability
...
* Decouple imported and station podcast behaviour on the frontend
2015-11-02 18:07:16 -05:00
c4be9aebb2
SAAS-1154 - hide RSS tab on Radio page when station podcast video is set to private
2015-11-02 11:22:02 -05:00
529a73d39d
Fun update for tab functionality - add tab sorting and close on middle mouse click
2015-11-02 11:04:30 -05:00
4f281a30ed
Add SoundCloud update and download tasks to Celery backend; requires airtime-celery reinstall
2015-10-30 16:10:16 -04:00
702ee97c7b
Refactored Facebook Widget stuff
2015-10-30 14:38:34 -04:00
9af7f6dcdd
Fix tabs bugs and podcast auto-ingest error
2015-10-30 10:29:22 -04:00
d08e19a93a
More small TaskManager and auto-ingest fixes
2015-10-29 18:26:20 -04:00
e3feb17f0c
* Change the Celery timeout to 15 minutes (from 10) to better accommodate automatic ingest
...
* Fix various small bugs in auto ingestion and tab implementation
* Update TaskManager run conditions to piggyback on API calls - guarantees a certain frequency of requests and greatly reduces chances of lock contention
2015-10-29 17:53:45 -04:00
c92eceb60d
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-10-29 14:58:35 -04:00
b4db2ff4ca
SAAS-1083 - more work on publish dialog
2015-10-29 14:58:30 -04:00
f3f5b4f539
SAAS-1156: Podcast episode playback and download from Radio Page
...
Fix metadata html escaping
Tried some tinkering with codecs
2015-10-29 14:45:19 -04:00
40a2aa10d8
SAAS-1083 - Implement unpublishing
2015-10-29 13:09:50 -04:00
4b11979eff
Remove station podcast from podcast datatable; editor now opens from button in podcasts view
2015-10-29 12:17:52 -04:00
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
ada7212823
Add TaskManager task to fail pending imports over an hour old
2015-10-29 11:03:28 -04:00
b5f31065a7
Fix merge error
2015-10-29 10:18:53 -04:00
59ad4fd7f5
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-10-29 10:12:31 -04:00
a6eb4dc3e8
Fix for in-app lock contention - move task initialization into PageLayoutInitPlugin to run after session is loaded
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2015-10-29 10:12:26 -04:00
14b35dcf18
Fix for in-app lock contention - move task initialization into PageLayoutInitPlugin to run after session is loaded
2015-10-29 09:37:39 -04:00
cd17a23d13
Fix download counter reset timer
2015-10-29 09:23:41 -04:00
1067e9f8ae
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-10-28 18:54:35 -04:00
e97aa199bd
SAAS-1083 - work on publish dialog
2015-10-28 18:54:30 -04:00
3065d56018
SAAS-1156: Podcast episode playback and download from Radio Page
...
Playback is working in HTML5 mode and integrated with player bar
2015-10-28 16:28:56 -04:00
05f51a9a2d
Refresh podcast tabs on focus to have better synchronization with auto-ingest backend
2015-10-28 13:43:21 -04:00
e8643e04eb
Add colreorder fixed columns to podcast + episodes datatables so checkbox column is fixed
2015-10-28 12:17:29 -04:00
cc9f1ea6d0
* Wrap station podcast feed contents on radio page in displayRssTab check
...
* Test fix for automatic ingest bug
* Move disable layout code in feeds controller to avoid error case
2015-10-28 10:58:22 -04:00
09efacf4d5
SAAS-1156: Podcast episode playback and download from Radio Page
...
Playback works in HTML mode for mp3 files only right now.
Added a function that changes the player iframe's src attribute
so it plays individual tracks.
2015-10-27 16:00:15 -04:00
323b54d239
Rename billing menu for trials
2015-10-27 15:01:34 -04:00
1211e8db7f
Fix typo
2015-10-26 15:55:03 -04:00
73e7e6e021
SAAS-1148: Add station podcast to Radio Page
...
Skeleton is done. Download link works. Play link not yet done.
2015-10-26 15:24:33 -04:00
7f05d5c05e
Return track metadata as part of PodcastEpisodes API
2015-10-26 15:09:06 -04:00
e994033109
Refactor podcast episodes rest controller index action
2015-10-26 11:28:10 -04:00
5a2d8b26a9
Fix for breaking uploads - fix cue regex
2015-10-23 16:09:38 -04:00
e8980e7a79
Bugfixes and more work on station podcast frontend
2015-10-22 18:03:38 -04:00
58a7b9324b
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/PodcastEpisodesController.php
2015-10-22 15:03:38 -04:00
1aee6ba97a
SAAS-1140: Paginate station podcast feed episodes
...
Added pagination to PodcastEpisodes controller
2015-10-22 14:51:39 -04:00
3e97ee5d62
Localization and verbiage improvements for adding podcasts
2015-10-22 14:39:12 -04:00
f94e462fe0
Revert polling interval for podcast ingest
2015-10-22 12:22:56 -04:00
9302027a2b
Fix issue with automatic ingest; shift episode ingest to PodcastEpisodesController
2015-10-22 12:12:41 -04:00
23ccc268d1
Forgot to add station podcast phtml
2015-10-22 10:44:47 -04:00
814fc67e90
Work on station podcast editor view
2015-10-21 19:21:52 -04:00
6580c12ad3
Add station podcast privacy toggle
2015-10-21 17:30:24 -04:00
16a0172542
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-21 16:26:04 -04:00
a4b42344dd
CC-6140: Switch to Windows linebreaks for stream M3U
2015-10-21 16:25:59 -04:00
eba99728ae
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-10-21 16:14:54 -04:00
cb8c34c3d5
SAAS-1126: Make player widget localizable
2015-10-21 16:14:36 -04:00
3b81ea02c8
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-21 16:14:11 -04:00
4d1d96c8f7
CC-6140: M3U streaming link
2015-10-21 16:14:06 -04:00
92ffa955c3
SAAS-1081 - implement station podcast download counter that resets monthly
2015-10-21 12:54:50 -04:00
6c0055895c
Set auto ingest timestamp when updating
2015-10-21 11:18:33 -04:00
b98f573531
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-10-21 11:01:20 -04:00
1cfa708717
SAAS-1125: Cue in and out points should be editable in the track metadata editor
...
Also made improvement by showing errors when the form has invalid data
2015-10-21 10:58:22 -04:00
0b1df6baf3
* SAAS-1084 - initial work on publishing API backend
...
* More work on automatic ingest
* Add automatic_ingest_timestamp column to ImportedPodcast
2015-10-20 19:03:34 -04:00
f441f2d385
SAAS-1136: Disk usage div overflows if your disk usage is over 100%
2015-10-20 16:57:31 -04:00
f79ca8650f
Unpaid invoice usability hint and invoice page style fix - SAAS-1134
2015-10-20 15:44:24 -04:00
885f47c20e
Better solution for upgrade problems (SAAS-1133)
2015-10-20 14:52:17 -04:00
9d4cc6c205
Temporary workaround for upgrade problems
2015-10-20 12:28:18 -04:00
c8e1408dbe
Handle error case with bad user timezone strings break advanced search
2015-10-20 11:45:26 -04:00
f8a6721703
Increase transaction isolation level for track scheduling and moving
2015-10-19 17:31:26 -04:00
3a791ef9b5
Remove unnecessary field
2015-10-19 17:00:03 -04:00
12f6536e74
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2015-10-19 16:18:19 -04:00
bcbd8a8050
Fix bug in auto ingest, immediately retry on failure
2015-10-19 15:36:34 -04:00
da6e613a24
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-19 15:23:57 -04:00
fb4aef405c
Increase transaction isolation level to avoid duplicate shows, SAAS-1111
2015-10-19 15:23:50 -04:00
9d0beabd3f
Make playout history page visible for Program Managers
2015-10-19 14:09:42 -04:00
c8069aaedd
Initial publishing fixes and tweaks
2015-10-19 13:42:27 -04:00
be3a3fbd9f
* Fix error in automatic podcast ingest
...
* Switch from text-scrolling to using title attributes to display overflowing text strings
2015-10-19 12:57:18 -04:00
97cc4050a4
CC-6139: User timezone setting displays incorrectly in user settings
2015-10-19 12:37:34 -04:00
14104a93ae
SAAS-1080: Station podcast feed
2015-10-19 11:54:53 -04:00
30d742af92
Added msising publish-dialog.phtml and fixed .gitignore file
2015-10-15 18:03:03 -04:00
bddc121c2d
Initial work on automatic ingest for imported podcasts
2015-10-15 14:44:17 -04:00
a2d725f2b9
Fix podcast episode ingest
2015-10-15 11:33:09 -04:00
40d0619f10
Override Podcast->fromArray
2015-10-15 08:06:01 -04:00
d98459a55d
Fix head title on Radio Page
2015-10-14 15:20:49 -04:00
eea5fff1fa
Fixed jQuery being broken on Radio Page
2015-10-14 15:15:25 -04:00
2713bd7beb
Merge branch 'saas-dev' into saas-3.x-sessionoptimizations
2015-10-14 14:50:54 -04:00
591b3d1539
Fix SAAS-1128 more robustly to fix timezone/lang popup for sign up too
2015-10-14 14:40:23 -04:00
a90b97fb55
SAAS-1128: Logging in from www.airtime.pro doesn't trigger lang/timezone setup dialog
2015-10-14 14:28:39 -04:00
9a03b1b50a
Force users to click OK in the language/timezone popup
2015-10-14 11:58:44 -04:00
c166b4f00e
Merge branch 'saas-dev-publishing' into saas-dev-publishing-schema-change
...
Conflicts:
airtime_mvc/application/models/airtime/Podcast.php
2015-10-14 11:04:41 -04:00
d647bf67ea
Refactoring Podcast classes and services
2015-10-14 10:58:13 -04:00
7f64edafff
SAAS-1121: New link show instances don't get created sometimes if there is no show content
...
Fixed by checking if the linked show is empty before trying to copy its
tracks into new show instances
2015-10-13 11:08:17 -04:00
cfb21f8425
Bunch of schema changes
2015-10-13 10:14:23 -04:00
c3c4abdd0c
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/css/dashboard.css
airtime_mvc/public/css/styles.css
airtime_mvc/public/js/airtime/library/library.js
airtime_mvc/public/js/airtime/library/spl.js
2015-09-30 16:26:02 -04:00
ee70a0dbea
SAAS-1094 - update backend to prevent removal of items in linked shows while on air
2015-09-30 14:44:48 -04:00
b01fdc6805
SAAS-1094 - update backend to prevent removal of items in linked shows while on air
2015-09-30 14:44:06 -04:00
2ee7e4bf71
SAAS-1088 - move 'All My Shows' checkbox to dropdown instead
2015-09-30 11:38:33 -04:00
efa3999041
SAAS-1016 - fix some stream settings not being saved correctly
2015-09-30 10:30:32 -04:00
c7dd2e7256
Working on changing schema
2015-09-30 08:53:13 -04:00
8b33acacd3
Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/constants.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/UserController.php
airtime_mvc/public/js/airtime/preferences/preferences.js
2015-09-29 18:58:55 -04:00
c08994a60b
Fix bug where user could open mutiple copies of same webstream tab
2015-09-29 16:34:23 -04:00
b00ac6750c
Testing
2015-09-29 13:04:22 -04:00
4c52bd99f6
Temporarily fix the Help video label breaking the Help page layout
2015-09-29 12:36:56 -04:00
a9eb3f737d
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-09-29 11:50:18 -04:00
6f185d094b
SAAS-1095: Unknown schedule type: array
2015-09-29 11:49:53 -04:00
a75a9676f2
More robust solution for not showing what's new popup to new users
2015-09-29 11:28:20 -04:00
f1c5a8b244
Fix the timezone/language picker and fix the What's New dialog popping up for new users
2015-09-29 09:19:33 -04:00
6658fca10b
Some polish for the What's New popup
2015-09-28 22:17:34 -04:00
943048dd87
Hacky fix for SAAS-1090 - Allow airtime-system to work with session optimizations
2015-09-28 17:48:04 -04:00
67c20630a3
UI revamp what's new dialog
2015-09-28 17:19:02 -04:00
d09941dffa
Set TaskManager run interval back to 30 seconds
2015-09-28 14:15:08 -04:00
c1a16d7973
Add filter string to generic Table object; add call to refetch podcast episode table data
2015-09-28 14:14:01 -04:00
375d83ab43
Update to podcast frontend
2015-09-28 10:40:04 -04:00
d3f5b046f3
Colour palette improved for the calendar
2015-09-25 17:56:29 -04:00
e03428327c
Fixed missing return statement
2015-09-25 15:54:26 -04:00
8b6833180d
Refactored double Set-Cookie prevention code, and session reopening code
2015-09-25 12:03:10 -04:00
91c584ba16
Test alternate session reopening code to alleviate double Set-Cookie header
2015-09-25 11:37:36 -04:00
c03e9cbe9a
SAAS-1085: Optimization - Don't start sessions unless we actually need them.
2015-09-25 10:41:51 -04:00
43e9fb59ce
SAAS-1071 - more work on celery backend for podcasts; add upgrade to make file_id field in third_party_track_references nullable
2015-09-24 15:57:38 -04:00
ca51dcf3ae
SAAS-1071 - more work on backend podcast implementation
2015-09-24 12:58:02 -04:00
dcb30b3aa7
Move file extension check to before database object insertion
2015-09-24 12:57:19 -04:00
778b67982b
Remove duplicate imports and add new table imports to ScheduleController
2015-09-24 12:56:32 -04:00
c587dcf4e4
Added extra fields to podcast table
2015-09-24 10:32:16 -04:00
a86e3ed4a8
Improvements to the preferences screen
2015-09-23 18:21:30 -04:00
07b63abfe1
Small Podcast API fix
2015-09-23 15:54:42 -04:00
e610ce8af7
Fix for switching to simplepie
2015-09-23 15:35:24 -04:00
4de42ada6e
Disable simplepie caching
2015-09-23 14:50:32 -04:00
727abac0b8
Switch Podcast reader to use simplepie
2015-09-23 14:47:40 -04:00
827a83392f
Remove unnecessary fields from bulk get, add explicit casting back to podcast item array for testing
2015-09-22 20:24:53 -04:00
55d5fc62a2
SAAS-1071 - more work on celery backend
2015-09-22 20:22:06 -04:00
ee1ceb9281
Update TaskManager to be a bit easier to extend
2015-09-22 20:21:19 -04:00
3790b0fa81
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/js/airtime/library/podcast.js
2015-09-22 18:37:41 -04:00
ed33714340
SAAS-1064: Publish action for library context menu
2015-09-22 18:33:27 -04:00
44a5e5a240
Improve tabs functionality and add comments
2015-09-22 17:34:24 -04:00
50996a081f
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-22 15:27:18 -04:00
4238d5a201
Refactor tabs functionality
2015-09-22 15:27:08 -04:00
cf1de5fb66
SAAS-1071 - initial work on podcast celery backend; tweak SoundCloud service
2015-09-22 15:26:08 -04:00
79db208cd4
Refactor SoundCloud/Third party controllers to fit new service architecture
2015-09-22 14:18:48 -04:00
13d1534042
Merge pull request #124 from danielhjames/saas
...
IN-1956 Update Transifex project link
2015-09-22 11:47:33 -04:00
d86b00c53e
SAAS-1077: REST API for podcast episodes
...
Empty PUT action
2015-09-22 11:19:39 -04:00
0fc324f3ba
SAAS-1077: REST API for podcast episodes
2015-09-22 11:13:18 -04:00
5bd8a508b1
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/js/airtime/library/spl.js
2015-09-21 18:12:27 -04:00
479153df17
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/public/css/billing.css
2015-09-21 18:01:56 -04:00
2a79424a64
Increase the CSRF token timeout
2015-09-21 18:00:04 -04:00
a21c4612c9
Renamed a podcast.js function for clarity
2015-09-21 17:59:31 -04:00
f9ace20075
Simplify third-party/celery/soundcloud implementation
2015-09-21 17:03:46 -04:00
b721545c68
Stub publish action for context menu
2015-09-21 16:54:00 -04:00
4115f4939e
Frontend tweaks
2015-09-21 15:37:57 -04:00
77a53491b0
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-21 14:51:55 -04:00
3198d822bf
SAAS-1058: Podcast table schema
...
Remove not null constraint on podcast_episodes file_id column
2015-09-21 14:51:32 -04:00
ad2e26a1c3
IN-1956 Update Transifex project link
2015-09-21 17:44:00 +01:00
373ff55923
Frontend tweaks to podcasting + new abstract datatables functionality
2015-09-21 12:40:05 -04:00
3db20bd3b5
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-21 07:08:55 -04:00
1445e85795
SAAS-1058: Podcast table schema
...
Changed podcast table column sizes
Added some podcast table column size validation
2015-09-20 12:06:51 -04:00
0710accbe2
SAAS-1062 - more work on podcasting frontend
2015-09-18 18:29:50 -04:00
a6450353e5
Add missing phtml file
2015-09-18 15:52:54 -04:00
7da1f86659
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-18 15:39:19 -04:00
6de6e2767c
SAAS-1062 - Podcast skeleton work; slight rework to backend functionality
2015-09-18 15:39:12 -04:00
be39b6b7c0
* Initial podcast skeleton functionality
...
* Rename SoundCloud/Celery classes to fit conventions
* Small fixes to Table class functionality
2015-09-18 15:34:55 -04:00
11f3aa7b76
Fix typo
2015-09-18 14:36:54 -04:00
a810010448
Dropped percentage from educational discount
2015-09-18 14:01:30 -04:00
2cad7c1848
Added educational pricing page link
2015-09-18 13:59:55 -04:00
d95b5a9034
SAAS-1063: REST API for podcasts
...
Update composer.json with rss reader library
2015-09-18 09:52:24 -04:00
9a2e9d1b3b
SAAS-1058: Podcast table schema
...
Renamed podcast_contents to podcast_episodes
Added new columns to podcast_episodes table
2015-09-18 09:51:44 -04:00
f6f23864ce
SAAS-1063: REST API for podcasts
...
/rest/podcast mostly done
2015-09-18 08:15:48 -04:00
8308ce9cac
October promo banner
2015-09-17 15:38:00 -04:00
3d07260a9d
Small VAT checker bugfix
2015-09-17 15:17:18 -04:00
d31e0f950d
Fix podcast api permission
2015-09-17 13:19:11 -04:00
71919ad529
Basic integration of table widget into Dashboard podcasts view
2015-09-16 18:32:16 -04:00
dc840bf25f
Fix bad file extension
2015-09-16 15:31:59 -04:00
cce18ec911
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-16 15:29:18 -04:00
9ed3145473
Create oauth controller interface for oauth-specific actions; small refactoring on tabs.js
2015-09-16 15:29:10 -04:00
c1899f18af
remove comment
2015-09-16 15:07:38 -04:00
2ede56c26d
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-16 14:22:34 -04:00
67db2c1d25
SAAS-1063: REST API for podcasts
...
Hierarchy routing is working
Basic implentation of podcast INDEX and POST actions done
2015-09-16 14:22:13 -04:00
8dcea06077
* Move tab functionality to a separate module
...
* Fix broken library placeholders
* Restrict tab width and add text panning to tab name
* General bugfixing and cleanup of tab functionality
2015-09-15 18:53:25 -04:00
0d80f857d3
Fix broken import
2015-09-15 16:08:19 -04:00
7b76c8d6d3
Rename CeleryService to avoid confusion; fix wording and reduce redundancy in task functions
2015-09-15 15:06:03 -04:00
a444751397
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-09-15 14:21:27 -04:00
f6a33802db
Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing
2015-09-15 14:21:53 -04:00
ff24976bed
Fix up celery downloads a bit
2015-09-15 14:21:19 -04:00
ffdc83dc26
Reusable datatable control that hooks up to any of our REST APIs
...
* Implements item selection (single, shift, ctrl), pagination, and
sorting. To be used in the future.
* Added example code for how to use the table widget
* Temporarily added a table test page to the DashboardController
2015-09-15 14:18:35 -04:00
73d154ba17
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-15 14:07:59 -04:00
c8baa6e4b3
Merge branch 'saas-dev-publishing' into soundcloud
...
Conflicts:
airtime_mvc/application/views/scripts/playlist/playlist.phtml
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
airtime_mvc/public/js/airtime/library/spl.js
2015-09-15 14:03:11 -04:00
1a26679357
SAAS-1058: Podcast table schema
...
Add additional podcast table column - type
2015-09-15 14:00:26 -04:00
dd09676f88
Hide celery user
2015-09-15 13:59:48 -04:00
893d60ed44
Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
...
This reverts commit 0fcf6a8dac
2015-09-14 18:29:43 -04:00
8c65ba8f66
SAAS-1061 - implement podcast list view skeleton; small bugfixes
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2015-09-14 18:29:13 -04:00
0fcf6a8dac
SAAS-1061 - implement podcast list view skeleton; small bugfixes
2015-09-14 18:26:28 -04:00
28493497fd
SAAS-1058: Podcast table schema
...
SAAS-1059: Add description field to cc_files
2015-09-14 17:00:54 -04:00
3586845549
Merge branch 'saas' into saas-dev
2015-09-10 10:37:45 -04:00
32f5492e85
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-09-09 18:59:44 -04:00
c77749a096
SAAS: Show logo is deleted on disk when a show instance is deleted
...
* Default to returning the station logo in response if we can't find the
show logo on disk (but it's in our DB).
2015-09-09 18:59:00 -04:00
b26d4833fe
Merge branch 'saas' into saas-dev
2015-09-09 18:47:53 -04:00
2296aab8d5
Fix bug where show logo was removed when deleting an instance of a repeating show
2015-09-09 18:47:43 -04:00
bd4fc62e04
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
...
Conflicts:
airtime_mvc/public/js/airtime/library/spl.js
2015-09-09 13:55:27 -04:00
2569ce4d0a
CC-6136: Playlist fade values don't get or set properly
...
Fix smartblock design and fade out saving bug
2015-09-09 13:54:16 -04:00
e6494e7ff0
Better way to disable and reenable xfade button in playlist/sb editors
2015-09-08 16:56:55 -04:00
8c3f1cf535
Fix some issues with playlist/smart-block fade buttons
2015-09-08 16:44:33 -04:00
drigato
Duncan Sommerville
Albert Santoni
Albert Santoni
Daniel James