e55b95cc3b
Merge pull request #7 from radiorabe/feature/turn-off-live-chat-per-default
...
config to disable live chat
2017-03-04 15:48:00 +01:00
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
4875bc37a8
Add missing argument to playlistNotFound call
...
Was on 2.5.x as 7dbf4cf5d2d37057e1f5ab72cb12ffcc5ddc1ccb
2017-03-03 15:34:21 +01:00
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
2017-03-03 15:33:19 +01:00
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
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
e3b0a93ebb
Only suspend over bandwidth when station is active
2015-12-09 13:03:41 -05:00
17a03e088f
SAAS-1244 - improve pending podcast episode sweeping; small bugfixes
2015-11-26 15:25:38 -05:00
34eb7d6e22
Merge branch 'saas-dev' into saas-dev-bandwidth-limits
2015-11-26 11:30:03 -05:00
a67ae0a5e4
Fix for Airtime bandwidth limit suspension code
2015-11-25 18:18:24 -05:00
0fc4f6c26f
Fix Airtime bandwidth limit suspension code
2015-11-25 17:56:09 -05:00
82544f34d9
SAAS-1229, SAAS-1230 - initial implementation of station suspend when over bandwidth limit
2015-11-24 13:36:54 -05:00
a2a30e5c42
Merge branch 'saas-dev' into saas-dev-facebook-radio
2015-11-24 11:22:18 -05:00
04167c103b
Fix parameter name in api/bandwidth-usage
2015-11-23 11:37:08 -05:00
bac1e553d9
SAAS-1229 - add comments in Preference and set update timer
2015-11-23 10:53:25 -05:00
6c2d1f008b
SAAS-1229 - initial work on bandwidth limit within Airtime; overhaul TaskFactory to get tasks reflectively
2015-11-19 16:08:25 -05:00
25c54ce974
Merge branch 'saas-dev' into saas-dev-facebook-radio
2015-11-19 15:09:29 -05:00
c328515f4b
SAAS-1135 - fix help button url for logged out users
2015-11-19 11:08:35 -05:00
ba832ffe3a
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
2015-11-18 12:38:22 -05:00
965a78c54a
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2015-11-18 12:38:18 -05:00
dc6c2893b4
Hide Soundcloud options from preferences for hobbyist plans
2015-11-18 12:31:31 -05:00
eae8c7b638
Temporary fix to make enclosure urls iTunes compatible
2015-11-17 21:06:51 -05:00
0d585e30db
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-17 18:59:03 -05:00
1571887928
Change how station logo default is returned
2015-11-17 18:58:58 -05:00
1ef9ee3073
Disable session starting for feeds controller
2015-11-17 18:55:53 -05:00
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
c5d9dfd93d
Restrict podcast hosting for some plans. Fixed error page colours.
2015-11-17 17:34:13 -05:00
5828361465
Display message on radio page if no podcast tracks have been published yet.
2015-11-16 15:28:54 -05:00
38d08a5661
SAAS-1208, SAAS-1209 - fix preferences and my podcast settings pages
2015-11-16 14:23:08 -05:00
90ac6367e4
Improve podcast title on radio page
2015-11-16 12:35:50 -05:00
8e867b522c
SAAS-1202 - move station podcast to top-level menu item
2015-11-13 14:57:32 -05:00
5b59fecae9
Fix radio page description button
2015-11-13 08:26:44 -05:00
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
8a5c25291e
Lower poll interval for checking import status of podcast episodes
2015-11-11 18:52:12 -05:00
5b325acb34
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-11 16:48:35 -05:00
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
faeaf5450b
SAAS-1203: Sort published tracks on radio page by publication date DESC
2015-11-11 15:35:07 -05:00
c5a5839eff
Better errors from podcast 'Add' dialog
2015-11-10 19:26:25 -05:00
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
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
48f09c44ca
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-09 13:57:17 -05:00
372e28f82e
SAAS-1158: Station podcast on Radio Page design implementation
...
Fix some pagination functionality
2015-11-09 13:44:45 -05:00
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
ef5fd271e0
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-09 10:21:38 -05:00
4c3e05d5f0
SAAS-1158: Station podcast on Radio Page design implementation
2015-11-09 08:42:46 -05:00
0e6e82a0c6
Fixed session start issue with new API
2015-11-06 13:04:33 -05:00
e8a0ace018
Fixed up syntax error introduced by last commit
2015-11-06 12:57:35 -05:00
713a158bb3
Disable layout in recalculate-schedule API - XXXX-260
2015-11-06 12:50:47 -05:00
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
7072762dd9
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-06 09:44:29 -05:00
093de68edb
Add station rss subscribe link to radio page
2015-11-05 20:46:33 -05:00
0be26d621b
SAAS-1165 - implement most functionality for left-hand podcast episodes view
2015-11-05 18:15:58 -05:00
685134d8bb
Better trial suspension notice
2015-11-05 12:45:09 -05:00
90ac2cc681
Fix bug where public station podcast feed would not display when logged out
2015-11-04 15:57:51 -05:00
8d19e11343
SAAS-1173: Station RSS link does not work
...
Set charset to UTF-8
2015-11-04 15:08:47 -05:00
8a03892ff8
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-04 12:45:50 -05:00
b95ccd46e7
SAAS-1156: Podcast episode playback and download from Radio Page
...
Switched from using muses to jplayer for playback
2015-11-04 12:45:30 -05:00
b4ec3eeb3f
Add sharing token/download key to station podcast URL when set to private; tab middle click fix
2015-11-04 10:52:23 -05:00
22f8b0f328
* SAAS-1153 - more work on station podcast frontend. Add delete and edit button functionality for episode table
...
* Various fixes and backend updates
* Move station podcast creation to id getter in Preferences
2015-11-03 16:23:17 -05:00
c0d8b8b39c
* SAAS-1168, SAAS-1153 - work on station podcast frontend
...
* SAAS-1164 - Styling fixes for publishing and podcast editors
2015-11-03 13:18:55 -05:00
335c2fea11
Fix for radio page when station podcast does not exist yet
2015-11-03 11:40:22 -05:00
51ec5a0df5
SAAS-1073: Schema upgrade for podcasts
...
Delete station podcast id from cc_pref in downgrade sql
2015-11-03 11:29:50 -05:00
d20574dfb1
SAAS-1073: Schema upgrade for podcasts
...
Upgrade and downgrade done.
2015-11-03 10:57:55 -05:00
4f281a30ed
Add SoundCloud update and download tasks to Celery backend; requires airtime-celery reinstall
2015-10-30 16:10:16 -04:00
702ee97c7b
Refactored Facebook Widget stuff
2015-10-30 14:38:34 -04:00
d08e19a93a
More small TaskManager and auto-ingest fixes
2015-10-29 18:26:20 -04:00
e3feb17f0c
* Change the Celery timeout to 15 minutes (from 10) to better accommodate automatic ingest
...
* Fix various small bugs in auto ingestion and tab implementation
* Update TaskManager run conditions to piggyback on API calls - guarantees a certain frequency of requests and greatly reduces chances of lock contention
2015-10-29 17:53:45 -04:00
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
4b11979eff
Remove station podcast from podcast datatable; editor now opens from button in podcasts view
2015-10-29 12:17:52 -04:00
95aae317c6
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
airtime_mvc/public/css/dashboard.css
airtime_mvc/public/js/airtime/library/spl.js
2015-10-29 11:21:24 -04:00
b5f31065a7
Fix merge error
2015-10-29 10:18:53 -04:00
59ad4fd7f5
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-10-29 10:12:31 -04:00
a6eb4dc3e8
Fix for in-app lock contention - move task initialization into PageLayoutInitPlugin to run after session is loaded
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2015-10-29 10:12:26 -04:00
14b35dcf18
Fix for in-app lock contention - move task initialization into PageLayoutInitPlugin to run after session is loaded
2015-10-29 09:37:39 -04:00
cc9f1ea6d0
* Wrap station podcast feed contents on radio page in displayRssTab check
...
* Test fix for automatic ingest bug
* Move disable layout code in feeds controller to avoid error case
2015-10-28 10:58:22 -04:00
09efacf4d5
SAAS-1156: Podcast episode playback and download from Radio Page
...
Playback works in HTML mode for mp3 files only right now.
Added a function that changes the player iframe's src attribute
so it plays individual tracks.
2015-10-27 16:00:15 -04:00
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
6580c12ad3
Add station podcast privacy toggle
2015-10-21 17:30:24 -04:00
16a0172542
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-21 16:26:04 -04:00
a4b42344dd
CC-6140: Switch to Windows linebreaks for stream M3U
2015-10-21 16:25:59 -04:00
eba99728ae
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-10-21 16:14:54 -04:00
cb8c34c3d5
SAAS-1126: Make player widget localizable
2015-10-21 16:14:36 -04:00
3b81ea02c8
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-21 16:14:11 -04:00
4d1d96c8f7
CC-6140: M3U streaming link
2015-10-21 16:14:06 -04:00
92ffa955c3
SAAS-1081 - implement station podcast download counter that resets monthly
2015-10-21 12:54:50 -04:00
b98f573531
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-10-21 11:01:20 -04:00
1cfa708717
SAAS-1125: Cue in and out points should be editable in the track metadata editor
...
Also made improvement by showing errors when the form has invalid data
2015-10-21 10:58:22 -04:00
0b1df6baf3
* SAAS-1084 - initial work on publishing API backend
...
* More work on automatic ingest
* Add automatic_ingest_timestamp column to ImportedPodcast
2015-10-20 19:03:34 -04:00
f79ca8650f
Unpaid invoice usability hint and invoice page style fix - SAAS-1134
2015-10-20 15:44:24 -04:00
3a791ef9b5
Remove unnecessary field
2015-10-19 17:00:03 -04:00
12f6536e74
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2015-10-19 16:18:19 -04:00
d98459a55d
Fix head title on Radio Page
2015-10-14 15:20:49 -04:00
eea5fff1fa
Fixed jQuery being broken on Radio Page
2015-10-14 15:15:25 -04:00
2713bd7beb
Merge branch 'saas-dev' into saas-3.x-sessionoptimizations
2015-10-14 14:50:54 -04:00
591b3d1539
Fix SAAS-1128 more robustly to fix timezone/lang popup for sign up too
2015-10-14 14:40:23 -04:00
a90b97fb55
SAAS-1128: Logging in from www.airtime.pro doesn't trigger lang/timezone setup dialog
2015-10-14 14:28:39 -04:00
c166b4f00e
Merge branch 'saas-dev-publishing' into saas-dev-publishing-schema-change
...
Conflicts:
airtime_mvc/application/models/airtime/Podcast.php
2015-10-14 11:04:41 -04:00
c3c4abdd0c
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/css/dashboard.css
airtime_mvc/public/css/styles.css
airtime_mvc/public/js/airtime/library/library.js
airtime_mvc/public/js/airtime/library/spl.js
2015-09-30 16:26:02 -04:00
efa3999041
SAAS-1016 - fix some stream settings not being saved correctly
2015-09-30 10:30:32 -04:00
8b33acacd3
Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/constants.php
airtime_mvc/application/controllers/LoginController.php
airtime_mvc/application/controllers/UserController.php
airtime_mvc/public/js/airtime/preferences/preferences.js
2015-09-29 18:58:55 -04:00
c08994a60b
Fix bug where user could open mutiple copies of same webstream tab
2015-09-29 16:34:23 -04:00
b00ac6750c
Testing
2015-09-29 13:04:22 -04:00
f1c5a8b244
Fix the timezone/language picker and fix the What's New dialog popping up for new users
2015-09-29 09:19:33 -04:00
67c20630a3
UI revamp what's new dialog
2015-09-28 17:19:02 -04:00
e03428327c
Fixed missing return statement
2015-09-25 15:54:26 -04:00
8b6833180d
Refactored double Set-Cookie prevention code, and session reopening code
2015-09-25 12:03:10 -04:00
91c584ba16
Test alternate session reopening code to alleviate double Set-Cookie header
2015-09-25 11:37:36 -04:00
c03e9cbe9a
SAAS-1085: Optimization - Don't start sessions unless we actually need them.
2015-09-25 10:41:51 -04:00
43e9fb59ce
SAAS-1071 - more work on celery backend for podcasts; add upgrade to make file_id field in third_party_track_references nullable
2015-09-24 15:57:38 -04:00
778b67982b
Remove duplicate imports and add new table imports to ScheduleController
2015-09-24 12:56:32 -04:00
a86e3ed4a8
Improvements to the preferences screen
2015-09-23 18:21:30 -04:00
3790b0fa81
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/js/airtime/library/podcast.js
2015-09-22 18:37:41 -04:00
ed33714340
SAAS-1064: Publish action for library context menu
2015-09-22 18:33:27 -04:00
44a5e5a240
Improve tabs functionality and add comments
2015-09-22 17:34:24 -04:00
4238d5a201
Refactor tabs functionality
2015-09-22 15:27:08 -04:00
79db208cd4
Refactor SoundCloud/Third party controllers to fit new service architecture
2015-09-22 14:18:48 -04:00
f9ace20075
Simplify third-party/celery/soundcloud implementation
2015-09-21 17:03:46 -04:00
b721545c68
Stub publish action for context menu
2015-09-21 16:54:00 -04:00
0710accbe2
SAAS-1062 - more work on podcasting frontend
2015-09-18 18:29:50 -04:00
6de6e2767c
SAAS-1062 - Podcast skeleton work; slight rework to backend functionality
2015-09-18 15:39:12 -04:00
be39b6b7c0
* Initial podcast skeleton functionality
...
* Rename SoundCloud/Celery classes to fit conventions
* Small fixes to Table class functionality
2015-09-18 15:34:55 -04:00
71919ad529
Basic integration of table widget into Dashboard podcasts view
2015-09-16 18:32:16 -04:00
9ed3145473
Create oauth controller interface for oauth-specific actions; small refactoring on tabs.js
2015-09-16 15:29:10 -04:00
8dcea06077
* Move tab functionality to a separate module
...
* Fix broken library placeholders
* Restrict tab width and add text panning to tab name
* General bugfixing and cleanup of tab functionality
2015-09-15 18:53:25 -04:00
f6a33802db
Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing
2015-09-15 14:21:53 -04:00
ffdc83dc26
Reusable datatable control that hooks up to any of our REST APIs
...
* Implements item selection (single, shift, ctrl), pagination, and
sorting. To be used in the future.
* Added example code for how to use the table widget
* Temporarily added a table test page to the DashboardController
2015-09-15 14:18:35 -04:00
c8baa6e4b3
Merge branch 'saas-dev-publishing' into soundcloud
...
Conflicts:
airtime_mvc/application/views/scripts/playlist/playlist.phtml
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
airtime_mvc/public/js/airtime/library/spl.js
2015-09-15 14:03:11 -04:00
3586845549
Merge branch 'saas' into saas-dev
2015-09-10 10:37:45 -04:00
c77749a096
SAAS: Show logo is deleted on disk when a show instance is deleted
...
* Default to returning the station logo in response if we can't find the
show logo on disk (but it's in our DB).
2015-09-09 18:59:00 -04:00
d18d52a37a
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:15:24 -04:00
5c7d9fe31c
Change links for SoundCloud functionality to use same casing as navigation
2015-09-08 16:15:08 -04:00
f243014d9f
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:01:06 -04:00
de322171df
CC-6118: Playlist crossfade panel needs restyling
...
* Fixed it as much as possible. Unfortunately, the milliseconds are dropped
by Propel so we should probably restrict the fade time to whole
seconds....
2015-09-04 18:35:11 -04:00
53b835715a
Fix responsiveness of upload page
2015-09-03 15:51:09 -04:00
4e0f3ddd99
SAAS-1046 - remove misplaced ) character; add some translation strings to LocaleController
2015-09-03 13:53:43 -04:00
f05157c376
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-09-02 15:07:31 -04:00
6046f8843b
CC-6129: Static smart block errors don't appear
2015-09-02 15:07:17 -04:00
8d0cfdc202
Fix empty-name playlist bug
2015-09-02 13:58:38 -04:00
9d373791c0
SAAS-1038 - fix bug where 403's weren't being redirected properly
2015-09-02 12:23:23 -04:00
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
46e126145e
CC-6122 - change library behaviour for guest users
2015-09-01 13:53:59 -04:00
fa340c3e30
SAAS-976: September 1st: Undo the billing page changes for the August promotion
2015-08-31 13:37:20 -04:00
b312189a7b
CC-6105: DJs can edit playlists, smartblocks, and webstreams they do not own
2015-08-28 17:46:03 -04:00
901ca54fd6
CC-6095 - placeholder div for empty library views; placeholder icons
2015-08-28 15:40:32 -04:00
6811646aaa
CC-6106: Permission problems with bulk and single edit in the Dashboard
2015-08-28 13:40:38 -04:00
8c90fbe4eb
Added metadata editor title and ellipsis
2015-08-27 20:23:53 -04:00
099fc0107e
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-27 19:04:18 -04:00
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
294298c9bf
CC-6096, CC-6093 - update calendar context menu and usability hint wording; bugfixes
2015-08-27 16:59:21 -04:00
afa3b47e42
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-25 17:09:17 -04:00
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
700c3c4005
Merge branch 'saas-dev' into saas-showbuilder
2015-08-25 13:27:40 -04:00
e6761b54da
CC-6066 - more work on add/remove content screen
2015-08-24 12:05:57 -04:00
48f1c5b9a4
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
...
Conflicts:
airtime_mvc/application/layouts/scripts/page-sub-menu.phtml
2015-08-21 11:09:07 -04:00
277a066534
Layout and styling fixes for sub-menu layout pages
2015-08-21 10:43:20 -04:00
38d9963a8d
SAAS-1024: Merge layout.phtml and page-sub-menu.phtml
2015-08-21 09:25:01 -04:00
f82558a5c0
Navigation sidebar finalization
2015-08-19 14:59:33 -04:00
0ad51dae09
Fix add/remove content dialog, try to increase speed of selection/deselection
2015-08-18 17:46:16 -04:00
13a60c39b9
Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder
2015-08-18 15:30:31 -04:00
3f25ab2647
CC-6079 - merge and remove underscore files
2015-08-18 15:23:42 -04:00
ac974e56a9
Fixed ColReorder includes in ScheduleController.php
2015-08-18 15:08:03 -04:00
a271b53c2e
CC-6077: Implement actions menu for library view
2015-08-18 14:55:32 -04:00
4bfb8fa0cb
CC-6067 - deselect when adding library items
2015-08-18 12:01:23 -04:00
38022f4ff0
SAAS-1019: Re-work Navigation Menu
...
Added user settings to the Settings sub-menu
2015-08-17 16:22:55 -04:00
e5f5ff4c88
SAAS-1019: Re-work Navigation Menu
...
Created Widget sub menu and moved widgets into separate controller
actions
2015-08-17 16:15:26 -04:00
3aee9a49bc
SAAS-1019: Re-work Navigation Menu
2015-08-17 12:46:32 -04:00
8aa39ae28d
Moved datatables translation stuff to PHP for consistency
2015-08-14 20:00:05 -04:00
e90fe728a2
SAAS-1017: Move top nav bar to side
2015-08-14 08:30:52 -04:00
9d30a26968
Text for show schedule toolbar buttons, Embedded Widgets page styling
2015-08-12 17:36:54 -04:00
1957c7827f
SAAS-948, SAAS-983 - Showbuilder editor redesign, look and feel fixes
2015-08-12 14:35:27 -04:00
2a1d09bc08
Factor out default show background colour and fix some style issues
2015-08-12 12:55:39 -04:00
c9f9bed2d6
SAAS-948 - fix smartblock save and tab close functionality, implement 'super' checkbox
2015-08-10 18:46:12 -04:00
849b8038ce
Mostly new graphics for the calendar page
2015-08-10 17:11:40 -04:00
a28df91c56
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-10 14:17:24 -04:00
2af5eb3314
Add Media page visual refresh, and use dropzone
2015-08-10 14:17:16 -04:00
c2d1556cfd
Showbuilder css changes
2015-08-10 12:37:21 -04:00
974f979bef
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-10 12:23:30 -04:00
fc7a700654
Consolidated some CSS
2015-08-10 12:23:22 -04:00
75914b791c
Merge branch 'saas-dev' into saas
...
Conflicts:
airtime_mvc/application/common/FileDataHelper.php
2015-08-10 09:00:54 -04:00
bf6244c835
SAAS-948
2015-08-07 19:20:29 -04:00
cdc9f88c1c
Big style update for the new show builder screen
...
* Restyled the tables
* Blue currently playing track
* Labels for library view buttons
2015-08-07 19:08:17 -04:00
133db1c6a6
Merge branch 'saas-dev' into saas-showbuilder
2015-08-07 16:50:28 -04:00
e6609896a5
SAAS-948 - showbuilder styling
2015-08-07 16:49:05 -04:00
a82b75743f
Fix error messages being swapped on the password reset page
2015-08-07 14:41:10 -04:00
ea2a6b3f68
Clean up and bugfixes for password reset (SAAS-1009)
2015-08-07 13:57:42 -04:00
02d96d7bd0
SAAS-991 - initial playlist editor redesign
2015-08-06 19:16:04 -04:00
cc36fcd37b
Showbuilder checkboxes and style fixes
2015-08-06 16:01:44 -04:00
36f2e1844f
Merge branch 'saas-dev' into saas-showbuilder
2015-08-05 15:32:04 -04:00
1093e7085a
Re-enable hiding the first run popup after first run
2015-08-05 15:00:28 -04:00
1d39117b21
Merge remote-tracking branch 'origin/saas-email' into saas-dev
2015-08-05 14:50:58 -04:00
e49d337db0
Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev
2015-08-05 14:50:31 -04:00
eef61a65fc
Cleanup and comments for the timezone/language popup
2015-08-05 14:49:43 -04:00
4200f56265
SAAS-999 - Change Advanced Search Options to dropdown
2015-08-04 15:38:48 -04:00
f138dc6b47
SAAS-948 - tab layout for right-hand pane
2015-07-31 18:28:16 -04:00
8a52178765
Fix for billing downgrade with no new invoice created
2015-07-31 13:42:47 -04:00
5530142174
Un-doing last 2 committs about invoices
2015-07-31 12:01:26 -04:00
aab4b634bf
Show form on billing page if no invoice was generated after downgrade
2015-07-31 11:56:00 -04:00
278ca264eb
Fix for bringing customer to view invoice that doesn't exist after downgrade
2015-07-31 11:48:20 -04:00
b2fbb27801
SAAS-973: Airtime Billing page - Add support for August promotion plans
...
Made WHMCS Airtime group id a constant
Check for CSRF token on promo eligibilty ajax check
2015-07-30 13:27:32 -04:00
d9e2ba0ed3
SAAS-973: Airtime Billing page - Add support for August promotion plans
...
Un-hardcode product ids
2015-07-30 09:39:50 -04:00
Lucas Bickel
Lucas Bickel
Albert Santoni
Duncan Sommerville
drigato
Duncan Sommerville