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

283 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
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 2527fa2e1a CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 14:42:01 -04:00
denise 7d8079f770 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
 2012-10-19 12:50:36 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
denise 819dcf70fd CC-4579: Edit Metadata: Track number defaults to 0 if it is deleted 
-fixed
 2012-10-16 15:56:03 -04:00
Rudi Grinberg 5a0df2b6d5 Adde TODO's 2012-10-03 12:01:24 -04:00
Rudi Grinberg 1ae7784331 Added TODO 2012-10-03 11:59:02 -04:00
Rudi Grinberg 2deceaa5fb comment formatting 2012-10-03 11:58:21 -04:00
Rudi Grinberg 4ff267ee8a removed z 2012-09-19 17:45:03 -04:00
Rudi Grinberg 7bb1eadf03 formatting 2012-09-19 17:39:30 -04:00
Rudi Grinberg 36d454184d formatted 2012-09-19 17:37:49 -04:00
Rudi Grinberg f801fcb81e empty space 2012-09-19 11:20:26 -04:00
Rudi Grinberg 014da73eed heredoc sql 2012-09-19 11:17:32 -04:00
Rudi Grinberg ecb5c93ddf Removed methods again... 2012-09-19 11:14:59 -04:00
Rudi Grinberg 7dac1c6561 Added them back because not sure 2012-09-19 11:14:26 -04:00
Rudi Grinberg 99b28cca82 Removed unused methods 2012-09-19 11:11:50 -04:00
Rudi Grinberg 2cfb0c85d5 Formatted sql 2012-09-18 15:04:22 -04:00
Rudi Grinberg 3a60d729fd added todo 2012-09-18 15:02:07 -04:00
Rudi Grinberg b069b1254e Aligned 2012-09-18 12:56:01 -04:00
Rudi Grinberg 6ac241b1fc Added todo 2012-09-18 12:48:45 -04:00
Rudi Grinberg a22ba39de1 formatting 2012-09-18 12:26:07 -04:00
Rudi Grinberg d2f43058c2 fixed comment 2012-09-18 12:09:28 -04:00
Rudi Grinberg f9319b869a Corrected comments 2012-09-18 12:08:30 -04:00
Rudi Grinberg bc873a3ece Added extension handling for file path 2012-09-18 12:04:54 -04:00
Rudi Grinberg 8657a80459 removed return '' 2012-09-18 11:51:13 -04:00
Martin Konecny c310cecf40 CC-4463: do we need getFileExtension()? 2012-09-17 16:40:27 -04:00
Rudi Grinberg 2337078dd8 Cleaned up unused variables. Formatted some lines. 2012-09-17 12:35:12 -04:00
Martin Konecny 6e239d08e9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 14:43:15 -04:00
Martin Konecny e3c1a3ac0e CC-4434: Make Application_Model_Preference::getValue and setValue private methods 
-initial commit
 2012-09-14 12:09:40 -04:00
denise c7f4ede766 -implemented UI changes for library page 2012-09-14 12:08:51 -04:00
Rudi Grinberg e0286b112f cc-4292: Removed unnecessary code related to md5. 2012-09-12 11:10:25 -04:00
Rudi Grinberg faa04a2f5c Refactored RecallByX 2012-09-11 18:22:46 -04:00
denise c6ab540120 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-11 17:19:12 -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
Rudi Grinberg 72a424bb7e Added todo to fix crust 2012-09-11 16:25:45 -04:00
Rudi Grinberg 0dd38920a3 Cosmetic changes. 2012-09-11 16:20:59 -04:00
Rudi Grinberg 51d4f35c55 Removed unused global variable 2012-09-11 16:15:15 -04:00
Rudi Grinberg d95731f2f3 Reformatted sql to use heredoc 2012-09-11 16:13:39 -04:00
Martin Konecny 0fec175681 CC-1710: FLAC, BWF, AAC support 
-context menu for mp4's having a problem
 2012-09-11 14:04:45 -04:00
James 585ee579d6 CC-4005: Tag files with Last Played date and number of times played 
- fixed CRLF
 2012-09-10 18:07:12 -04:00
James 645593f954 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Webstream.php
 2012-09-10 18:04:35 -04:00
James ba37bb4327 CC-4005: Tag files with Last Played date and number of times played 
- done for files and webstreams
 2012-09-10 18:01:36 -04:00
Rudi Grinberg af225418c4 Removed empty constructor. 2012-09-10 16:08:21 -04:00
James 0ab08af48f CC-4380: Show ReplayGain value in the Library page 
- done
 2012-09-10 14:37:38 -04:00
James 4d3c624607 CC-4380: Show ReplayGain value in the Library page 
- temp commit
 2012-09-10 12:35:32 -04:00
Rudi Grinberg a479a11c8f Removed crazy handling of flac. 2012-09-07 18:23:14 -04:00
denise 8125d6b553 CC-4344: Conductor column not available in library view 
-done
 2012-09-06 14:30:09 -04:00
Rudi Grinberg ab6ae1ce8e cc-4336: Fixed the issue. But this whole chunk of code could probably be removed. 2012-09-05 14:33:49 -04:00