Commit Graph

166 Commits

Author SHA1 Message Date
Codenift 386918da2b Renamed media type to track type for tracks 2020-01-06 17:15:04 -05:00
Codenift 07a4117bd4 Media Type for tracks. Same PR from before with a couple minor fixes 2019-10-16 20:20:34 -04:00
Robbt 4db93d3cee remove commented out code and add comment about sort null addition 2019-05-09 10:46:39 -04:00
Robbt 1735cfc5b4 Fixed the null sort to work like we want 2019-05-08 18:18:36 -04:00
Robbt c2ad5e387a added sort by last play time but does not work with unplayed tracks 2019-05-08 18:01:06 -04:00
Robbt 32d3c0578b refactor time remaining smartblock to work with playlists 2019-04-22 15:26:09 -04:00
frecuencialibre 4d0fea34fc
Merge pull request #707 from Robbt/intro-playlist
Add Intro and Outro playlist to Autoloading Playlists
2019-02-14 10:49:15 -06:00
Robbt b09c175a25 removed code and database change that was not being used to avoid future confusion 2019-02-04 11:57:13 -05:00
Robbt 8de94a670f trying different things for autoplaylist 2019-01-21 11:06:04 -05:00
Robbt 6631dd994f working with start form 2019-01-20 14:12:52 -05:00
Robbt 8095f6e627 Enable smartblocks with same criteria to stay separate if created with new criteria 2019-01-19 21:41:00 -05:00
Robbt 2b057472ca part of the way there towards grouping need to deal with OR value 2019-01-20 02:12:21 +00:00
Robbt 1e7a8dce8c started along route of using extra to group modifiers 2019-01-19 19:27:24 -05:00
frecuencialibre 4752c728b9
Merge pull request #605 from Robbt/feature-smartblock-remaining-time
Add Fill Remaining Time Smartblock Limit
2018-12-12 15:43:49 -06:00
Robbt 2a039d0469 changed preview to only 60 minutes 2018-12-12 16:36:49 -05:00
Robbt 4abe301fbb modified javascript and binary values to make dynamic default 2018-12-11 21:34:06 -05:00
Robbt c7767c8a8d avoid fail when blocks are created as dynamic by default 2018-12-12 02:23:25 +00:00
frecuencialibre c7b55f60e4
Merge branch 'master' into smartblock-overflow 2018-12-11 14:17:18 -06:00
Robbt 9904b61eda removed php escape of characters that broke smartblocks 2018-12-02 10:39:29 -05: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
Robbt 74cd668301 fixed repeating smartblock to not overflow time limit 2018-11-25 11:36:18 -05:00
Robbt c759f8b8aa Initial proof of concept for time remaining smart block limit 2018-11-24 17:08:39 -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
Robb Ebright 6bdb570338 Modified smartblock form to allow preview of tracks meeting criteria for dynamic smartblocks 2017-11-21 21:22:06 -05:00
Robb Ebright 8807dbcbfb Added input validation and fixed between relative date validation 2017-10-14 23:15:47 -04:00
Robb Ebright 67807bb4b3 fixed blatant errors in jquery and php validation 2017-10-14 21:01:58 -04:00
Robb Ebright 311ecd393d working relative dates with drop down selects 2017-10-14 01:00:06 -04:00
Robb Ebright c630a69b89 Added ability to text input relative date times w/o validation 2017-08-16 20:05:02 -04:00
Robb Ebright 0b80a429b3 added comments to document smartblock functions and added new options to permit datetime based select fields 2017-08-16 14:55:48 -04:00
Robb Ebright ba9f7879a4 modified smart block to not exceed the time limits. 2017-03-12 22:36:36 -04: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
Duncan Sommerville c5a5839eff Better errors from podcast 'Add' dialog 2015-11-10 19:26:25 -05:00
drigato 28493497fd SAAS-1058: Podcast table schema
SAAS-1059: Add description field to cc_files
2015-09-14 17:00:54 -04:00
Albert Santoni 01b3ae1bf0 Allow smart blocks with no criteria 2015-09-02 16:25:30 -04:00
Albert Santoni f7d26c0dde Merge branch '2.5.x' into saas 2015-01-27 15:39:40 -05:00
Albert Santoni 2b323400fc Indentation and undefined variable fix in Block.php 2015-01-27 15:39:21 -05:00
drigato ca9750f415 Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/ACL.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/modules/rest/controllers/MediaController.php
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
Robbt fe291cdc8c Added sort tracks by upload time to smart blocks criteria 2014-10-19 23:02:40 -04:00
Albert Santoni 0eab0c609b Permissions fixes for Super Admin users 2014-06-20 17:43:20 -04:00
Naomi e6d28b250e CC-5629 : Smart Block timestamps aren't saved in UTC time 2013-12-11 17:35:31 -05:00
denise afda0c140b CC-5196: L10N: Smartblock only generate 1 file even multiple files are qualified, no matter which limitation is set. 2013-05-30 15:50:35 -04:00
denise c1c90a4b9a Smart block fix 2013-05-30 15:43:31 -04:00
denise 527b1eaf1d CC-5191: I18N: "items" is not translated when expanding dynamic Smartblock in playlist 2013-05-30 15:05:57 -04:00
Naomi 06fbbe89f2 CLRF fix. 2013-05-23 18:34:35 -04:00
Naomi 75e6f21ce0 CC-5108 : Waveform Editor UI
putting on the timescale for time reference.

fade editor now has cursor playback info.
2013-05-23 18:33:40 -04:00
Naomi d9b6a15fb6 CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block 2013-05-13 18:21:24 -04:00
Naomi b0018083c7 CC-5121 : fix some SQL statements not being escaped/prepared 2013-05-10 17:14:10 -04:00
Naomi a18fc87d97 CC-5065 : Playlist length is not built on actual cue in/out value 2013-05-08 14:19:22 -04:00
Naomi fe916ec043 CC-2301 : adding in crossfade durations to smart blocks. 2013-05-08 11:43:53 -04:00
Naomi 2a1ac0ddb9 CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps. 2013-04-30 16:27:31 -04:00