Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,867 Commits 18 Branches 27 Tags 434 MiB
Commit Graph

9867 Commits

Author SHA1 Message Date
Rudi Grinberg debc5b6081 Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas 2012-11-07 12:19:35 -05:00
denise 073d243007 -airtime couldn't connect to liquidsoap 2012-11-07 12:18:10 -05:00
Rudi Grinberg cd6c305b81 Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas 2012-11-07 12:05:37 -05:00
denise ccd6447696 - install failed due to wrong metadata key 
- wrong controller action called
 2012-11-07 12:05:20 -05:00
denise 4200059200 -airtime_version fix 2012-11-07 11:43:49 -05:00
Rudi Grinberg 110008e909 added saas shit 2012-11-07 11:29:39 -05:00
Rudi Grinberg af51ddca79 Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas 2012-11-07 11:29:17 -05:00
denise b817684972 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
 2012-11-07 11:21:36 -05:00
Martin Konecny fd3305bc4c SAAS-289: Remove all isSaaS checks 
-done
 2012-11-06 17:10:47 -05:00
Martin Konecny 90f14584b5 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-06 16:51:49 -05:00
denise 29c7e58643 CC-4679: Library: Deleting Webstream leaves the SAVE button 
-fixed
 2012-11-06 16:49:36 -05:00
denise f623445b0d Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-06 16:34:19 -05:00
denise bf4f5fd699 CC-4607: Library: Please make the 'Add x items' following mouse's point 
-fixed
 2012-11-06 16:34:06 -05:00
James 504d9968f1 CC-4639: 
Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit

- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
 2012-11-06 16:32:00 -05:00
Rudi Grinberg b3c9472bcb cc-4672: added dirty workaround to fix this issue 2012-11-06 16:16:37 -05:00
Rudi Grinberg 1762e418c0 added better logging 2012-11-06 14:57:53 -05:00
denise c605c97268 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks 
-disabled this option from context menu
 2012-11-06 14:33:34 -05:00
denise a1a7396ec9 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks 
-disabled this button in the library toolbar if dynamic blocks are open
 2012-11-06 14:29:26 -05:00
Rudi Grinberg b4555e9845 docstring formatting 2012-11-06 13:51:04 -05:00
denise e262d48eec CC-4675: Preferences: Error messages are hidden 
-fixed
 2012-11-06 12:17:45 -05:00
denise de89686d48 CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference 
-added comments
 2012-11-06 12:03:49 -05:00
denise 2cbba60037 CC-4673: Smart Block: Exception happens when create a smart block with 5 criteria 
-fixed
 2012-11-06 11:54:24 -05:00
denise a99191f4bd CC-4669: Smart Blocks: Dynamic length of less than 1 hour shows 0.0 
-fixed
 2012-11-06 11:14:40 -05:00
denise 6ef646124e CC-4668: Blocks/Playlists: Length includes deleted tracks 
-fixed
 2012-11-06 10:58:25 -05:00
Rudi Grinberg 66138c4baf removed references to gevent 2012-11-05 16:11:35 -05:00
Rudi Grinberg 6392c69e27 Removed unused code 2012-11-05 16:10:59 -05:00
Rudi Grinberg a851d8dd74 docstring format 2012-11-05 16:04:39 -05:00
Rudi Grinberg 83d4705bca removed useless comments 2012-11-05 14:19:37 -05:00
Rudi Grinberg 3509cfc212 formatting 2012-11-05 14:03:46 -05:00
Rudi Grinberg c287e11bee moved setting up unicde into it's own routine 2012-11-05 14:02:55 -05:00
denise e434af368f Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 13:58:22 -05:00
denise 90a93e9a6c CC-4664: Playlist/Block preview: Tracks deleted from library still get played 
-fixed
 2012-11-05 13:58:11 -05:00
Rudi Grinberg ce313a5b22 docstring formatting 2012-11-05 13:29:10 -05:00
Martin Konecny 16a13afd4e Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 12:05:38 -05:00
denise 78e731f717 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-05 12:03:59 -05:00
denise 8fda0ba610 CC-4625: On tablet you cannot create a playlist, smart block or webstream 
-attempt
2012-11-05 12:03:46 -05:00
Martin Konecny f6ee2afb88 CC-4665: ReplayGain does not work for FLAC files 
-fixed
 2012-11-05 12:03:25 -05:00
denise c59605040d Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 12:00:54 -05:00
denise c051e0671d CC-4625: On tablet you cannot create a playlist, smart block or webstream 
-attempt
2012-11-05 12:00:37 -05:00
Martin Konecny fffaf7788a Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-05 11:53:52 -05:00
Martin Konecny af7e94a44d don't break 80 character line limit 2012-11-05 11:53:37 -05:00
Martin Konecny d89166e2ff CC-4665: ReplayGain does not work for FLAC files 
-fixed
 2012-11-05 11:53:20 -05:00
Martin Konecny d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
denise a201d6f2da CC-4666: Showbuilder page is dead 
-fixed. result of a bad merge
 2012-11-05 11:15:26 -05:00
Rudi Grinberg bd3cf543bf made param useless in listAllFiles since its now safe to pass all files to MM 2012-11-05 11:11:05 -05:00
Rudi Grinberg 1c628bd831 renamed displayable to visible 2012-11-05 10:57:18 -05:00
Rudi Grinberg acf954f637 changed hidden check to displayable check 2012-11-05 10:55:54 -05:00
Rudi Grinberg 6e89fdab30 changed file existence checks to displayable 2012-11-05 10:14:49 -05:00
Rudi Grinberg b6341e44b3 removed pointless code duplication 2012-11-05 10:12:03 -05:00
Rudi Grinberg 34248921fc refactored code to use displayable 2012-11-05 10:09:34 -05:00