073d243007
-airtime couldn't connect to liquidsoap
2012-11-07 12:18:10 -05:00
ccd6447696
- install failed due to wrong metadata key
...
- wrong controller action called
2012-11-07 12:05:20 -05:00
4200059200
-airtime_version fix
2012-11-07 11:43:49 -05:00
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
fd3305bc4c
SAAS-289: Remove all isSaaS checks
...
-done
2012-11-06 17:10:47 -05:00
90f14584b5
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-06 16:51:49 -05:00
29c7e58643
CC-4679: Library: Deleting Webstream leaves the SAVE button
...
-fixed
2012-11-06 16:49:36 -05:00
f623445b0d
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-06 16:34:19 -05:00
bf4f5fd699
CC-4607: Library: Please make the 'Add x items' following mouse's point
...
-fixed
2012-11-06 16:34:06 -05:00
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
b3c9472bcb
cc-4672: added dirty workaround to fix this issue
2012-11-06 16:16:37 -05:00
1762e418c0
added better logging
2012-11-06 14:57:53 -05:00
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
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
b4555e9845
docstring formatting
2012-11-06 13:51:04 -05:00
e262d48eec
CC-4675: Preferences: Error messages are hidden
...
-fixed
2012-11-06 12:17:45 -05:00
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
2cbba60037
CC-4673: Smart Block: Exception happens when create a smart block with 5 criteria
...
-fixed
2012-11-06 11:54:24 -05:00
a99191f4bd
CC-4669: Smart Blocks: Dynamic length of less than 1 hour shows 0.0
...
-fixed
2012-11-06 11:14:40 -05:00
6ef646124e
CC-4668: Blocks/Playlists: Length includes deleted tracks
...
-fixed
2012-11-06 10:58:25 -05:00
e434af368f
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-05 13:58:22 -05:00
90a93e9a6c
CC-4664: Playlist/Block preview: Tracks deleted from library still get played
...
-fixed
2012-11-05 13:58:11 -05:00
16a13afd4e
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-05 12:05:38 -05:00
78e731f717
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-05 12:03:59 -05:00
8fda0ba610
CC-4625: On tablet you cannot create a playlist, smart block or webstream
...
-attempt #2
2012-11-05 12:03:46 -05:00
f6ee2afb88
CC-4665: ReplayGain does not work for FLAC files
...
-fixed
2012-11-05 12:03:25 -05:00
c59605040d
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-05 12:00:54 -05:00
c051e0671d
CC-4625: On tablet you cannot create a playlist, smart block or webstream
...
-attempt #2
2012-11-05 12:00:37 -05:00
fffaf7788a
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-05 11:53:52 -05:00
af7e94a44d
don't break 80 character line limit
2012-11-05 11:53:37 -05:00
d89166e2ff
CC-4665: ReplayGain does not work for FLAC files
...
-fixed
2012-11-05 11:53:20 -05:00
d467abe509
Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel
2012-11-05 11:27:34 -05:00
a201d6f2da
CC-4666: Showbuilder page is dead
...
-fixed. result of a bad merge
2012-11-05 11:15:26 -05:00
bd3cf543bf
made param useless in listAllFiles since its now safe to pass all files to MM
2012-11-05 11:11:05 -05:00
1c628bd831
renamed displayable to visible
2012-11-05 10:57:18 -05:00
acf954f637
changed hidden check to displayable check
2012-11-05 10:55:54 -05:00
6e89fdab30
changed file existence checks to displayable
2012-11-05 10:14:49 -05:00
b6341e44b3
removed pointless code duplication
2012-11-05 10:12:03 -05:00
34248921fc
refactored code to use displayable
2012-11-05 10:09:34 -05:00
aa9a6691f2
added a single test for checking if a file should be shown or not
2012-11-05 10:08:29 -05:00
311c88a8a2
added check for hidden in buildEntry
2012-11-05 09:54:00 -05:00
a62e64969d
Removed commented method
2012-11-05 09:49:49 -05:00
00a4e45491
added check for hidden in buildEntry
2012-11-05 09:47:16 -05:00
800f8b9ded
added criteria to remmove hidden files in blocks
2012-11-05 09:40:58 -05:00
4522fa94b2
added clause to exclude hidden files from getShowListContent
2012-11-05 09:30:21 -05:00
e01a61208d
Merge remote-tracking branch 'sf/2.2.x' into cc-4585
2012-11-05 09:19:20 -05:00
7e03333496
changed deletion by the user to be setting the file to be hidden instead
2012-11-03 01:33:13 -04:00
9c4f2e3298
refactored addWatchedDir to use early return style
2012-11-03 01:16:57 -04:00
5d3aa68c72
written method to unhide all files in a music dir
2012-11-03 01:09:36 -04:00
12009e95fc
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 20:18:33 -04:00
denise
Martin Konecny
James
Rudi Grinberg