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