Lucas Bickel
2a53241ba3
Whitespace and deadcode nitpick
2017-03-10 16:27:46 +01:00
Robb Ebright
32a1a66378
Added AutoPlaylist Functionality to Show Scheduler enabling shows to have tracks added automatically.
2017-03-10 15:33:32 +01:00
Lucas Bickel
baa0f9ba77
Make CORS great again
...
This fixes CORS to work properly with most 2.5 api endpoints while keeping the JSONP format available.
* [x] return JSONP or JSON with proper CORS headers from API
* [x] Field in Genereal Preferences Form to configure CORS enabled URLs
See #17 for what triggered this refactor. I beleive this should make integrating the APIs on the client side trivial without mandating the use of JSONP.
2017-03-10 15:10:56 +01:00
Lucas Bickel
70e6135e93
Restore full disk usage not based on quota
...
This is mostly a restore of how this used to be implemented.
2017-03-08 15:56:43 +01:00
Lucas Bickel
7315af0304
restore /systemstatus page
...
All it needed was a new controller, and some small ui tweaks + re-adding to the menu. I put it in Settings » Status where I believe it belongs.
2017-03-08 14:46:33 +01:00
Lucas Bickel
f8bf67792c
Re-enable record line in feature
...
I did a quick check and added a show, ecasound is also still being installed, I see no further reason why this should not work but we will need to get some real tests done to be sure.
Fixes #42
2017-03-06 17:51:19 +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
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
Albert Santoni
c5429df59c
Holiday promo update for billing page
2015-12-08 15:44:41 -05:00
Albert Santoni
3254be6f91
Added holiday offer blurb
2015-11-30 18:31:20 -05:00
Albert Santoni
819a882c31
Temporarily hide bandwidth usage and move it down in the page
2015-11-26 17:30:28 -05:00
drigato
21846be7ed
SAAS-1243: Bandwidth usage status on Listener Stats page
2015-11-26 13:25:44 -05:00
drigato
a2a30e5c42
Merge branch 'saas-dev' into saas-dev-facebook-radio
2015-11-24 11:22:18 -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
641cfb9432
SAAS-1234 - bind station feed url to angular data model
2015-11-19 17:09:49 -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
Duncan Sommerville
eae8c7b638
Temporary fix to make enclosure urls iTunes compatible
2015-11-17 21:06:51 -05:00
Duncan Sommerville
1571887928
Change how station logo default is returned
2015-11-17 18:58:58 -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
f2fae3c67e
SAAS-1195 - fix calendar error; use baseurl in all internal links; css tweaks
2015-11-17 16:39:29 -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
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
drigato
5828361465
Display message on radio page if no podcast tracks have been published yet.
2015-11-16 15:28:54 -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
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
03e90cdd3f
Fix podcast pagination highlighting on radio page
2015-11-16 11:44:06 -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
8e867b522c
SAAS-1202 - move station podcast to top-level menu item
2015-11-13 14:57:32 -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
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
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
Albert Santoni
ae85c278ea
Remove a WIP label temporarily
2015-11-12 10:09:09 -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
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
59cf6f6238
Radio page jPlayer fixes
2015-11-11 14:55:47 -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
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
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
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
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
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
866b88dbb2
Style tweaks to publishing and podcast dialogs
2015-11-04 15:16:29 -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
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
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
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
Albert Santoni
702ee97c7b
Refactored Facebook Widget stuff
2015-10-30 14:38:34 -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
40a2aa10d8
SAAS-1083 - Implement unpublishing
2015-10-29 13:09:50 -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
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
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
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
Duncan Sommerville
e8980e7a79
Bugfixes and more work on station podcast frontend
2015-10-22 18:03:38 -04:00
Albert Santoni
3e97ee5d62
Localization and verbiage improvements for adding podcasts
2015-10-22 14:39:12 -04:00
Duncan Sommerville
23ccc268d1
Forgot to add station podcast phtml
2015-10-22 10:44:47 -04:00
Duncan Sommerville
6580c12ad3
Add station podcast privacy toggle
2015-10-21 17:30:24 -04:00
drigato
cb8c34c3d5
SAAS-1126: Make player widget localizable
2015-10-21 16:14:36 -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
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
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
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
c8069aaedd
Initial publishing fixes and tweaks
2015-10-19 13:42:27 -04:00
Albert Santoni
30d742af92
Added msising publish-dialog.phtml and fixed .gitignore file
2015-10-15 18:03:03 -04:00
Albert Santoni
9a03b1b50a
Force users to click OK in the language/timezone popup
2015-10-14 11:58:44 -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
2ee7e4bf71
SAAS-1088 - move 'All My Shows' checkbox to dropdown instead
2015-09-30 11:38:33 -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
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
ca51dcf3ae
SAAS-1071 - more work on backend podcast implementation
2015-09-24 12:58:02 -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
a21c4612c9
Renamed a podcast.js function for clarity
2015-09-21 17:59:31 -04:00
Duncan Sommerville
4115f4939e
Frontend tweaks
2015-09-21 15:37:57 -04:00
Duncan Sommerville
373ff55923
Frontend tweaks to podcasting + new abstract datatables functionality
2015-09-21 12:40:05 -04:00
Duncan Sommerville
0710accbe2
SAAS-1062 - more work on podcasting frontend
2015-09-18 18:29:50 -04:00
Duncan Sommerville
a6450353e5
Add missing phtml file
2015-09-18 15:52:54 -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
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
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
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
f6a33802db
Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing
2015-09-15 14:21:53 -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
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
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
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
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
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
Albert Santoni
1db1af3f2e
Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling
2015-09-04 11:21:00 -04:00
Albert Santoni
274881c6e0
Add _pro macros to a bunch of billing page stuff
2015-09-04 11:17:01 -04:00
Duncan Sommerville
53b835715a
Fix responsiveness of upload page
2015-09-03 15:51:09 -04:00
Duncan Sommerville
f396bb4390
CSS tweaks
2015-09-03 14:51:58 -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
Albert Santoni
01b3ae1bf0
Allow smart blocks with no criteria
2015-09-02 16:25:30 -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
Duncan Sommerville
f283d69481
Add vertical scrollbar to recent uploads table
2015-09-01 14:27:54 -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
drigato
fa340c3e30
SAAS-976: September 1st: Undo the billing page changes for the August promotion
2015-08-31 13:37:20 -04:00
drigato
2748f223de
CC-6092: Calendar add show form style issues
2015-08-31 12:32:07 -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
311956eb74
CC-6069: Pick consistent design for New buttons
...
* First shot at blue New buttons
2015-08-28 16:21:20 -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
drigato
eb2f7263c8
CC-6078: Help page updates
2015-08-28 11:45:00 -04:00
Albert Santoni
8c90fbe4eb
Added metadata editor title and ellipsis
2015-08-27 20:23:53 -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
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
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
Albert Santoni
700c3c4005
Merge branch 'saas-dev' into saas-showbuilder
2015-08-25 13:27:40 -04:00
drigato
0c50247909
SAAS-1022: Re-implement disk quota status on side nav bar
...
Small css fix
2015-08-25 13:09:07 -04:00
drigato
a41793666d
Merge branch 'saas-showbuilder' of https://github.com/sourcefabric/Airtime into saas-showbuilder
2015-08-25 12:43:15 -04:00
drigato
2da431895f
SAAS-1022: Re-implement disk quota status on side nav bar
...
Changed "upload" page layout - panels are side by side and storage
status is at bottom of left panel
2015-08-25 12:43:08 -04:00
Duncan Sommerville
afe6ca7002
Cosmetic updates
2015-08-25 11:46:20 -04:00
Duncan Sommerville
6cfc2db0ca
CC-6086 - fix logout button redirecting to a 404 from certain pages when no baseurl is set
2015-08-21 14:29:00 -04:00
Duncan Sommerville
812dca9409
CC-6066 - initial work on add/remove content dialog; some selection fixes
2015-08-21 14:19:28 -04:00
Duncan Sommerville
beb0eed1c8
Make muses 'pixel' invisible, remove scrollbar from player widget page
2015-08-19 17:33:55 -04:00
Duncan Sommerville
a8955e2ea1
Fix side-menu position
2015-08-19 17:18:42 -04:00
Albert Santoni
cfa543e835
Small adjustment to logo
2015-08-19 16:59:04 -04:00
Albert Santoni
f82558a5c0
Navigation sidebar finalization
2015-08-19 14:59:33 -04:00
Albert Santoni
504a720ff2
Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder
2015-08-18 17:52:26 -04:00
Albert Santoni
2c443bd27a
Some navbar and page title fixes
2015-08-18 17:52:23 -04:00
Duncan Sommerville
0ad51dae09
Fix add/remove content dialog, try to increase speed of selection/deselection
2015-08-18 17:46:16 -04:00