Commit Graph

354 Commits

Author SHA1 Message Date
drigato 34eb7d6e22 Merge branch 'saas-dev' into saas-dev-bandwidth-limits 2015-11-26 11:30:03 -05:00
Duncan Sommerville 0fc4f6c26f Fix Airtime bandwidth limit suspension code 2015-11-25 17:56:09 -05:00
Duncan Sommerville 82544f34d9 SAAS-1229, SAAS-1230 - initial implementation of station suspend when over bandwidth limit 2015-11-24 13:36:54 -05:00
Albert Santoni 25c54ce974 Merge branch 'saas-dev' into saas-dev-facebook-radio 2015-11-19 15:09:29 -05:00
Albert Santoni 965a78c54a Merge branch 'saas-dev' into saas-dev-publishing
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
2015-11-18 12:38:18 -05:00
Duncan Sommerville 8e867b522c SAAS-1202 - move station podcast to top-level menu item 2015-11-13 14:57:32 -05:00
Albert Santoni ee99a7304f XXXX-260 - Recalculate schedule API as part of bugfix
Conflicts:
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Scheduler.php
2015-11-06 12:49:53 -05:00
drigato a7370de832 Bump code version 2015-11-04 13:21:36 -05:00
drigato d20574dfb1 SAAS-1073: Schema upgrade for podcasts
Upgrade and downgrade done.
2015-11-03 10:57:55 -05:00
Albert Santoni 702ee97c7b Refactored Facebook Widget stuff 2015-10-30 14:38:34 -04:00
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
Albert Santoni 323b54d239 Rename billing menu for trials 2015-10-27 15:01:34 -04:00
Duncan Sommerville 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
Duncan Sommerville 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
Duncan Sommerville 9d0beabd3f Make playout history page visible for Program Managers 2015-10-19 14:09:42 -04:00
Albert Santoni 2713bd7beb Merge branch 'saas-dev' into saas-3.x-sessionoptimizations 2015-10-14 14:50:54 -04:00
Albert Santoni a90b97fb55 SAAS-1128: Logging in from www.airtime.pro doesn't trigger lang/timezone setup dialog 2015-10-14 14:28:39 -04:00
drigato 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
Duncan Sommerville 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
Albert Santoni 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
drigato b00ac6750c Testing 2015-09-29 13:04:22 -04:00
Albert Santoni 4c52bd99f6 Temporarily fix the Help video label breaking the Help page layout 2015-09-29 12:36:56 -04:00
Duncan Sommerville 67c20630a3 UI revamp what's new dialog 2015-09-28 17:19:02 -04:00
Duncan Sommerville 55d5fc62a2 SAAS-1071 - more work on celery backend 2015-09-22 20:22:06 -04:00
Duncan Sommerville cf1de5fb66 SAAS-1071 - initial work on podcast celery backend; tweak SoundCloud service 2015-09-22 15:26:08 -04:00
Duncan Sommerville f9ace20075 Simplify third-party/celery/soundcloud implementation 2015-09-21 17:03:46 -04:00
Daniel James ad2e26a1c3 IN-1956 Update Transifex project link 2015-09-21 17:44:00 +01:00
Duncan Sommerville 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
drigato 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
drigato d31e0f950d Fix podcast api permission 2015-09-17 13:19:11 -04:00
drigato 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
drigato 28493497fd SAAS-1058: Podcast table schema
SAAS-1059: Add description field to cc_files
2015-09-14 17:00:54 -04:00
drigato c4cb856283 CC-6078: Help page updates
Added a 'File a Support Ticket' link
2015-08-28 12:18:44 -04:00
drigato f597ee075e CC-6078: Help page updates
Removed help center link
2015-08-28 11:55:22 -04:00
drigato e3b09e9aa9 Make widgets page accessible to all user types 2015-08-28 11:32:19 -04:00
Albert Santoni a08d5b71cf Calendar colour adjustments
* CC-6099: Improve default show colour
* CC-6100: Choose show background colours randomly from a predefined  palette
2015-08-27 20:02:32 -04:00
Duncan Sommerville ef892bb565 Fix some small bugs with Dashboard navigation links 2015-08-26 17:02:01 -04:00
drigato c728be38ab CC-6078: Help page updates
Small text changes
Removed about page
2015-08-26 14:37:32 -04:00
drigato 9951abd897 SAAS-1025: Restyle the billing page
Make Account Plans the default view
2015-08-26 09:16:06 -04:00
Albert Santoni d4527a0460 CC-6091: Settings->General doesn't highlight when you click Settings 2015-08-25 13:15:57 -04:00
drigato d9455f86ea Change menu item order and change trial box position 2015-08-20 10:56:11 -04:00
Duncan Sommerville 42bbfc3834 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-19 13:02:16 -04:00
Duncan Sommerville ae66b2272b Fix editor styling and layout issues 2015-08-19 13:02:14 -04:00
drigato 8dcd0a2595 CC-6071: Icons for navigation bar 2015-08-19 12:58:31 -04:00
Albert Santoni 2c443bd27a Some navbar and page title fixes 2015-08-18 17:52:23 -04:00
Duncan Sommerville 3f25ab2647 CC-6079 - merge and remove underscore files 2015-08-18 15:23:42 -04:00
drigato 38022f4ff0 SAAS-1019: Re-work Navigation Menu
Added user settings to the Settings sub-menu
2015-08-17 16:22:55 -04:00
drigato e5f5ff4c88 SAAS-1019: Re-work Navigation Menu
Created Widget sub menu and moved widgets into separate controller
actions
2015-08-17 16:15:26 -04:00
drigato 3aee9a49bc SAAS-1019: Re-work Navigation Menu 2015-08-17 12:46:32 -04:00
drigato e90fe728a2 SAAS-1017: Move top nav bar to side 2015-08-14 08:30:52 -04:00