Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9868 commits 3 branches 0 tags 405 MiB
Commit graph

2696 commits

Author SHA1 Message Date
denise
ccd6447696 - install failed due to wrong metadata key 
- wrong controller action called
 2012-11-07 12:05:20 -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
denise
29c7e58643 CC-4679: Library: Deleting Webstream leaves the SAVE button 
-fixed
 2012-11-06 16:49:36 -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
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
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
denise
90a93e9a6c CC-4664: Playlist/Block preview: Tracks deleted from library still get played 
-fixed
 2012-11-05 13:58:11 -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
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
Rudi Grinberg
aa9a6691f2 added a single test for checking if a file should be shown or not 2012-11-05 10:08:29 -05:00
Rudi Grinberg
311c88a8a2 added check for hidden in buildEntry 2012-11-05 09:54:00 -05:00
Rudi Grinberg
a62e64969d Removed commented method 2012-11-05 09:49:49 -05:00
Rudi Grinberg
00a4e45491 added check for hidden in buildEntry 2012-11-05 09:47:16 -05:00
Rudi Grinberg
800f8b9ded added criteria to remmove hidden files in blocks 2012-11-05 09:40:58 -05:00
Rudi Grinberg
4522fa94b2 added clause to exclude hidden files from getShowListContent 2012-11-05 09:30:21 -05:00
Rudi Grinberg
e01a61208d Merge remote-tracking branch 'sf/2.2.x' into cc-4585 2012-11-05 09:19:20 -05:00
Rudi Grinberg
7e03333496 changed deletion by the user to be setting the file to be hidden instead 2012-11-03 01:33:13 -04:00
Rudi Grinberg
9c4f2e3298 refactored addWatchedDir to use early return style 2012-11-03 01:16:57 -04:00
Rudi Grinberg
5d3aa68c72 written method to unhide all files in a music dir 2012-11-03 01:09:36 -04:00
Martin Konecny
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
Martin Konecny
9609a4e220 Merge branch 'cc-4652' of https://github.com/rgrinberg/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:16:54 -04:00
denise
106b18bf30 CC-4637: Media Library: Item will be removed from Playlist if it's removed from Library 
-fixed
 2012-11-02 17:49:32 -04:00
Rudi Grinberg
2ae3c0ac03 Line wrapping 2012-11-02 16:06:12 -04:00
Rudi Grinberg
1111fd8163 align 2012-11-02 16:04:47 -04:00
Rudi Grinberg
ac9b47f5e2 made rescanWatchDirectoryAction more concise 2012-11-02 16:02:05 -04:00
Rudi Grinberg
5cb83909d8 Merge remote-tracking branch 'sf/2.2.x' into cc-4585 2012-11-02 16:00:09 -04:00
denise
796274e4ef CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths 
-fixed
 2012-11-02 15:51:36 -04:00
Rudi Grinberg
aec11feba5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-02 14:59:02 -04:00
denise
ba1f6ed054 CC-4374: Nowplayling page: Cannot remove tracks from recording show 
-fixed by disallowing dragging into recording shows
 2012-11-02 13:24:47 -04:00
denise
135aadf16b Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 12:28:21 -04:00
denise
a937df30ad Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-02 10:48:16 -04:00
denise
cc208da2fb CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference 
-added labels
 2012-11-02 10:48:08 -04:00
James
feb6c9d6f5 CC-4636: Exception happens when trying to remove user that have created some smart block 
- doing delete cascade on cc_block on deleting users
 2012-11-01 17:45:28 -04:00
James
575400b4c2 CC-4623: Library: Preview button for Flac does not work 
- fixed
 2012-11-01 16:44:37 -04:00
Rudi Grinberg
270eb97128 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into cc-4585 2012-11-01 15:14:53 -04:00
Rudi Grinberg
226bdbf738 added todo 2012-10-31 17:41:50 -04:00
denise
5b14c4fe88 CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own 
-fixed
 2012-10-31 17:19:27 -04:00
denise
2507e0f8a4 CC-4655: DJ's can delete files that they do not own 
-fixed
 2012-10-31 16:51:29 -04:00
Rudi Grinberg
4cca80fe44 Added schema changes 2012-10-31 16:23:12 -04:00
denise
fc613aa597 CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files 
-fixed
 2012-10-31 16:01:17 -04:00