Commit Graph

137 Commits

Author SHA1 Message Date
Rudi Grinberg 800f8b9ded added criteria to remmove hidden files in blocks 2012-11-05 09:40:58 -05:00
james 9293a26738 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough
tracks meet the time limit

- code optimazation
2012-10-31 12:05:17 -04:00
James 1899d588ee - CRLF fix 2012-10-30 18:03:03 -04:00
James 9d495ebc03 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit.
- done
2012-10-30 17:57:58 -04:00
James 5061dfa05d CC-4647: apache error log entries
- fixed
2012-10-30 12:36:50 -04:00
denise 6727bce328 CC-4598: Smart block: cannot save dynamic block with 0.5 hours
-fixed
2012-10-18 15:03:59 -04:00
denise 5f35336fd0 CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values:
-fixed
2012-10-11 11:49:04 -04:00
James 8433ec5445 CC-4482: Smart Blocks -> tracks with empty "Album" name are NOT filtered in
- fixed
2012-09-18 16:50:42 -04:00
James 43503475fd CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria
- CRLF fix
2012-09-13 17:07:47 -04:00
James 0b917f385e CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria
- fixed
2012-09-13 17:05:40 -04:00
Rudi Grinberg 24b3fb7e8a Remvod unused CC_CONFIG, reformatted some code 2012-09-13 10:26:50 -04:00
denise 3b43efefe0 CC-4413: Unused local variables in models.
-done
2012-09-12 17:26:41 -04:00
Martin Konecny 20f5fe6480 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/models/Block.php
	airtime_mvc/public/css/styles.css
2012-09-12 15:55:43 -04:00
Martin Konecny a418f5777c CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
-initial commit
2012-09-12 15:43:50 -04:00
Rudi Grinberg b2737688cc Added space to sql squery 2012-09-12 15:36:37 -04:00
Rudi Grinberg d69391d2dd Formatted Block.php 2012-09-12 11:35:28 -04:00
Rudi Grinberg 7b41d94352 Reforamtted Block.php 2012-09-12 11:31:41 -04:00
denise 58d39d74d4 CC-4355: Smart block criteria do not match library columns or metadata editor
-fixed
2012-09-11 17:18:17 -04:00
denise f06b3e2c36 CC-4345: Prepared statements - part 1
-modified Block.php to use Application_Common_Database::prepareAndExecute()
2012-09-06 11:11:09 -04:00
Martin Konecny e636d371b0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-04 17:22:32 -04:00
Martin Konecny ac547342f1 Logging typo 2012-09-04 17:22:21 -04:00
denise 5bb1f4720e CC-4345: Prepared statements - part 1
-Block.php done
2012-09-04 16:59:33 -04:00
Martin Konecny 4848717d4d CC-4090: Make code style PSR compliant - part 4
-models dir
2012-08-29 10:58:03 -04:00
denise 98ab38ff54 CC-4295: Smart Block: Please deal with the float value when criteria likes 'length is'
-fixed
2012-08-28 11:22:41 -04:00
denise 0edfb10f19 Smart Blocks: extra criteria field was undefined sometimes 2012-08-27 12:43:46 -04:00
denise b92ff1de89 CC-4290: Playlists -> Dynamic Smart Block-> "in the range" criteria seems to be not working
-fixed
2012-08-27 12:04:04 -04:00
James 2ca4a369b2 CC-4264: Smart Block: Fail to generate block with some unavailable files
- fixed
2012-08-24 17:02:37 -04:00
denise 82f2b2e7c3 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed
-fixed
2012-08-24 11:12:31 -04:00
denise 1f7a6fdc63 CC-4262: Smart Block: Characters do not get escaped properly
-fixed
2012-08-24 10:29:28 -04:00
Martin Konecny 9893282e43 CC-4275: Enable debug mode where all Propel queries are displayed in raw SQL
-add enablePropelLogging and disablePropelLogging functions
2012-08-23 22:27:24 -04:00
Martin Konecny d06fda0329 fix indentation 2012-08-23 21:43:55 -04:00
denise bf69f23343 CC-4249: Playlist: Playlist's length doesn't update if it contains a smart playlist which the length is changed
-fixed
2012-08-23 11:53:44 -04:00
denise f47e32d9de CC-4266: Smart Block: Bit rate with 'is in the range' modifier -> 2nd range value doesn't get multiplied by 1000
-fixed
2012-08-22 16:29:17 -04:00
denise 7e50a11195 CC-4225: Smart playlists: Sample and bit rate ranges should include entered values
-fixed
2012-08-22 16:01:50 -04:00
Martin Konecny 462542bf68 change Logging::log to Logging::info 2012-08-21 18:41:56 -04:00
Martin Konecny 15eae0698b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-21 16:55:17 -04:00
Martin Konecny a1b91aebbd CC-1665: Scheduled stream rebroadcasting and recording
-use sessions to determine currently open object in Library
2012-08-21 16:54:14 -04:00
denise 2cdaa186e3 CC-4257: Smart Block: Admin cannot delete DJ user's block
-fixed
2012-08-21 15:42:44 -04:00
denise d06f02f1f5 CC-4244: Playlist Builder: Original Length should not be changed after setting Cue in/out value
-fixed
2012-08-21 14:08:30 -04:00
denise 167881c903 CC-4253: Smart Playlist: Please support filter tracks by date
-code refactor
2012-08-21 12:01:48 -04:00
denise 0c381d4692 CC-4253: Smart Playlist: Please support filter tracks by date
-fixed
2012-08-21 11:58:39 -04:00
denise 0d21d9a9af Smart Playlists: code cleanup 2012-08-16 15:40:36 -04:00
denise ae0d5d8598 CC-4238: Playlists: Fade in/out is in wrong format
-added comment
2012-08-16 14:45:51 -04:00
denise 6b54440b7e CC-4238: Playlists: Fade in/out is in wrong format
-fixed
2012-08-16 14:35:24 -04:00
denise 1b7d174509 CC-4233: Smart Playlist: Cannot save the change of Fade in/out
-fixed
2012-08-16 12:33:25 -04:00
denise ea621fd9dc CC-4223: Smart playlists: BPM criteria should have numeric modifiers
-done
2012-08-15 16:40:04 -04:00
denise 3947b6d033 CC-4113: Smart Playlist: Filename contains '\' cannot be searched
-fixed
2012-08-15 15:13:07 -04:00
James 9fc5411895 CC-4229: Smart Playlist: refactor code
- done
2012-08-15 11:36:41 -04:00
denise c62d89d5da CC-4220: Smart Playlists: Change indexing of criteria elements
-changed indexing on UI
2012-08-14 10:02:36 -04:00
denise 83085220e2 CC-4220: Smart Playlists: Change indexing of criteria elements
-changed Block model to reflect index changes
2012-08-14 09:26:49 -04:00
James db3a9357f9 CC-4211: Smart Playlist: length of dynamic block wont be convert to hh:mm:ss if set limit as float number, such as 23.999
- fixed
2012-08-13 11:59:28 -04:00
James 19c90e6688 CC-4204: Dynamic Smart Playlist: Set limit to 500 minutes and click Save will froze the Browser
- fixed
2012-08-13 11:42:48 -04:00
James 1bd94a0757 CC-4212: Smart Playlist: The formats of 'Bit Rate' are not matched between Media Library and Criteria
- fixed
2012-08-13 11:32:06 -04:00
James 8055a9c80b CC-4214: Smart Playlist -> Criteria about datetime: Please convert the searched value from local time to UTC
- fixed
2012-08-13 11:18:15 -04:00
James 09897064c6 CC-4215: Smart Playlist: Exception happens when generate with criteria Length is 2012-08-10 14:00:00
- fixed
2012-08-13 10:59:21 -04:00
James 4009ae741f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-08-10 12:39:45 -04:00
James 7acd4b362f bug fix
- Length display was wrong
2012-08-10 12:39:33 -04:00
Martin Konecny 037e78730b CC-4203: Smart Playlist: Please support limit as 0.5 hour
-fixed
2012-08-09 18:27:46 -04:00
James 1367bde728 CC-4185: Playlist Builder -> Smart Playlist: Able to create Smart Playlist more than 24 hours
- fixed
2012-08-09 14:18:15 -04:00
James ef0e800c92 CC-4186: Playlist Builder -> Smart Playlist : The static Smart Playlist's length value will be empty if no file meet the criteria.
- fixed
2012-08-09 14:12:30 -04:00
James 685354e000 CC-4189: Playlist Builder -> Smart Playlist: Cannot change the position of manually added tracks
- fixed
2012-08-09 11:44:27 -04:00
James fd1628f971 CC-4117: Smart Playlist: radio_station_name criteria doesnot take effect
- removing radio_station_name from criteria list
2012-08-08 12:01:10 -04:00
James 61e38381af CC-4176: Smart Playlist: Set implicit item limit when user uses time as a limit
- done
2012-08-08 11:46:48 -04:00
denise 97943a6af8 CC-4157: Playlist Builder -> Smart Playlist -> Wrong warning msg if trying to input 0000-00-00 into Upload criteria
-fixed
2012-08-07 16:17:24 -04:00
James 2f8d0b77fa CC-4149: Playlist Builder: Fail to generate Smart Playlist with 5000 items
- set the items limit to 500
2012-08-07 14:53:07 -04:00
James af939469d3 CC-84: Smart Playlists
- fixed bug on expanding block
- fixed text bug
2012-08-02 17:03:54 -04:00
James 028e089c82 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/models/Block.php
2012-08-02 16:37:12 -04:00
James 0d2d8218bf CC-84: Smart Playlists
- audio preview on playlist
- cleaning up some code
2012-08-02 16:36:12 -04:00
denise 997b5c31c3 CC-84: Smart Playlists
- fixed dragging tracks into playlists (smart and dumb)
- display alert when dragging into dynamic block
- display alert when dragging playlist into block
2012-08-02 11:52:11 -04:00
James 6e71a6bb92 CC-84: Smart Playlists
- dynamic block length display
2012-08-02 11:17:10 -04:00
denise 9479aeb3dd CC-84: Smart Playlists
- fixed db column mapping for radio station name and track title
2012-08-01 17:10:56 -04:00
denise 0f681d7c25 CC-84: Smart Playlists
-fixed undefined offset apache warnings
2012-08-01 14:07:38 -04:00
James 9d51222dae CC-84: Smart Playlists
- Length calculation for dynamic blocks and playlist that contains
dynamic blocks
2012-07-31 17:46:37 -04:00
James b312b2bd45 CC-84: Smart Playlists
- fixed db query part for static smart playlist generate
2012-07-31 11:01:19 -04:00
James 27017c7903 CC-84: Smart Playlists
- fixed getCriteria() to non static function
2012-07-30 18:21:27 -04:00
denise 142aa214b3 CC-84: Smart Playlists
-dos2unix
2012-07-30 17:31:54 -04:00
denise d169f4aa31 CC-84: Smart Playlists
- improved validation to not allow multiple criteria fields
2012-07-30 17:03:01 -04:00
denise f91be9468f CC-84: Smart Playlists
-UI cleanup
2012-07-30 16:42:37 -04:00
denise e04273c335 CC-84: Smart Playlists
- created function that returns an array of block criteria
- fixed form so it displays modifier rows properly
2012-07-29 15:47:42 -04:00
denise 55b8b08508 CC-84: Smart Playlists
-fixed how the modifier rows are parsed when saving to db
2012-07-27 17:30:21 -04:00
denise 2083d04107 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-27 14:32:39 -04:00
denise d7cf50b2f4 CC-84: Smart Playlists
- changed error handling and criteria saving to handle same criteria rows
2012-07-27 14:32:31 -04:00
James 5becd70ab1 CC-84: Smart Playlists
- drag and drop playlist that contains block
- audio preview of playlist that contains static block
2012-07-27 11:51:50 -04:00
James 8755500d30 CC-84: Smart Playlists
- some minor fix
2012-07-26 15:30:49 -04:00
James 9bd823ee2c CC-84: Smart Playlists
- fixed the issue where block length wasn't updated on spl section
2012-07-26 10:49:23 -04:00
denise bef9ba1eea CC-84: Smart Playlists
- added 'Smart Block' filter in datatable
- added block files to library datatable
2012-07-25 17:08:22 -04:00
James 1f3cbd8aba CC-84: Smart Playlists
- introducing smart-block
2012-07-25 12:44:37 -04:00