Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,777 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

3359 Commits

Author SHA1 Message Date
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
James d7a5ab4d94 CC-4622: Library: AAC file can be preview but is blocked from playlist and content menu 
- fixed
 2012-11-01 15:21:56 -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
denise fc613aa597 CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files 
-fixed
 2012-10-31 16:01:17 -04:00
denise dfd52eedf1 CC-4654: Library -> Simple search still has effects even if you are doing an advanced search 
-fixed
 2012-10-31 15:24:50 -04:00
denise cc40dfdf4e CC-4641: Now Playing: Extending show's length won't change the overbooked track's style 
-added comment
 2012-10-31 14:16:16 -04:00
denise 71be2b2bd1 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-31 12:36:56 -04:00
denise fd0e1c3c95 CC-4641: Now Playing: Extending show's length won't change the overbooked track's style 
-fixed
 2012-10-31 12:36:45 -04:00
james 2e4d5ec142 CC-4539: Advanced search: Sample rate searched on Hz, but search results 
shown in kHz

- fixed
 2012-10-31 12:32:40 -04: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 cbee9422ec Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 17:58:16 -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
Martin Konecny 9b77007e03 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 17:19:51 -04:00
Martin Konecny 8c90c1a12f CC-4645: Add support for x-scpls playlist types 
-fixed
 2012-10-30 17:19:40 -04:00
denise 00947f9d7e CC-4640: Automatically jump to current song when loading the Now Playing page. 
-small fix
 2012-10-30 15:34:38 -04:00
denise 5f03a38262 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 15:04:08 -04:00
denise cabe583a3b CC-4649: Library -> Disable simple search if advanced search fields are open 
-done
 2012-10-30 15:01:46 -04:00
James ef68680868 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 13:23:23 -04:00
James 3e60ac4393 remove \r line endings 2012-10-30 13:23:09 -04:00
denise acc3ccca22 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 13:03:05 -04:00
denise b8039e315a CC-4577: Webstream UI: little improvement about 'SAVE' button and input boxes for URL and length 
-done
 2012-10-30 13:02:55 -04:00
James bba7975882 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 12:36:59 -04:00
James 5061dfa05d CC-4647: apache error log entries 
- fixed
 2012-10-30 12:36:50 -04:00
denise 71291b14f0 CC-4646: Library: Make advanced search options hidden by default 
-done
 2012-10-30 11:59:52 -04:00
denise 695c0fa926 CC-4607: Library: Please make the 'Add x items' following mouse's point 
-fixed
 2012-10-30 11:45:53 -04:00
denise 51de436fd5 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 11:18:18 -04:00
denise b08f5091b5 CC-4609: Calendar -> Add/Remove contents: Please remove useless buttons: 'Jump to current playing song' and 'Cancel current show' 
-done
 2012-10-30 11:18:11 -04:00
Rudi Grinberg 7276985bb4 test commit 2012-10-29 19:19:48 -04:00
James 5651dbce56 CC-4644: Exception from zendphp.log 
- fixed
 2012-10-29 16:37:27 -04:00
James a937aa0e28 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-29 16:19:39 -04:00
James 4861397872 CC-4644: Exception from zendphp.log 
- fixed
 2012-10-29 16:19:23 -04:00
denise d97afabaea CC-4640: Automatically jump to current song when loading the Now Playing page. 
-added check to see if a show is currently playing
 2012-10-29 15:40:58 -04:00
denise 332f9993c0 CC-4640: Automatically jump to current song when loading the Now Playing page. 
-done
 2012-10-29 15:20:16 -04:00
denise fdd889d7a8 - fixed formatting 2012-10-29 12:09:11 -04:00
denise 8ac0f41987 CC-4590: New smart block says 'Empty playlist' 
-fixed
 2012-10-29 11:57:20 -04:00
Rudi Grinberg dc00528cd5 Merged baseUrl related conflicts 2012-10-29 11:56:20 -04:00
Rudi Grinberg d6a4f2f713 Cleaned up soundcloud 2012-10-26 18:45:27 -04:00
denise 3a7700eaac CC-4583: Use AJAX calls instead of refreshing entire page 
-done
 2012-10-26 18:09:30 -04:00
denise 0ab1353564 CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on 
-fixed
 2012-10-26 18:00:48 -04:00
James f14320a769 CC-4603: Dynamic Smart Blocks: adding to multiple shows at once generates the same content 
- fixed
 2012-10-26 17:15:39 -04:00
James e667a721ad - comment for some code 2012-10-26 16:26:48 -04:00
James 1ee228558a CC-4574: Audio preview fails with certain characters in metadata 
- fixed
 2012-10-26 16:24:17 -04:00
Rudi Grinberg dc361c1136 Aligned constants 2012-10-26 13:10:08 -04:00
Martin Konecny 4daaa776e2 CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table 
-fixed
 2012-10-23 17:45:55 -04:00
Martin Konecny 2d6be404d4 cc-4304: fixed ticket by deleting playlists when user is deleted. also removed useless index on file_exists 
-regen propel files
 2012-10-23 13:45:15 -04:00
james c74354b6f9 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-23 12:24:53 -04:00
james dff5bb4e2b CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table 
- fixed
 2012-10-23 12:24:38 -04:00
Rudi Grinberg 50d09d09d3 cc-4304: fixed ticket by deleting playlists when user is deleted. also removed useless index on file_exists 2012-10-23 12:08:01 -04:00