92ffa955c3
SAAS-1081 - implement station podcast download counter that resets monthly
2015-10-21 12:54:50 -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
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
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
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
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
efa3999041
SAAS-1016 - fix some stream settings not being saved correctly
2015-09-30 10:30:32 -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
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
67c20630a3
UI revamp what's new dialog
2015-09-28 17:19:02 -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
778b67982b
Remove duplicate imports and add new table imports to ScheduleController
2015-09-24 12:56:32 -04:00
a86e3ed4a8
Improvements to the preferences screen
2015-09-23 18:21:30 -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
4238d5a201
Refactor tabs functionality
2015-09-22 15:27:08 -04:00
79db208cd4
Refactor SoundCloud/Third party controllers to fit new service architecture
2015-09-22 14:18:48 -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
0710accbe2
SAAS-1062 - more work on podcasting frontend
2015-09-18 18:29:50 -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
71919ad529
Basic integration of table widget into Dashboard podcasts view
2015-09-16 18:32:16 -04:00
9ed3145473
Create oauth controller interface for oauth-specific actions; small refactoring on tabs.js
2015-09-16 15:29:10 -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
f6a33802db
Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing
2015-09-15 14:21:53 -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
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
3586845549
Merge branch 'saas' into saas-dev
2015-09-10 10:37:45 -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
d18d52a37a
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:15:24 -04:00
5c7d9fe31c
Change links for SoundCloud functionality to use same casing as navigation
2015-09-08 16:15:08 -04:00
f243014d9f
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:01:06 -04:00
de322171df
CC-6118: Playlist crossfade panel needs restyling
...
* Fixed it as much as possible. Unfortunately, the milliseconds are dropped
by Propel so we should probably restrict the fade time to whole
seconds....
2015-09-04 18:35:11 -04:00
53b835715a
Fix responsiveness of upload page
2015-09-03 15:51:09 -04:00
4e0f3ddd99
SAAS-1046 - remove misplaced ) character; add some translation strings to LocaleController
2015-09-03 13:53:43 -04:00
f05157c376
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 15:07:31 -04:00
6046f8843b
CC-6129: Static smart block errors don't appear
2015-09-02 15:07:17 -04:00
Duncan Sommerville
Albert Santoni
drigato
Duncan Sommerville