Commit graph

399 commits

Author SHA1 Message Date
frecuencialibre
c7b55f60e4
Merge branch 'master' into smartblock-overflow 2018-12-11 14:17:18 -06:00
ryan
0cf27e91e2 Rename "autoloading playlists", add help texts 2018-11-26 10:56:56 -06:00
Robbt
e7c7f215d5 Added the option to allow smartblocks to overflow their time limits to the UI 2018-11-25 13:16:26 -05:00
Lucas Bickel
090fdae99b Merge remote-tracking branch 'robbt/feature/relative_smartblocks' into dev/merge-testing 2018-01-09 21:53:12 +01:00
Robbt
144f1b5561 Fixed form validation and display after errors and when removing rows 2018-01-08 21:48:31 -05:00
Robb Ebright
5e7a5b3e1d Revert "fixed smart block criteria view to show dropdown based upon current values vs. database values to fix display when form is invalid"
This reverts commit fc4f82a83a.
2018-01-07 15:27:58 -05:00
Robb Ebright
fc4f82a83a fixed smart block criteria view to show dropdown based upon current values vs. database values to fix display when form is invalid 2018-01-04 15:49:03 -05:00
Robb Ebright
015bcea70d Merge branch 'feature/relative_smartblocks' of https://github.com/Robbt/libretime into feature/relative_smartblocks 2018-01-04 10:38:25 -05:00
Robb Ebright
927fcbc42d Pluralized file criteria, cleaned up CSS and removed dead code 2018-01-03 18:57:02 -05:00
Robb Ebright
91906e5b5d Moved files that meet criteria to top of track listing 2017-11-26 14:48:41 -05:00
Robb Ebright
311ecd393d working relative dates with drop down selects 2017-10-14 01:00:06 -04:00
Robb Ebright
c78979c19c work in progress - need to write rules to parse when to show vs hide datetime select and add it to value field 2017-08-24 10:27:13 -04:00
Robb Ebright
3515a898a7 Added option for Auto Smartblock and Playlist creation to preferences 2017-08-23 12:16:42 -04:00
Robb Ebright
c12ad4ea4f added UI to toggle autoplaylist repeat option 2017-03-31 00:00:19 -04:00
Lucas Bickel
81d3c3e2b8 Merge pull request #84 from Robbt/fix/live-stream-source
[WIP] Making show and master source ports and mount points editable.
2017-03-20 02:06:58 +01:00
Robb Ebright
fefc53c000 basic podcast album override option in preferences 2017-03-16 16:48:31 -04:00
Robb Ebright
f31236fe66 Fixed Override Javascript and Functionality 2017-03-14 23:03:37 -04:00
Robb Ebright
e873e0d8da Merge branch 'fix/live-stream-source' of https://github.com/Robbt/libretime into Robbt-fix/live-stream-source 2017-03-14 19:22:32 -04:00
Robb Ebright
67ffd2d34a Making show and master source ports and mount points editable. 2017-03-14 01:15:14 +00:00
Lucas Bickel
61cde1557f Make password reset work for eveyone
This stops distinguishing between superadmin users from whmcs vs regular local users on the password reset page.
2017-03-13 20:39:21 +01:00
Robb
2be8ef0f2b Merge pull request #55 from radiorabe/feature/autodj
Robbs AutoDJ
2017-03-11 18:41:08 -05:00
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
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
Duncan Sommerville
641cfb9432 SAAS-1234 - bind station feed url to angular data model 2015-11-19 17:09:49 -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
Duncan Sommerville
8e867b522c SAAS-1202 - move station podcast to top-level menu item 2015-11-13 14:57: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
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
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
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
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
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
Duncan Sommerville
f396bb4390 CSS tweaks 2015-09-03 14:51:58 -04:00
Albert Santoni
01b3ae1bf0 Allow smart blocks with no criteria 2015-09-02 16:25:30 -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
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
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
Duncan Sommerville
a8955e2ea1 Fix side-menu position 2015-08-19 17:18:42 -04:00
Duncan Sommerville
3f25ab2647 CC-6079 - merge and remove underscore files 2015-08-18 15:23:42 -04:00
Albert Santoni
a271b53c2e CC-6077: Implement actions menu for library view 2015-08-18 14:55:32 -04:00
Albert Santoni
74a1e0929d Fixed styling on Listener Stats page 2015-08-17 16:08:58 -04:00
Albert Santoni
61d1e6bb50 Merge branch 'saas-showbuilder' of github.com:sourcefabric/Airtime into saas-showbuilder 2015-08-12 16:45:07 -04:00
Albert Santoni
409e9e2a78 Stream settings, Add Show form CSS revamp, etc. 2015-08-12 16:44:45 -04:00