Commit Graph

7894 Commits

Author SHA1 Message Date
Robb Ebright 2cebb7dfa2 first part of the adding album tags to podcast downloads 2017-03-04 13:38:36 +01:00
Lucas Bickel c7ab886d2a Add default soundcloud config 2017-03-04 12:33:37 +01:00
Lucas Bickel 0b704e95f1 Use Zend_File_Transfer instead of $_FILES
This should give us more information in the case of an error and is the framework idiomatic way to handle a RESTful file upload.

I'm hoping this helps debug https://github.com/LibreTime/libretime/issues/3
2017-03-04 11:09:06 +01:00
Lucas Bickel 09aea8b747 stop using reflection in prooduction code
Problem: Reflection is a debugging tool and not really meant for use on production. There are easier ways to check if a class implements an interface with `is_a()`.

Solution: Get rid of reflection use and switch to `is_a()` in TaskManager, refactor the Enum thing that does not make sense since it is not being used.

The `is_a()` solution is really straightforward and has been supported in php for ages.

The Enum thing was a copy paste hack from stackoverflow and ignored the simple solution mentioned there while not using the features of the advanced one.
2017-03-03 22:48:19 +01:00
Lucas Bickel e28ad471f9 Rewrite config from /etc/airtime-saas to plain /etc/airtime
This is the results of sed -i -e 's|/etc/airtime-saas/|/etc/airtime/|' `grep -irl 'airtime-saas' airtime_mvc/ python_apps/` :P

It might need more testing, the airtime-saas part never really made sense, zf1 has environments for that, ie you would create a saas env based on production for instance.

I beleive legacy upstream was using this to share configuration between customers (ie. analyser runs only once and writes to a shared S3 bucket). I assume they mount the airtime-saas folder onto individual customers instances with a global config. Like I said, I don't feel that this makes sense since all it does is make hacking at the configs in airtime-saas a bit easier. A serious SaaS operation should be using something like puppet or ansible to achieve this.
2017-03-03 15:57:41 +01:00
Lucas Bickel 6e03863fa1 Problem: Billing is always on
Solution: Make billing configurable through LIBRETIME_ENABLE_BILLING and deactivate it

This should catch all the changes needed to deactive billing in LibreTime.

* [x] only call billing when it is enabled
* [x] let super admins edit their info
* [x] dont link to billing if it is disabled
2017-03-03 15:34:54 +01:00
Lucas Bickel 4875bc37a8 Add missing argument to playlistNotFound call
Was on 2.5.x as 7dbf4cf5d2d37057e1f5ab72cb12ffcc5ddc1ccb
2017-03-03 15:34:21 +01:00
Lucas Bickel 8fbf4fec8b config to disable live chat
Problem: Live Chat points back to legacy upstream and I do not believe we can let them do support for us ;)

Solution: Deactivate live chat through constants.php so it never gets checked.

This is like 34db703381 but removes one more sql call and makes it easy to reactivate should anyone want to use the feature in future.
2017-03-03 15:33:19 +01:00
Lucas Bickel 10532dc4e8 Problem: Failed logins always try log in against legacy upstream
Solution: Make the login fallback optional and deactivate it in the default config.

I'm leaving the code in here mostly because I want to revisit it and make it modular so I can later on plug my own FreeIPA things :)
2017-03-03 15:32:31 +01:00
Lucas Bickel 39fb738945 Always log locally during test run 2017-03-02 16:45:34 +01:00
Lucas Bickel 898a1ce545 Let soudcloud fail gracefuly when unconfigured
This makes general preferences look nice again, even when no soundcloud id and secret is configured (those don't belong us).
2017-03-02 14:47:16 +01:00
Lucas Bickel 51960a891f Manual loading fix for more classes in Zend_ pseudo-ns 2017-03-02 14:40:29 +01:00
Lucas Bickel 7b04f413a0 Remove zend dep check from status and config output
It's LibreTime's responsability to ensure this (ie in packages...) and the user should not need to know about this.
2017-03-02 14:31:51 +01:00
Lucas Bickel 4a7f3ea001 Fix preference page with customer ImageSize plugin
As noted in the code, this was getting loaded in a rather special way.
2017-03-02 14:29:19 +01:00
Lucas Bickel 693f1f6e51 Remove system zf1 from test include path 2017-03-02 13:57:56 +01:00
Lucas Bickel 021bf38c1b Remove phing StringHelper dependency
I had only really looked for requires previously, this one caught me off guard as using an include is quite anachronistic.

I did some digging and figured out, that this is the only occurence of such phing use I can find.
2017-03-02 13:25:50 +01:00
Lucas Bickel 21a319767f Fix missing AMQPConnection errors in setup
Also fixes them elsewhere, apart from having switched to a vendorized version, I also used one that is already namespaced.

The easy way out here is to use it in the namespaced fashion, it is only used in a few places and I know the library well enough to be certain that nothing much changed apart from the namespacing.
2017-03-02 12:38:44 +01:00
Lucas Bickel 7f3f420763 Regression: travis db is on localhost
This is one of the "small" things I need to take care of on my local env. Once the value is changeable through more than just the config file, I'll won't be touching these in my docker envs as much.
2017-02-28 12:29:40 +01:00
Lucas Bickel 4936b16bc1 Load autoloader early so setup can use it
Also fixes a @include_once check that is now much easier.
2017-02-28 12:25:24 +01:00
Lucas Bickel 1ca47d67d5 Use local configuration in tests
This way the tests should really run out of the box with what is described in TESTING.md.
2017-02-28 12:16:03 +01:00
Lucas Bickel 625f92fe44 Vendorize ZF1, fix PHPUnit and configure travis
This a a rather large commit due to the nature of the stuff it is touching. To get PHPUnit up and running again I had to update some deps and I did so by vendorizing them. The vendorizing of zf1 makes sense since distros are already considering to drop it from their repos.

* [x] install vendorized zf1 with composer
* [x] load composer autoloader before zf1
* [x] Implement headAction for all Zend_Rest_Controller based controllers
* [x] switch to yml dataset to get around string only limitations of xml sets (also removed warning in readme)
* [x] use year 2044 as hardcoded date for tests since it is in the future and has the same days like previously used 2016
* [x] make tests easier to run when accessing phpunit directly
* [x] clean up test helper to always use airtime.conf
* [x] switch test dbname to libretime_test
* [x] test db username password switched to libretime/libretime
* [x] install phpunit with composer in a clear version (make tests easier to reproduce on other platforms)
* [x] remove local libs from airtime repo (most of airtime_mvc/library was not needed of in vendor already)
* [x] configure composer autoloading and use it (also removed requires that are not needed anymore)
* [x] add LibreTime prefix for FileNotFoundException (phing had a similar class and these are all pre-namespace style)
* [x] add .travis.yml file
* [x] make etc and logdir configurable with LIBRETIME_CONF_DIR and LIBRETIME_LOG_DIR env (so travis can change it)
* [x] slight cleanup in config for travis not to fail
* [x] add cloud_storage.conf for during test runs
* [x] rewrite mvc testing docs and move them to docs/ folder
* [x] don't use `static::class` in a class that does not have a parent class, use `__CLASS__` instead.
* [x] don't use `<ClassName>::class`, since we already know what class we want `"<ClassName>"` ist just fine.
* [x] fix "can't use method in write context" errors on 5.4 (also helps the optimizer)
* [x] add build status badge on main README.md

Fixes https://github.com/LibreTime/libretime/issues/4

The PHP parts of https://github.com/LibreTime/libretime/pull/10 get obsoleted by this change and it will need rebasing.

This also contains https://github.com/LibreTime/libretime/pull/8, the late static binding compat code was broken for no reason and until CentOS drops php 5.4 there is no reason I'm aware of not to support it. I inlined #8 since the test would be failing on php 5.4 without the change.

If you want to run tests you need to run `composer install` in the root directory and then `cd airtime_mvc/tests && ../../vendor/bin/phpunit`. For the tests to run the user `libretime` needs to be allowed to create the `libretime_test` database. See `docs/TESTING.md` for more info on getting set up.
2017-02-27 17:59:01 +01:00
comiconomenclaturist 9017418b4e modified: airtime_mvc/application/forms/StreamSetting.php
modified:   install
2017-02-27 16:47:26 +00:00
Robb Ebright 276a69aa1b Porting commits from downloaded zip file of saas-dev branch 2017-02-13 18:22:22 +01:00
Albert Santoni db596d54b5 Fix bug in my last commit 2015-12-11 12:29:59 -05:00
Albert Santoni 2594105a5e Handle unknown plan types more gracefully with the bandwidth limit 2015-12-11 10:19:11 -05:00
Albert Santoni e3b0a93ebb Only suspend over bandwidth when station is active 2015-12-09 13:03:41 -05:00
Albert Santoni 09316041c6 Fix unnecessary HTTPS redirect to reduce traffic 2015-12-08 17:47:07 -05:00
Albert Santoni c5429df59c Holiday promo update for billing page 2015-12-08 15:44:41 -05:00
Albert Santoni 4cfdda46b4 SAAS-1266: Webstream metadata doesn't show in API or dashboard header 2015-12-03 16:57:18 -05:00
Duncan Sommerville 7edece1938 Remove station podcast from podcast table count 2015-12-02 12:25:04 -05:00
Albert Santoni 68252a078b SAAS-1258: Long track titles hide play button and icon on radio page 2015-12-01 16:03:44 -05:00
Albert Santoni 3254be6f91 Added holiday offer blurb 2015-11-30 18:31:20 -05:00
Duncan Sommerville f857183247 Fix layout for disk quota error message 2015-11-30 13:13:06 -05:00
Duncan Sommerville b4b4cd265e SAAS-1236 - show duration text 2015-11-30 12:24:14 -05:00
Duncan Sommerville 27df10cb5d Mute 'Waiting for Celery task' logging 2015-11-27 17:22:05 -05:00
Duncan Sommerville eff7cd2f07 Fix bug in podcast download 2015-11-27 16:48:44 -05:00
Duncan Sommerville 5eaf74bbd9 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-11-26 18:54:54 -05:00
Duncan Sommerville 042a9b1558 Fix bug creating track references 2015-11-26 18:54:49 -05:00
Albert Santoni 819a882c31 Temporarily hide bandwidth usage and move it down in the page 2015-11-26 17:30:28 -05:00
Duncan Sommerville 0f5233b32e Fix Celery callback URLs 2015-11-26 16:07:52 -05:00
Duncan Sommerville 17a03e088f SAAS-1244 - improve pending podcast episode sweeping; small bugfixes 2015-11-26 15:25:38 -05:00
drigato 21846be7ed SAAS-1243: Bandwidth usage status on Listener Stats page 2015-11-26 13:25:44 -05:00
Duncan Sommerville 786b357ed5 Add bandwidth limit for trial plan 2015-11-26 12:37:09 -05:00
Duncan Sommerville e68f6cadd6 Add bandwidth limits for awesome august plan levels 2015-11-26 12:31:59 -05:00
drigato 34eb7d6e22 Merge branch 'saas-dev' into saas-dev-bandwidth-limits 2015-11-26 11:30:03 -05:00
Duncan Sommerville a67ae0a5e4 Fix for Airtime bandwidth limit suspension code 2015-11-25 18:18:24 -05:00
Duncan Sommerville 0fc4f6c26f Fix Airtime bandwidth limit suspension code 2015-11-25 17:56:09 -05:00
Duncan Sommerville 24f488cac2 Fix typo in pref keys 2015-11-25 16:08:31 -05:00
Duncan Sommerville 3f241b2f25 SAAS-1229 - add default bandwidth limit values 2015-11-25 15:04:45 -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
drigato a2a30e5c42 Merge branch 'saas-dev' into saas-dev-facebook-radio 2015-11-24 11:22:18 -05:00
Duncan Sommerville 553299e9f5 Try to fix some schedule bugs 2015-11-23 14:55:37 -05:00
drigato 04167c103b Fix parameter name in api/bandwidth-usage 2015-11-23 11:37:08 -05:00
Duncan Sommerville bac1e553d9 SAAS-1229 - add comments in Preference and set update timer 2015-11-23 10:53:25 -05:00
Duncan Sommerville d4d152c670 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-11-23 07:55:23 -05:00
Albert Santoni aabd1f3186 Updated stream qualities in pricing grid 2015-11-20 17:07:58 -05:00
Albert Santoni e91eece092 Added podcast episode downloads to plans grid 2015-11-20 16:27:23 -05:00
Duncan Sommerville 7f5e41c885 Add basic 403 handling to table.js 2015-11-20 13:41:23 -05:00
Duncan Sommerville f4e6c2dd7a Merge branch 'saas-dev' into saas-dev-bandwidth-limits 2015-11-20 11:49:20 -05:00
Duncan Sommerville fb3d83cc40 Change 'Learn about podcasts' link 2015-11-20 11:49:03 -05:00
Duncan Sommerville aa3d0ea7ae Merge branch 'saas-dev' into saas-dev-bandwidth-limits 2015-11-20 11:29:30 -05:00
Duncan Sommerville fff7ef371d Add fnDrawCallback to podcasts table to fix placeholder 2015-11-20 11:27:11 -05:00
Duncan Sommerville 2729998a16 Merge branch 'saas-dev' into saas-dev-bandwidth-limits 2015-11-19 17:10:07 -05:00
Duncan Sommerville 641cfb9432 SAAS-1234 - bind station feed url to angular data model 2015-11-19 17:09:49 -05:00
Duncan Sommerville 6c2d1f008b SAAS-1229 - initial work on bandwidth limit within Airtime; overhaul TaskFactory to get tasks reflectively 2015-11-19 16:08:25 -05:00
Albert Santoni 7545c91ca4 SAAS-1181: Finalize the Facebook widget 2015-11-19 15:55:12 -05:00
Albert Santoni 25c54ce974 Merge branch 'saas-dev' into saas-dev-facebook-radio 2015-11-19 15:09:29 -05:00
Duncan Sommerville c328515f4b SAAS-1135 - fix help button url for logged out users 2015-11-19 11:08:35 -05:00
Duncan Sommerville e4027c1e1f Sweep pending podcast episodes after an hour; css tweaks to My Podcast page 2015-11-18 16:20:29 -05:00
Duncan Sommerville 0efaf836b0 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-18 12:37:44 -05:00
Albert Santoni ba832ffe3a Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing 2015-11-18 12:38:22 -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 bdeb173b21 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-18 12:37:34 -05:00
Duncan Sommerville 9218d76de9 SAAS-1214 - add Connect with Soundcloud button; Fix nav styling in some browsers 2015-11-18 12:37:29 -05:00
drigato dc6c2893b4 Hide Soundcloud options from preferences for hobbyist plans 2015-11-18 12:31:31 -05:00
drigato ceafccd685 Hide podcast from radio page for hobbyist plans 2015-11-18 12:12:57 -05:00
Duncan Sommerville 9a8e80f74b Change station podcast RSS links back to https; style fix for menu in some browsers 2015-11-18 11:10:14 -05:00
Duncan Sommerville eae8c7b638 Temporary fix to make enclosure urls iTunes compatible 2015-11-17 21:06:51 -05:00
Albert Santoni ef87ad8a51 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing 2015-11-17 20:12:26 -05:00
Albert Santoni e915a4f1bb Added iTunes owner field for the station podcast 2015-11-17 20:12:22 -05:00
Duncan Sommerville ce7fdc2a85 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-17 19:51:46 -05:00
Duncan Sommerville 4828e82d2a Change download key parameter regex 2015-11-17 19:51:41 -05:00
Albert Santoni ddb2a225f8 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
Conflicts:
	airtime_mvc/application/services/PodcastService.php
2015-11-17 19:35:05 -05:00
Albert Santoni 47193403ea Added ATOM xmlns for iTunes support 2015-11-17 19:33:36 -05:00
Duncan Sommerville 6aafe25fd1 Change station RSS image title to match channel title 2015-11-17 19:28:52 -05:00
Duncan Sommerville 0d585e30db Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-17 18:59:03 -05:00
Duncan Sommerville 1571887928 Change how station logo default is returned 2015-11-17 18:58:58 -05:00
Albert Santoni 1ef9ee3073 Disable session starting for feeds controller 2015-11-17 18:55:53 -05:00
Albert Santoni c89941d312 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing 2015-11-17 18:34:06 -05:00
Albert Santoni 51d2f1dd0b Added HTTP Range Request support to feeds/station-rss controller to make it work in iTunes 2015-11-17 18:34:02 -05:00
Duncan Sommerville e75d614537 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-17 17:50:20 -05:00
Duncan Sommerville bdddd6f6ce Try to fix iTunes RSS compatibility 2015-11-17 17:50:16 -05:00
Albert Santoni 4fd61cb088 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing 2015-11-17 17:34:33 -05:00
Albert Santoni c5d9dfd93d Restrict podcast hosting for some plans. Fixed error page colours. 2015-11-17 17:34:13 -05:00
Duncan Sommerville 30c9c730be Bugfixes and itunes compatibility fix 2015-11-17 17:23:21 -05:00
Duncan Sommerville f2fae3c67e SAAS-1195 - fix calendar error; use baseurl in all internal links; css tweaks 2015-11-17 16:39:29 -05:00
Albert Santoni ef1a57459c Merge remote-tracking branch 'origin/saas-dev-publishing' into saas-dev-publishing 2015-11-17 16:18:57 -05:00
Albert Santoni ff96eba9ea Format podcast RSS XML with newlines 2015-11-17 16:18:38 -05:00
drigato 031c4dca41 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-17 15:20:17 -05:00
drigato b268028e6a SAAS-1213: Fix Podcast privacy settings radio button layout 2015-11-17 15:20:05 -05:00
Duncan Sommerville 57d9245fbf SAAS-1214 - add link to preferences from publish dialog when source is disconnected; fix missing check in station rss generation 2015-11-17 12:35:31 -05:00
Duncan Sommerville c12848b2de * SAAS-1212 - fix validation errors in station podcast rss
* Append podcast title to heading in episodes view
2015-11-17 12:26:21 -05:00
Duncan Sommerville 041adb5c1f Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-17 11:53:07 -05:00
Duncan Sommerville 2523391d4d Fix itunes duration format in station podcast xml 2015-11-17 11:53:02 -05:00
Albert Santoni 6a668f79af Tighten up Radio Page CSS transitions 2015-11-17 11:42:08 -05:00
drigato b94164107f Podcast text overflow fix on radio page 2015-11-17 11:42:01 -05:00
Albert Santoni 9ddb33f2cd Fix up title scaling on Radio Page 2015-11-17 10:48:16 -05:00
Albert Santoni 8ba7a5dbe9 Use flexbox for the Radio Page player bar 2015-11-17 10:33:43 -05:00
Duncan Sommerville 62a3251fb4 Style tweak for episode view dialog 2015-11-16 18:25:10 -05:00
Duncan Sommerville be7c60253b Disable publish button when finished publishing to selected source(s) 2015-11-16 17:27:51 -05:00
Albert Santoni 1a349c4ea1 Fixed non-trial suspension screen 2015-11-16 17:07:38 -05:00
Duncan Sommerville 7707378c2b Improve the publish service implementation 2015-11-16 16:18:29 -05:00
Duncan Sommerville 42e55f193c SAAS-1211 - fix columns in oColVis dropdown for My Podcast episode table 2015-11-16 15:54:20 -05:00
Duncan Sommerville 6d9859c025 SAAS-1210 - Fix broken link 2015-11-16 15:48:30 -05:00
Duncan Sommerville dc5e81ee9b Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 15:44:13 -05:00
Duncan Sommerville 43b1ce6520 Fix broken check for import status 2015-11-16 15:44:06 -05:00
drigato 957d0aebf2 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-16 15:29:11 -05:00
drigato 5828361465 Display message on radio page if no podcast tracks have been published yet. 2015-11-16 15:28:54 -05:00
Duncan Sommerville 2fb988a7cb CSS fix for nav menu at small resolutions 2015-11-16 15:28:28 -05:00
drigato f2ce22a1fa Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-16 14:40:46 -05:00
drigato c453afc6f1 Fix toggling player bar and podcast playback on radio page 2015-11-16 14:40:31 -05:00
Duncan Sommerville a34d74e7ce Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 14:23:16 -05:00
Duncan Sommerville 38d08a5661 SAAS-1208, SAAS-1209 - fix preferences and my podcast settings pages 2015-11-16 14:23:08 -05:00
drigato 16f252c2c8 Fix podcast title responsive layout on radio page 2015-11-16 14:16:10 -05:00
Duncan Sommerville 28d378abfa Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 12:45:04 -05:00
Duncan Sommerville 130c5f570b Fix podcast table bug 2015-11-16 12:44:57 -05:00
drigato ae02fa6260 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-16 12:36:11 -05:00
drigato 90ac6367e4 Improve podcast title on radio page 2015-11-16 12:35:50 -05:00
Duncan Sommerville 64f62b1994 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 12:07:59 -05:00
Duncan Sommerville 08f5aa51a6 CSS and display fixes 2015-11-16 12:07:53 -05:00
drigato 08afb54f89 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-16 11:44:30 -05:00
drigato 03e90cdd3f Fix podcast pagination highlighting on radio page 2015-11-16 11:44:06 -05:00
Duncan Sommerville 610d860d6a Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 11:36:24 -05:00
Duncan Sommerville 3010fa01fa Add processing div to podcast episodes table 2015-11-16 11:36:18 -05:00
Duncan Sommerville 7569e936ce Merge branch 'saas-dev-publishing' into saas-dev-publishing-station-podcast 2015-11-13 15:59:57 -05:00
Duncan Sommerville 840f446e07 Disable publish button unless at least one source is checked 2015-11-13 15:59:34 -05:00
Duncan Sommerville 1d8ebab147 Merge branch 'saas-dev-publishing' into saas-dev-publishing-station-podcast 2015-11-13 14:58:24 -05:00
Duncan Sommerville d0265367bf Add forgotten png file 2015-11-13 14:58:06 -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 591f7d59f0 Slightly better error handling for uploads 2015-11-13 10:53:47 -05:00
drigato 50c0bc2c28 Fix podcast current track title escaping on radio page 2015-11-13 09:51:57 -05:00
drigato d9d4ce884c Small radio page tweak 2015-11-13 09:02:33 -05:00
drigato 5b59fecae9 Fix radio page description button 2015-11-13 08:26:44 -05:00
drigato 778904fdb5 Radio page css fixes 2015-11-13 07:48:14 -05:00
Duncan Sommerville 0514a5d789 Frontend tweaks + fixes 2015-11-12 19:29:55 -05:00
Duncan Sommerville 69109e171c Fix bad css 2015-11-12 19:03:32 -05:00
Duncan Sommerville 55df7775c2 Frontend polish and fixes; make empty placeholder implementation more abstract and add placeholder to 'My Podcast' view 2015-11-12 19:02:09 -05:00
Duncan Sommerville 0e74229975 Fix bug where 'Add' dialog appends to the dom multiple times 2015-11-12 15:42:41 -05:00
Duncan Sommerville 5a573d3d9e Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-12 15:32:45 -05:00
Duncan Sommerville 607176276a Fix invalid reference bug 2015-11-12 15:32:38 -05:00
Duncan Sommerville 28e95d5c16 Add publish button to library table 2015-11-12 15:29:01 -05:00
drigato 9fc4e1c603 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-12 15:28:51 -05:00
drigato 9dae535768 Radio page jPlayer fixes 2015-11-12 15:28:40 -05:00
Duncan Sommerville ea887dd8f6 Disable publish checkbox for disconnected sources 2015-11-12 14:47:47 -05:00
Duncan Sommerville 0951afcbb3 SAAS-1188 - add empty placeholder for podcast episodes table 2015-11-12 14:14:42 -05:00
Duncan Sommerville 26c9a19836 Fix bug with import status of podcst episodes 2015-11-12 11:37:39 -05:00
Duncan Sommerville c7dcd4f00a Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-12 10:27:03 -05:00
Duncan Sommerville 1b4ae9bb83 Quick fix for bug on calendar 2015-11-12 10:26:57 -05:00
Albert Santoni ae85c278ea Remove a WIP label temporarily 2015-11-12 10:09:09 -05:00
Duncan Sommerville 071de55329 Add some additional error handling and prevent disabled buttons from being triggered 2015-11-11 19:26:51 -05:00
Duncan Sommerville 8a5c25291e Lower poll interval for checking import status of podcast episodes 2015-11-11 18:52:12 -05:00
Albert Santoni c43b45a7ba Renamed Radio Archive to Radio Podcast 2015-11-11 18:39:00 -05:00
Albert Santoni e5c198b61b Some minor style changes for podcasting 2015-11-11 18:01:09 -05:00
Duncan Sommerville 86b7dec6fb SAAS-1200 - remove context menu from schedule tracks dialog (calendar) 2015-11-11 17:07:24 -05:00
Duncan Sommerville 5b325acb34 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-11 16:48:35 -05:00
Duncan Sommerville 74f7c454b5 * SAAS-1184 - more polish for publishing/podcasting
* Fix some issues with the station podcast feed
* Various small fixes
2015-11-11 16:47:07 -05:00
drigato bec55dc73e Radio page fix for un-supported mime types 2015-11-11 15:53:42 -05:00
drigato faeaf5450b SAAS-1203: Sort published tracks on radio page by publication date DESC 2015-11-11 15:35:07 -05:00
drigato 59cf6f6238 Radio page jPlayer fixes 2015-11-11 14:55:47 -05:00
Duncan Sommerville 5264bebe57 SAAS-1199 - stop user from dragging unimported podcast episodes 2015-11-11 11:16:02 -05:00
Duncan Sommerville c5a5839eff Better errors from podcast 'Add' dialog 2015-11-10 19:26:25 -05:00
Duncan Sommerville de380369ed * SAAS-1197 - fix publish dialog behaviour for tasks with pending states
* SAAS-1184 - more polish on publishing/podcasting
2015-11-10 17:54:31 -05:00
drigato 308457c9f4 SAAS-1174: Indicate on Radio Page which podcast tracks cannot be played
Also made some other UI changes and pagination fixes
2015-11-10 17:06:58 -05:00
Duncan Sommerville b88bcfaa92 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-10 15:10:44 -05:00
Duncan Sommerville bb7f8c1ed3 SAAS-1184 - bugfixes and polish 2015-11-10 15:10:36 -05:00
Albert Santoni 127eeda0b3 Improved styling of podcast subscribe dialog 2015-11-10 15:10:08 -05:00
Albert Santoni f4e9328e57 Renamed View Podcasts to View Episodes 2015-11-10 10:57:56 -05:00
Duncan Sommerville f352b61707 Add prefixes for flex properties 2015-11-09 18:32:46 -05:00
Duncan Sommerville 0360b5e460 * SAAS-1182 - added sanity checks and additional logic to rss import and episode generation
* SAAS-1184 - started work on podcast UI polishing
* Fixed pull request issues
2015-11-09 18:17:49 -05:00
Duncan Sommerville 1bc0f9e54b Fix small bugs in table.js 2015-11-09 13:59:36 -05:00
Duncan Sommerville 48f09c44ca Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view 2015-11-09 13:57:17 -05:00
drigato 372e28f82e SAAS-1158: Station podcast on Radio Page design implementation
Fix some pagination functionality
2015-11-09 13:44:45 -05:00
drigato ea9f0c8929 SAAS-1158: Station podcast on Radio Page design implementation
added pagination to the station rss episodes list
2015-11-09 12:15:46 -05:00
Duncan Sommerville ef5fd271e0 Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view 2015-11-09 10:21:38 -05:00
drigato 4c3e05d5f0 SAAS-1158: Station podcast on Radio Page design implementation 2015-11-09 08:42:46 -05:00
Duncan Sommerville a7881b8941 SAAS-1165 - implement simple one-item drag and drop for podcast episodes table; still needs work 2015-11-06 17:47:46 -05:00
Duncan Sommerville 729360e1a1 SAAS-1165, SAAS-1155 - add constraints to Table buttons, implement podcast + podcast episode constraints; finish left-hand podcast episode view functionality 2015-11-06 14:40:22 -05:00
Albert Santoni 0e6e82a0c6 Fixed session start issue with new API 2015-11-06 13:04:33 -05:00
Albert Santoni e8a0ace018 Fixed up syntax error introduced by last commit 2015-11-06 12:57:35 -05:00
Albert Santoni 713a158bb3 Disable layout in recalculate-schedule API - XXXX-260 2015-11-06 12:50:47 -05:00
Albert Santoni 4a86544738 Skip non-files for XXXX-260 2015-11-06 12:50:30 -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
Duncan Sommerville 7072762dd9 Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view 2015-11-06 09:44:29 -05:00
drigato 093de68edb Add station rss subscribe link to radio page 2015-11-05 20:46:33 -05:00
Duncan Sommerville 901ded1441 Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view 2015-11-05 18:16:27 -05:00
Duncan Sommerville 0be26d621b SAAS-1165 - implement most functionality for left-hand podcast episodes view 2015-11-05 18:15:58 -05:00
Albert Santoni 1efd0b815b Removed October educational discount banner from billing page 2015-11-05 16:47:58 -05:00
drigato e496072541 Small css fix 2015-11-05 14:42:52 -05:00
drigato c476b69958 Add podcast icon to radio page 2015-11-05 14:41:31 -05:00
drigato a35d3ad27c SAAS-1175: Radio page should toggle playout between player bar and podcast tracks 2015-11-05 13:24:13 -05:00
Albert Santoni 685134d8bb Better trial suspension notice 2015-11-05 12:45:09 -05:00
Duncan Sommerville 95fc432445 SAAS-1173 - Add escaping for XML elements 2015-11-04 17:08:25 -05:00
Duncan Sommerville a984cee13a Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view 2015-11-04 15:58:11 -05:00
Duncan Sommerville 90ac2cc681 Fix bug where public station podcast feed would not display when logged out 2015-11-04 15:57:51 -05:00
Duncan Sommerville 6cb28e0911 Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
Conflicts:
	airtime_mvc/public/js/airtime/library/podcast.js
2015-11-04 15:18:50 -05:00
Duncan Sommerville df467a24bf Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-04 15:16:35 -05:00
Duncan Sommerville 866b88dbb2 Style tweaks to publishing and podcast dialogs 2015-11-04 15:16:29 -05:00
drigato 8d19e11343 SAAS-1173: Station RSS link does not work
Set charset to UTF-8
2015-11-04 15:08:47 -05:00
Duncan Sommerville ee19d90930 Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view 2015-11-04 13:24:42 -05:00
Duncan Sommerville e7869b54c7 SAAS-1165 - initial work on left-hand pane for podcast episodes 2015-11-04 13:22:33 -05:00
drigato a7370de832 Bump code version 2015-11-04 13:21:36 -05:00
drigato 8a03892ff8 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-04 12:45:50 -05:00
drigato 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
Duncan Sommerville 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
Duncan Sommerville 69da2fa07e Style tweaks 2015-11-04 09:45:16 -05:00
Duncan Sommerville b12b08f0f4 SAAS-1164 - styling for publishing frontend 2015-11-04 09:29:03 -05:00
Duncan Sommerville 6683b712c4 Fix a couple of station podcast bugs 2015-11-03 17:13:38 -05:00
Duncan Sommerville a1d9902b2a Cosmetic tweaks 2015-11-03 16:40:09 -05:00
Duncan Sommerville 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
Duncan Sommerville 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
drigato 4cd00b50ee Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-03 11:47:45 -05:00
drigato 569ea00787 Fix for PodcastController index action when station podcast does not exist 2015-11-03 11:45:01 -05:00
drigato 335c2fea11 Fix for radio page when station podcast does not exist yet 2015-11-03 11:40:22 -05:00
drigato 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
drigato d20574dfb1 SAAS-1073: Schema upgrade for podcasts
Upgrade and downgrade done.
2015-11-03 10:57:55 -05:00
Duncan Sommerville 3654647170 Add some comments to podcast.js 2015-11-03 10:31:06 -05:00
Duncan Sommerville 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
Duncan Sommerville 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
Duncan Sommerville 529a73d39d Fun update for tab functionality - add tab sorting and close on middle mouse click 2015-11-02 11:04:30 -05:00
Duncan Sommerville 4f281a30ed Add SoundCloud update and download tasks to Celery backend; requires airtime-celery reinstall 2015-10-30 16:10:16 -04:00
Albert Santoni 702ee97c7b Refactored Facebook Widget stuff 2015-10-30 14:38:34 -04:00
Duncan Sommerville bf97c42167 Fix tabs layout bugs 2015-10-30 11:43:09 -04:00
Duncan Sommerville 9af7f6dcdd Fix tabs bugs and podcast auto-ingest error 2015-10-30 10:29:22 -04:00
Duncan Sommerville d08e19a93a More small TaskManager and auto-ingest fixes 2015-10-29 18:26:20 -04:00
Duncan Sommerville 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
Duncan Sommerville c92eceb60d Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-10-29 14:58:35 -04:00
Duncan Sommerville b4db2ff4ca SAAS-1083 - more work on publish dialog 2015-10-29 14:58:30 -04:00
drigato 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
Duncan Sommerville 706db9bc25 Fix bug where multiple file metadata editors couldn't be opened through context menu 2015-10-29 13:47:43 -04:00
Duncan Sommerville 40a2aa10d8 SAAS-1083 - Implement unpublishing 2015-10-29 13:09:50 -04:00
Duncan Sommerville 4b11979eff Remove station podcast from podcast datatable; editor now opens from button in podcasts view 2015-10-29 12:17:52 -04:00
Duncan Sommerville 8c49477b9c Add some comments to podcast.js 2015-10-29 11:54:35 -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
Duncan Sommerville 1de8a24b59 CSS fixes for uploads page 2015-10-29 11:15:01 -04:00
Duncan Sommerville ada7212823 Add TaskManager task to fail pending imports over an hour old 2015-10-29 11:03:28 -04:00
Duncan Sommerville b5f31065a7 Fix merge error 2015-10-29 10:18:53 -04:00
Duncan Sommerville 59ad4fd7f5 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-10-29 10:12:31 -04:00
Duncan Sommerville 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
Duncan Sommerville 8978c3692d Fix annoying css error 2015-10-29 09:58:32 -04:00
Duncan Sommerville 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
Duncan Sommerville cd17a23d13 Fix download counter reset timer 2015-10-29 09:23:41 -04:00
Duncan Sommerville 1067e9f8ae Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-10-28 18:54:35 -04:00
Duncan Sommerville e97aa199bd SAAS-1083 - work on publish dialog 2015-10-28 18:54:30 -04:00
drigato 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
Duncan Sommerville 05f51a9a2d Refresh podcast tabs on focus to have better synchronization with auto-ingest backend 2015-10-28 13:43:21 -04:00
Duncan Sommerville e8643e04eb Add colreorder fixed columns to podcast + episodes datatables so checkbox column is fixed 2015-10-28 12:17:29 -04:00
Duncan Sommerville 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
drigato 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
Albert Santoni 323b54d239 Rename billing menu for trials 2015-10-27 15:01:34 -04:00
drigato 1211e8db7f Fix typo 2015-10-26 15:55:03 -04:00
drigato 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
drigato 7f05d5c05e Return track metadata as part of PodcastEpisodes API 2015-10-26 15:09:06 -04:00
drigato e994033109 Refactor podcast episodes rest controller index action 2015-10-26 11:28:10 -04:00
drigato 5a2d8b26a9 Fix for breaking uploads - fix cue regex 2015-10-23 16:09:38 -04:00
Albert Santoni aed18c534d SAAS-1150: Null mime type breaks the scheduled shows tab 2015-10-23 15:00:19 -04:00
Duncan Sommerville e8980e7a79 Bugfixes and more work on station podcast frontend 2015-10-22 18:03:38 -04:00
drigato 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
drigato 1aee6ba97a SAAS-1140: Paginate station podcast feed episodes
Added pagination to PodcastEpisodes controller
2015-10-22 14:51:39 -04:00
Albert Santoni 3e97ee5d62 Localization and verbiage improvements for adding podcasts 2015-10-22 14:39:12 -04:00
Albert Santoni 01618b55af Fixed a bug with our table widget toolbar not showing up with static data. Also fixed a race condition. 2015-10-22 14:28:12 -04:00
Duncan Sommerville f94e462fe0 Revert polling interval for podcast ingest 2015-10-22 12:22:56 -04:00
Duncan Sommerville 9302027a2b Fix issue with automatic ingest; shift episode ingest to PodcastEpisodesController 2015-10-22 12:12:41 -04:00
Duncan Sommerville 23ccc268d1 Forgot to add station podcast phtml 2015-10-22 10:44:47 -04:00
Duncan Sommerville 814fc67e90 Work on station podcast editor view 2015-10-21 19:21:52 -04:00
Duncan Sommerville 6580c12ad3 Add station podcast privacy toggle 2015-10-21 17:30:24 -04:00
Albert Santoni 16a0172542 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-10-21 16:26:04 -04:00
Albert Santoni a4b42344dd CC-6140: Switch to Windows linebreaks for stream M3U 2015-10-21 16:25:59 -04:00
drigato eba99728ae Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-10-21 16:14:54 -04:00
drigato cb8c34c3d5 SAAS-1126: Make player widget localizable 2015-10-21 16:14:36 -04:00
Albert Santoni 3b81ea02c8 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-10-21 16:14:11 -04:00
Albert Santoni 4d1d96c8f7 CC-6140: M3U streaming link 2015-10-21 16:14:06 -04:00
Duncan Sommerville 92ffa955c3 SAAS-1081 - implement station podcast download counter that resets monthly 2015-10-21 12:54:50 -04:00
Duncan Sommerville 6c0055895c Set auto ingest timestamp when updating 2015-10-21 11:18:33 -04:00
drigato b98f573531 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-10-21 11:01:20 -04:00
drigato 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
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
Albert Santoni 6cbc2f5316 Slight CSS rework for SAAS-1136 2015-10-20 17:39:46 -04:00
Albert Santoni f441f2d385 SAAS-1136: Disk usage div overflows if your disk usage is over 100% 2015-10-20 16:57:31 -04:00
Albert Santoni f79ca8650f Unpaid invoice usability hint and invoice page style fix - SAAS-1134 2015-10-20 15:44:24 -04:00
Albert Santoni 885f47c20e Better solution for upgrade problems (SAAS-1133) 2015-10-20 14:52:17 -04:00
Albert Santoni 9d4cc6c205 Temporary workaround for upgrade problems 2015-10-20 12:28:18 -04:00
Albert Santoni c8e1408dbe Handle error case with bad user timezone strings break advanced search 2015-10-20 11:45:26 -04:00
Albert Santoni 195f1f0e9a Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-10-19 17:31:31 -04:00
Albert Santoni f8a6721703 Increase transaction isolation level for track scheduling and moving 2015-10-19 17:31:26 -04:00
Duncan Sommerville 3a791ef9b5 Remove unnecessary field 2015-10-19 17:00:03 -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 1a5250205c Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-10-19 16:10:25 -04:00
Duncan Sommerville bd3a16ae7b SAAS-1110 - Fix header sizing at most screen resolutions 2015-10-19 16:10:20 -04:00
Duncan Sommerville bcbd8a8050 Fix bug in auto ingest, immediately retry on failure 2015-10-19 15:36:34 -04:00
Albert Santoni da6e613a24 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-10-19 15:23:57 -04:00
Albert Santoni fb4aef405c Increase transaction isolation level to avoid duplicate shows, SAAS-1111 2015-10-19 15:23:50 -04:00
Duncan Sommerville 9d0beabd3f Make playout history page visible for Program Managers 2015-10-19 14:09:42 -04:00
Duncan Sommerville c8069aaedd Initial publishing fixes and tweaks 2015-10-19 13:42:27 -04:00
Duncan Sommerville 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
Albert Santoni 97cc4050a4 CC-6139: User timezone setting displays incorrectly in user settings 2015-10-19 12:37:34 -04:00
drigato 14104a93ae SAAS-1080: Station podcast feed 2015-10-19 11:54:53 -04:00
Albert Santoni 30d742af92 Added msising publish-dialog.phtml and fixed .gitignore file 2015-10-15 18:03:03 -04:00
Duncan Sommerville bddc121c2d Initial work on automatic ingest for imported podcasts 2015-10-15 14:44:17 -04:00
Duncan Sommerville a2d725f2b9 Fix podcast episode ingest 2015-10-15 11:33:09 -04:00
drigato 40d0619f10 Override Podcast->fromArray 2015-10-15 08:06:01 -04:00
Albert Santoni d98459a55d Fix head title on Radio Page 2015-10-14 15:20:49 -04:00
Albert Santoni eea5fff1fa Fixed jQuery being broken on Radio Page 2015-10-14 15:15:25 -04:00
Albert Santoni 2713bd7beb Merge branch 'saas-dev' into saas-3.x-sessionoptimizations 2015-10-14 14:50:54 -04:00
Albert Santoni 591b3d1539 Fix SAAS-1128 more robustly to fix timezone/lang popup for sign up too 2015-10-14 14:40:23 -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
Albert Santoni 08344895d6 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-10-14 11:59:05 -04:00
Albert Santoni 9a03b1b50a Force users to click OK in the language/timezone popup 2015-10-14 11:58:44 -04:00
Localizer 96e6038d87 updated translation resources 2015-10-14 15:49:16 +00: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
drigato d647bf67ea Refactoring Podcast classes and services 2015-10-14 10:58:13 -04:00
drigato 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
drigato cfb21f8425 Bunch of schema changes 2015-10-13 10:14:23 -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
Duncan Sommerville ee70a0dbea SAAS-1094 - update backend to prevent removal of items in linked shows while on air 2015-09-30 14:44:48 -04:00
Duncan Sommerville b01fdc6805 SAAS-1094 - update backend to prevent removal of items in linked shows while on air 2015-09-30 14:44:06 -04:00
Duncan Sommerville 98d565ff3d SAAS-1101 - add workaround for pages obstructed by livechat box 2015-09-30 14:24:21 -04:00
Duncan Sommerville c0372c1745 Fix webstream tab change behaviour 2015-09-30 12:07:31 -04:00
Duncan Sommerville 2ee7e4bf71 SAAS-1088 - move 'All My Shows' checkbox to dropdown instead 2015-09-30 11:38:33 -04:00
Duncan Sommerville 258500f650 SAAS-1102 - fix datatables pagination layout issues 2015-09-30 11:24:29 -04:00
Duncan Sommerville efa3999041 SAAS-1016 - fix some stream settings not being saved correctly 2015-09-30 10:30:32 -04:00
drigato bdab0f7b1a Revert medatdata editor fix 2015-09-30 10:03:34 -04:00
drigato f91d28e3f2 Css fix for playlist editor 2015-09-30 09:02:35 -04:00
drigato 2e024bcfdd Css fixes for metadata and playlist editors 2015-09-30 08:58:39 -04:00
drigato c7dd2e7256 Working on changing schema 2015-09-30 08:53:13 -04:00
Localizer 4b882064f2 updated translation resources 2015-09-30 11:32:44 +00: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
Duncan Sommerville 70e538ebb4 SAAS-1069 - disable add button when track metadata tab is open 2015-09-29 16:39:54 -04:00
Duncan Sommerville c08994a60b Fix bug where user could open mutiple copies of same webstream tab 2015-09-29 16:34:23 -04:00
Duncan Sommerville 80515ef263 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-29 16:26:47 -04:00
Duncan Sommerville d3e9665063 Fix bug where switching to a webstream tab would throw an error 2015-09-29 16:26:39 -04:00
drigato 81bf601a12 SAAS-1099: Dashboard messed up in Safari 2015-09-29 16:03:14 -04:00
Duncan Sommerville 3df1081c60 SAAS-1088 - fix broken 'all my shows' checkbox 2015-09-29 15:51:09 -04:00
Duncan Sommerville 3fcc3c507a Fix tabs bug 2015-09-29 15:09:09 -04:00
Duncan Sommerville 0029844fa7 Fix layout of schedule tracks dialog 2015-09-29 13:54:43 -04:00
Albert Santoni f25457d1eb SAAS-1098: Max filesize restricted by new uploader 2015-09-29 13:29:06 -04:00
drigato b00ac6750c Testing 2015-09-29 13:04:22 -04:00
Albert Santoni eb5fcec485 SAAS-1096: Tabs layout in Schedule Tracks broken in Firefox, sometimes Chrome 2015-09-29 13:02: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 c2cd768398 SAAS-1094 - fix selector for scheduled show selection + context menu 2015-09-29 12:27:45 -04:00
Duncan Sommerville f4fad13eb8 SAAS-1086 - centre cursor when dragging 2015-09-29 12:07:24 -04:00
Duncan Sommerville db1e69c00f Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-29 12:00:07 -04:00
Duncan Sommerville 8cc5e5835c Fix double processing icon when adding/removing tracks from playlists 2015-09-29 12:00:02 -04:00
Albert Santoni a9eb3f737d Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-09-29 11:50:18 -04:00
Albert Santoni 6f185d094b SAAS-1095: Unknown schedule type: array 2015-09-29 11:49:53 -04:00
Duncan Sommerville 99a5f7facb Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
Conflicts:
	airtime_mvc/build/sql/defaultdata.sql
2015-09-29 11:37:53 -04:00
Duncan Sommerville f5afc0957f SAAS-1087 - fix DJ list overflow + styling 2015-09-29 11:36:00 -04:00
Duncan Sommerville 7a44a05cb2 Style tweaks 2015-09-29 11:28:30 -04:00
Duncan Sommerville a75a9676f2 More robust solution for not showing what's new popup to new users 2015-09-29 11:28:20 -04:00
Albert Santoni 41cf4b389a Cleanup for defaultdata.sql 2015-09-29 11:03:19 -04:00
Duncan Sommerville 477708ecc9 Style tweaks 2015-09-29 10:29:21 -04:00
Albert Santoni 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
Albert Santoni 6658fca10b Some polish for the What's New popup 2015-09-28 22:17:34 -04:00
Albert Santoni 943048dd87 Hacky fix for SAAS-1090 - Allow airtime-system to work with session optimizations 2015-09-28 17:48:04 -04:00
Duncan Sommerville 67c20630a3 UI revamp what's new dialog 2015-09-28 17:19:02 -04:00
Duncan Sommerville d09941dffa Set TaskManager run interval back to 30 seconds 2015-09-28 14:15:08 -04:00
Duncan Sommerville c1a16d7973 Add filter string to generic Table object; add call to refetch podcast episode table data 2015-09-28 14:14:01 -04:00
Duncan Sommerville 375d83ab43 Update to podcast frontend 2015-09-28 10:40:04 -04:00
Duncan Sommerville febc5fa99d SAAS-1089 - fix scrolling in metadata editor 2015-09-28 10:17:40 -04:00
Albert Santoni d3f5b046f3 Colour palette improved for the calendar 2015-09-25 17:56:29 -04:00
Albert Santoni e03428327c Fixed missing return statement 2015-09-25 15:54:26 -04:00
Albert Santoni 8b6833180d Refactored double Set-Cookie prevention code, and session reopening code 2015-09-25 12:03:10 -04:00
Albert Santoni 91c584ba16 Test alternate session reopening code to alleviate double Set-Cookie header 2015-09-25 11:37:36 -04:00
Albert Santoni c03e9cbe9a SAAS-1085: Optimization - Don't start sessions unless we actually need them. 2015-09-25 10:41:51 -04:00
Duncan Sommerville 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
Duncan Sommerville a24565669b Fix bug where library would sometimes reference wrong table 2015-09-24 15:55:37 -04:00
Duncan Sommerville ca51dcf3ae SAAS-1071 - more work on backend podcast implementation 2015-09-24 12:58:02 -04:00
Duncan Sommerville dcb30b3aa7 Move file extension check to before database object insertion 2015-09-24 12:57:19 -04:00
Duncan Sommerville 778b67982b Remove duplicate imports and add new table imports to ScheduleController 2015-09-24 12:56:32 -04:00
Duncan Sommerville e5deae89a4 Generalize datatables style fixes 2015-09-24 12:54:24 -04:00
drigato c587dcf4e4 Added extra fields to podcast table 2015-09-24 10:32:16 -04:00
Albert Santoni a86e3ed4a8 Improvements to the preferences screen 2015-09-23 18:21:30 -04:00
drigato 07b63abfe1 Small Podcast API fix 2015-09-23 15:54:42 -04:00
drigato e610ce8af7 Fix for switching to simplepie 2015-09-23 15:35:24 -04:00
drigato 4de42ada6e Disable simplepie caching 2015-09-23 14:50:32 -04:00
drigato 727abac0b8 Switch Podcast reader to use simplepie 2015-09-23 14:47:40 -04:00
Duncan Sommerville c5b00e56bb Fix bug that prevented multiple podcast tabs from being opened 2015-09-23 12:38:08 -04:00
Duncan Sommerville 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
Duncan Sommerville 55d5fc62a2 SAAS-1071 - more work on celery backend 2015-09-22 20:22:06 -04:00
Duncan Sommerville ee1ceb9281 Update TaskManager to be a bit easier to extend 2015-09-22 20:21:19 -04:00
Duncan Sommerville 576a457fdb Small tweaks to tabs, fix merge conflicts in podcast 2015-09-22 20:19:57 -04:00
Albert Santoni 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
Albert Santoni ed33714340 SAAS-1064: Publish action for library context menu 2015-09-22 18:33:27 -04:00
Duncan Sommerville 44a5e5a240 Improve tabs functionality and add comments 2015-09-22 17:34:24 -04:00
Duncan Sommerville 50996a081f Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-09-22 15:27:18 -04:00
Duncan Sommerville 4238d5a201 Refactor tabs functionality 2015-09-22 15:27:08 -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 79db208cd4 Refactor SoundCloud/Third party controllers to fit new service architecture 2015-09-22 14:18:48 -04:00
Albert Santoni 13d1534042 Merge pull request #124 from danielhjames/saas
IN-1956 Update Transifex project link
2015-09-22 11:47:33 -04:00
drigato d86b00c53e SAAS-1077: REST API for podcast episodes
Empty PUT action
2015-09-22 11:19:39 -04:00
drigato 0fc324f3ba SAAS-1077: REST API for podcast episodes 2015-09-22 11:13:18 -04:00
Albert Santoni 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
Albert Santoni 479153df17 Merge branch 'saas' into saas-dev
Conflicts:
	airtime_mvc/public/css/billing.css
2015-09-21 18:01:56 -04:00
Albert Santoni 2a79424a64 Increase the CSRF token timeout 2015-09-21 18:00:04 -04:00
Albert Santoni a21c4612c9 Renamed a podcast.js function for clarity 2015-09-21 17:59:31 -04:00
Duncan Sommerville f9ace20075 Simplify third-party/celery/soundcloud implementation 2015-09-21 17:03:46 -04:00
Albert Santoni b721545c68 Stub publish action for context menu 2015-09-21 16:54:00 -04:00
Albert Santoni 73e489fdc8 Cleanup a comment 2015-09-21 15:41:24 -04:00
Duncan Sommerville 4115f4939e Frontend tweaks 2015-09-21 15:37:57 -04:00
drigato 77a53491b0 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-09-21 14:51:55 -04:00
drigato 3198d822bf SAAS-1058: Podcast table schema
Remove not null constraint on podcast_episodes file_id column
2015-09-21 14:51:32 -04:00
Daniel James ad2e26a1c3 IN-1956 Update Transifex project link 2015-09-21 17:44:00 +01:00
Duncan Sommerville 373ff55923 Frontend tweaks to podcasting + new abstract datatables functionality 2015-09-21 12:40:05 -04:00
drigato 3db20bd3b5 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-09-21 07:08:55 -04:00
drigato 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
Duncan Sommerville 18fb0f3509 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-09-18 18:29:54 -04:00
Duncan Sommerville 0710accbe2 SAAS-1062 - more work on podcasting frontend 2015-09-18 18:29:50 -04:00
Albert Santoni 515d892f6e Fixed small table widget ctrl-selection bug 2015-09-18 16:11:49 -04:00
Duncan Sommerville a6450353e5 Add missing phtml file 2015-09-18 15:52:54 -04:00
Duncan Sommerville 7da1f86659 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-09-18 15:39:19 -04:00
Duncan Sommerville 6de6e2767c SAAS-1062 - Podcast skeleton work; slight rework to backend functionality 2015-09-18 15:39:12 -04:00
Duncan Sommerville 6934bcfdab Update tabs functionality 2015-09-18 15:38:00 -04:00
Duncan Sommerville 6900af8d47 Fix bug where switching from #podcast to other media view would not work as intended 2015-09-18 15:37:41 -04: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 11f3aa7b76 Fix typo 2015-09-18 14:36:54 -04:00
Albert Santoni a810010448 Dropped percentage from educational discount 2015-09-18 14:01:30 -04:00
Albert Santoni 2cad7c1848 Added educational pricing page link 2015-09-18 13:59:55 -04:00
drigato d95b5a9034 SAAS-1063: REST API for podcasts
Update composer.json with rss reader library
2015-09-18 09:52:24 -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 f6f23864ce SAAS-1063: REST API for podcasts
/rest/podcast mostly done
2015-09-18 08:15:48 -04:00
Albert Santoni 8308ce9cac October promo banner 2015-09-17 15:38:00 -04:00
Albert Santoni 3d07260a9d Small VAT checker bugfix 2015-09-17 15:17:18 -04:00
Albert Santoni ea0121f5c1 Cleanup and capitalisation for the Table widget 2015-09-17 15:09:50 -04:00
Albert Santoni 8a7a97f48e Updated the podcast table widget columns 2015-09-17 15:06:51 -04:00
Albert Santoni 0826c64719 Refactor table widget to use prototype inheritance better 2015-09-17 14:52:32 -04:00
drigato d31e0f950d Fix podcast api permission 2015-09-17 13:19:11 -04:00
Albert Santoni 9f03115ee5 Custom button event handlers for new table widget 2015-09-17 13:07:22 -04:00
Albert Santoni 71919ad529 Basic integration of table widget into Dashboard podcasts view 2015-09-16 18:32:16 -04:00
Duncan Sommerville 39b2bd6a86 Actually move library search bar out of header; add angular.js to libs 2015-09-16 17:58:16 -04:00
Duncan Sommerville a78a0d0cc8 * Fix track number bug in analyzer
* Move library search bar out of header
2015-09-16 17:50:21 -04:00
Duncan Sommerville dc840bf25f Fix bad file extension 2015-09-16 15:31:59 -04:00
Duncan Sommerville cce18ec911 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-09-16 15:29:18 -04:00
Duncan Sommerville 9ed3145473 Create oauth controller interface for oauth-specific actions; small refactoring on tabs.js 2015-09-16 15:29:10 -04:00
drigato c1899f18af remove comment 2015-09-16 15:07:38 -04:00
drigato 2ede56c26d Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-09-16 14:22:34 -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
Duncan Sommerville 7006b55818 js tweaks 2015-09-16 11:26:11 -04:00
Duncan Sommerville 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
Albert Santoni e55e99365b SAAS-1068: Crossfade button broken when editing new smart block
* Shouldn't have been enabled in the first place.
2015-09-15 17:27:20 -04:00
Duncan Sommerville 0d80f857d3 Fix broken import 2015-09-15 16:08:19 -04:00
Duncan Sommerville 7b76c8d6d3 Rename CeleryService to avoid confusion; fix wording and reduce redundancy in task functions 2015-09-15 15:06:03 -04:00
Duncan Sommerville a444751397 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-09-15 14:21:27 -04:00
Albert Santoni f6a33802db Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing 2015-09-15 14:21:53 -04:00
Duncan Sommerville ff24976bed Fix up celery downloads a bit 2015-09-15 14:21:19 -04:00
Albert Santoni 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
drigato 73d154ba17 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-09-15 14:07:59 -04:00
Duncan Sommerville 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
drigato 1a26679357 SAAS-1058: Podcast table schema
Add additional podcast table column - type
2015-09-15 14:00:26 -04:00
Duncan Sommerville dd09676f88 Hide celery user 2015-09-15 13:59:48 -04:00
Duncan Sommerville 893d60ed44 Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
This reverts commit 0fcf6a8dac.
2015-09-14 18:29:43 -04:00
Duncan Sommerville 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
Duncan Sommerville 0fcf6a8dac SAAS-1061 - implement podcast list view skeleton; small bugfixes 2015-09-14 18:26:28 -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
Localizer fe5db4761e updated translation resources 2015-09-14 10:01:23 +00:00
Albert Santoni 4851b01540 Force more tracks to be shown in the library view 2015-09-11 12:54:28 -04:00
Duncan Sommerville 2d2ed25fcc CC-6137 - datatables is the devil 2015-09-10 16:47:36 -04:00
Albert Santoni 3586845549 Merge branch 'saas' into saas-dev 2015-09-10 10:37:45 -04:00
Albert Santoni 32f5492e85 Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-09-09 18:59:44 -04:00
Albert Santoni 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
Duncan Sommerville b26d4833fe Merge branch 'saas' into saas-dev 2015-09-09 18:47:53 -04:00
Duncan Sommerville 2296aab8d5 Fix bug where show logo was removed when deleting an instance of a repeating show 2015-09-09 18:47:43 -04:00
Duncan Sommerville 1649d9db77 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-09 17:25:45 -04:00
Duncan Sommerville fb1ee2e284 Fix some issues with the users page 2015-09-09 17:25:40 -04:00
Albert Santoni 1f319f84a4 Two small radio page tweaks
* SAAS-1055: Radio Page About tab scales poorly with small viewport
heights
* Also fixed misaligned of currently playing track with mobile view
2015-09-09 16:03:25 -04:00
drigato 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
drigato 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
Duncan Sommerville 03e23daba0 Apply highlight to active submenu item 2015-09-08 17:42:52 -04:00
Duncan Sommerville e6494e7ff0 Better way to disable and reenable xfade button in playlist/sb editors 2015-09-08 16:56:55 -04:00
Duncan Sommerville 8c3f1cf535 Fix some issues with playlist/smart-block fade buttons 2015-09-08 16:44:33 -04:00
Duncan Sommerville 63784d4e6b Fix some behaviour with playlist/smartblock fade button 2015-09-08 16:39:33 -04:00
Duncan Sommerville d18d52a37a Merge branch 'saas-dev' into soundcloud 2015-09-08 16:15:24 -04:00
Duncan Sommerville 5c7d9fe31c Change links for SoundCloud functionality to use same casing as navigation 2015-09-08 16:15:08 -04:00
Duncan Sommerville f243014d9f Merge branch 'saas-dev' into soundcloud 2015-09-08 16:01:06 -04:00
Duncan Sommerville 17c2ec2fd4 Fix responsiveness bugs 2015-09-08 15:25:28 -04:00
drigato c2d1b788c5 Added missing opening php tag on billing - upgrades page 2015-09-08 11:03:33 -04:00
Localizer b80c18c288 updated translation resources 2015-09-07 10:34:19 +00:00
Localizer 57e3059c16 updated translation resources 2015-09-05 08:34:23 +00:00
Albert Santoni 84a1f9071b Merge branch 'saas-showbuilder-fade-editor-restyling' into saas-dev 2015-09-04 18:36:26 -04:00
Albert Santoni 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
Duncan Sommerville 65ffe43589 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-04 16:11:48 -04:00
Duncan Sommerville 3dc8a5f98d CC-6135 - fix playlist bugs 2015-09-04 16:11:41 -04:00
Duncan Sommerville ba26adc904 CC-6130 - fix empty placeholders appearing when search returns no results 2015-09-04 15:37:04 -04:00
Albert Santoni 1db1af3f2e Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling 2015-09-04 11:21:00 -04:00
Albert Santoni 8499fd989c Regenerate the translation files 2015-09-04 11:17:18 -04:00
Albert Santoni 274881c6e0 Add _pro macros to a bunch of billing page stuff 2015-09-04 11:17:01 -04:00
Localizer d4287e9abd updated translation resources 2015-09-04 14:47:15 +00:00
Localizer d257daa510 updated translation resources 2015-09-04 08:16:31 +00:00
Duncan Sommerville 53b835715a Fix responsiveness of upload page 2015-09-03 15:51:09 -04:00
Duncan Sommerville 83cd51de92 Reword usability hint text to match calendar context menu 2015-09-03 15:42:27 -04:00
Duncan Sommerville 56a8293be6 Fix plupload typo 2015-09-03 15:04:46 -04:00
Duncan Sommerville 363305fa8d Fix blank tracks view when no local session is set 2015-09-03 14:56:57 -04:00
Duncan Sommerville f396bb4390 CSS tweaks 2015-09-03 14:51:58 -04:00
Duncan Sommerville 4e0f3ddd99 SAAS-1046 - remove misplaced ) character; add some translation strings to LocaleController 2015-09-03 13:53:43 -04:00
Duncan Sommerville c928627d8b CC-6131 - add div to show when search is active; css tweaks 2015-09-03 13:41:29 -04:00
Duncan Sommerville 888762739e SAAS-1050 - fix track remove buttons in playlist/smart block editors 2015-09-03 12:09:55 -04:00
Albert Santoni 9071c8d4b6 Update the translations 2015-09-03 10:26:33 -04:00
Duncan Sommerville 4b5980d898 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-02 18:17:19 -04:00
Duncan Sommerville daf854af04 Fix some issues with search, hack to always display options buttons in library view 2015-09-02 18:17:11 -04:00
Albert Santoni 65fd40bd6e CC-6115: Redesign the navbar upload button 2015-09-02 17:39:00 -04:00
Albert Santoni 7a91677d01 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-09-02 16:25:35 -04:00
Albert Santoni 01b3ae1bf0 Allow smart blocks with no criteria 2015-09-02 16:25:30 -04:00
Duncan Sommerville ab11974799 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-02 15:28:44 -04:00
Duncan Sommerville 63ce022a8d SAAS-1040 - station logo functionality improvements 2015-09-02 15:28:36 -04:00
Albert Santoni f05157c376 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-09-02 15:07:31 -04:00
Albert Santoni 6046f8843b CC-6129: Static smart block errors don't appear 2015-09-02 15:07:17 -04:00
Duncan Sommerville 8d0cfdc202 Fix empty-name playlist bug 2015-09-02 13:58:38 -04:00
Duncan Sommerville 80d78e9fc5 SAAS-1043 - fix flexbox settings for editors to work in firefox 2015-09-02 13:08:16 -04:00
Duncan Sommerville c020e3449d SAAS-1044 - fix links in usability hints 2015-09-02 12:55:36 -04:00
Duncan Sommerville 69293703f2 SAAS-1041 - add confirmation window when deleting a user 2015-09-02 12:53:24 -04:00
Duncan Sommerville 0722225211 Front end tweaks and fixes 2015-09-02 12:45:37 -04:00
Duncan Sommerville 9d373791c0 SAAS-1038 - fix bug where 403's weren't being redirected properly 2015-09-02 12:23:23 -04:00
Duncan Sommerville c45f1ddd1c SAAS-1039 - add processing overlay to listener stats screen 2015-09-02 11:52:43 -04:00
Duncan Sommerville 3e29ecad79 CC-6128 - open placeholder 'Learn more' links in new tab 2015-09-02 11:41:51 -04:00
Duncan Sommerville 1fd7f0ea36 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-02 11:22:32 -04:00
Duncan Sommerville 63f563f06d Fix calendar context menu word wrapping 2015-09-02 11:22:24 -04:00
Albert Santoni a17001a90a Merge branch 'saas' into saas-dev
Conflicts:
	airtime_mvc/application/views/scripts/billing/upgrade.phtml
	airtime_mvc/public/css/billing.css
2015-09-02 10:47:37 -04:00
Albert Santoni 6251fd62d5 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-09-02 10:42:23 -04:00
Albert Santoni 6959c459cd Scheduler transaction improvement and preferences transaction removal
* Added a transaction to createAndFillShowInstancesPastPopulatedUntilDate
  to ensure two requests don't trigger duplicate repeated show instances
  in the calendar.
* Removed the transaction from setValue() in Preference and opt for
  a row-level lock instead.
2015-09-02 10:40:38 -04:00
Duncan Sommerville 37df86723d CC-6127 - Add 'Use station default' option to user settings timezone, don't set user timezone by default when creating the admin user 2015-09-01 16:10:33 -04:00
Duncan Sommerville a99bc26715 Set autofocus on login username field 2015-09-01 16:07:16 -04:00
Duncan Sommerville 92f722452a Adjust user settings form widths to be consistent 2015-09-01 16:05:59 -04:00
Duncan Sommerville f283d69481 Add vertical scrollbar to recent uploads table 2015-09-01 14:27:54 -04:00
Duncan Sommerville 46e126145e CC-6122 - change library behaviour for guest users 2015-09-01 13:53:59 -04:00
drigato 34e7c09ab7 CC-6118: Playlist crossfade panel needs restyling
Started re-styling the playlist fade editor
2015-09-01 12:05:08 -04:00
Albert Santoni c7d926f8e8 Merge branch 'saas-dev' into saas-showbuilder 2015-08-31 17:11:07 -04:00
Albert Santoni bfa01e45aa Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-08-31 17:10:51 -04:00
Duncan Sommerville f7a7d4c042 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-31 15:25:27 -04:00
Duncan Sommerville f21e53b12e CC-6121 - Fix up user settings page 2015-08-31 15:25:17 -04:00
Albert Santoni b0e9b41b0c Nudge the Airtime logo over a bit to center it better 2015-08-31 15:07:13 -04:00
Albert Santoni e0cb33b89c Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-31 15:03:25 -04:00
Duncan Sommerville 109a336504 CC-6124 - Fix Add to Current Playlist button 2015-08-31 14:36:44 -04:00
Duncan Sommerville 7c9f0a09ae Fix button styling bugs 2015-08-31 14:21:35 -04:00
Duncan Sommerville f64d7096d1 Fix button styling bugs 2015-08-31 14:21:09 -04:00
Duncan Sommerville cd7d07e5f5 CC-6119 - Fix New button styling 2015-08-31 14:01:31 -04:00
Duncan Sommerville c1e2daaac4 CC-6114 - Remove New button from nav bar 2015-08-31 13:48:22 -04:00
drigato fa340c3e30 SAAS-976: September 1st: Undo the billing page changes for the August promotion 2015-08-31 13:37:20 -04:00
Duncan Sommerville d2f46882c1 CC-6113 - Remove select dropdown from library pane 2015-08-31 13:35:46 -04:00
Duncan Sommerville c6a6a97c55 CC-6117 - Change submit button text for file metadata editor so behaviour is consistent with button text 2015-08-31 13:33:23 -04:00
Duncan Sommerville e06f88cd49 CC-6116 - Library new buttons keep colour when disabled 2015-08-31 13:30:00 -04:00
Duncan Sommerville e633bc8899 CC-6112 - Remove button labels at small screen resolutions 2015-08-31 13:25:29 -04:00
Duncan Sommerville 5e024023eb CC-6110 - Change header to be more responsive 2015-08-31 13:10:16 -04:00
Localizer 34a7019c5b updated translation resources 2015-08-31 17:07:52 +00:00
Duncan Sommerville d7d27d3c36 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-31 12:35:27 -04:00
Duncan Sommerville 2611766498 CC-6109 - Fix display of long usernames in header panel 2015-08-31 12:35:20 -04:00
drigato 2748f223de CC-6092: Calendar add show form style issues 2015-08-31 12:32:07 -04:00
drigato e349c3013c CC-6107: Webstreams datatable should refresh when new webstream is created 2015-08-31 10:03:26 -04:00
drigato 582bc292aa CC-6108: Manage User table layout is messed up 2015-08-31 09:26:22 -04:00
Albert Santoni 765211da39 Merge branch 'saas-showbuilder' into saas-showbuilder-colors 2015-08-28 21:11:26 -04:00
Albert Santoni f8d1ee09b2 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-28 20:09:11 -04:00
Albert Santoni 21eb3c502e Fixed New Show button sliding when you clicked on the calendar 2015-08-28 20:08:52 -04:00
Albert Santoni e1d5126e8b Pick default colors for the calendar based on start time 2015-08-28 18:16:55 -04:00
drigato b312189a7b CC-6105: DJs can edit playlists, smartblocks, and webstreams they do not own 2015-08-28 17:46:03 -04:00
Albert Santoni 13f62cc118 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-28 16:21:53 -04:00
Albert Santoni 311956eb74 CC-6069: Pick consistent design for New buttons
* First shot at blue New buttons
2015-08-28 16:21:20 -04:00
Duncan Sommerville 8a3f36dea3 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-28 16:09:26 -04:00
Duncan Sommerville 005eec5aa5 CC-6095 - better styling for learn about x links 2015-08-28 16:09:18 -04:00
Albert Santoni 71f149f95f Unbreak the playlist form during reordering 2015-08-28 15:57:57 -04:00
Duncan Sommerville 901ca54fd6 CC-6095 - placeholder div for empty library views; placeholder icons 2015-08-28 15:40:32 -04:00
Albert Santoni 6446c9e314 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-28 14:28:18 -04:00
Albert Santoni e743c3589e More smart block and playlist editor improvements
* Fixed smart block/playlist form validation error messages not showing up.
* Improved styling of all save/error messages across the application.
* Removed broken fade editors
2015-08-28 14:27:18 -04:00
drigato 6811646aaa CC-6106: Permission problems with bulk and single edit in the Dashboard 2015-08-28 13:40:38 -04:00
Albert Santoni f36ff944c2 SAAS-1031: Can't add tracks to a new playlist 2015-08-28 13:22:08 -04:00
Albert Santoni 91cad81c4b Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-28 13:07:08 -04:00
Albert Santoni b2edaa8668 Merge branch 'saas' into saas-showbuilder 2015-08-28 13:07:00 -04:00
Albert Santoni 17074e5f70 SAAS-1032: Shows with missing show art on disk can't be edited 2015-08-28 12:28:34 -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 eb2f7263c8 CC-6078: Help page updates 2015-08-28 11:45:00 -04:00
drigato e3b09e9aa9 Make widgets page accessible to all user types 2015-08-28 11:32:19 -04:00
drigato 4307e326f1 CC-6104: Playout History layouts need help 2015-08-28 11:31:08 -04:00
Duncan Sommerville 88a9594aca CC-6090 - restyle editor processing divs 2015-08-28 10:50:10 -04:00
Duncan Sommerville bc4822d8e4 bugfix 2015-08-28 10:36:18 -04:00
Duncan Sommerville ec9b98c48c CC-6090 - restyle datatables processing divs 2015-08-28 10:34:49 -04:00
Duncan Sommerville 4cf40d312a SAAS-1030 - fix bug where editing multiple tracks saves wrong metadata 2015-08-28 09:44:45 -04:00
Albert Santoni 8c90fbe4eb Added metadata editor title and ellipsis 2015-08-27 20:23:53 -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
Albert Santoni 099fc0107e Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-27 19:04:18 -04:00
Albert Santoni b6f33f6083 Completed smart block, playlist, and webstream editor form overhauls
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
* CC-6103: Cannot create webstreams
* Reworked a big chunk of the smart block editor flow to send only the
  playlist contents back rather than the entire HTML fragment for the
  editor.
* Keep more of the playlist/smartblock editor view persistent across
  saves, generates, and shuffles.
2015-08-27 19:00:23 -04:00
Duncan Sommerville 294298c9bf CC-6096, CC-6093 - update calendar context menu and usability hint wording; bugfixes 2015-08-27 16:59:21 -04:00
Duncan Sommerville acc4ef0054 CC-6085, CC-6101 - uploader styling 2015-08-27 15:44:59 -04:00
Duncan Sommerville 0ebe7a85e1 CC-6066 - Add/Remove content screen update 2015-08-26 17:56:17 -04:00
Duncan Sommerville ef892bb565 Fix some small bugs with Dashboard navigation links 2015-08-26 17:02:01 -04:00
Duncan Sommerville 7d8c6dc90d Fix upload page styling 2015-08-26 16:11:49 -04:00
drigato c728be38ab CC-6078: Help page updates
Small text changes
Removed about page
2015-08-26 14:37:32 -04:00
Albert Santoni 98ac8fd851 Major layout work on the smartblock and playlist editors
* CC-6088: Smart Block form needs to have a form layout
* CC-6089: Editor view name fields must be made <input> fields
2015-08-26 13:10:51 -04:00
drigato 706caa8458 SAAS-1025: Restyle the billing page
Fix header padding
Change current plan font
2015-08-26 11:27:00 -04:00
drigato 7e1fe030fe SAAS-1025: Restyle the billing page
Changed pricing grid header
Added paypal and 2checkout badges
2015-08-26 10:26:03 -04:00
drigato 9951abd897 SAAS-1025: Restyle the billing page
Make Account Plans the default view
2015-08-26 09:16:06 -04:00
drigato 6ecb208962 SAAS-1021: Billing page restyle 2015-08-26 09:11:25 -04:00
Duncan Sommerville afa3b47e42 Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder 2015-08-25 17:09:17 -04:00
Duncan Sommerville 84baef1996 CC-6097, CC-6091, CC-6080, CC-6066 - css fixes and more work on add/remove content screen 2015-08-25 17:09:05 -04:00