Commit Graph

9085 Commits

Author SHA1 Message Date
Rudi Grinberg 36d07fb5e1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:38:53 -04:00
Rudi Grinberg a832ad61dc Fixed bug where path would not be normpathed 2012-09-13 11:38:40 -04:00
Rudi Grinberg b28116f622 removed empty space 2012-09-13 11:34:00 -04:00
James 903c7ef580 CC-4420: airtime-import is broken
- fixed
2012-09-13 11:16:42 -04:00
denise 771ca5e0b3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:12:51 -04:00
denise a779142a08 -fix commenting error 2012-09-13 11:12:39 -04:00
Rudi Grinberg d564b85e7c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:12:32 -04:00
Rudi Grinberg e2f8d8e0e7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:10:43 -04:00
Rudi Grinberg d409af2876 shortened logging 2012-09-13 11:07:29 -04:00
Martin Konecny 65e94cfdf0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 11:06:53 -04:00
Martin Konecny 50f723fa7a CC-4416: Error with AAC files and Replaygain
-fixed
2012-09-13 11:06:44 -04:00
Rudi Grinberg dced49c425 Removed unused variable 2012-09-13 10:52:58 -04:00
James 5067a304d9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 10:49:33 -04:00
James b6b93618e6 CC-4353: Numeric search fields in Library would benefit from format labels
- bug fix
2012-09-13 10:49:24 -04:00
Martin Konecny 4fc278a55a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 10:42:59 -04:00
Martin Konecny a396136600 bootstrap.css file 2012-09-13 10:42:53 -04:00
Rudi Grinberg 55993352bf Removed unused variables. 2012-09-13 10:35:24 -04:00
Rudi Grinberg 52882ef938 Added mp4 removed aac. 2012-09-13 10:35:13 -04:00
Rudi Grinberg 8eda4a7035 Subtle bug fixed in smartPrepareAndExecute. 2012-09-13 10:34:15 -04:00
denise e1403d45bd CC-4368: Unused local variables in Airtime Controllers. Should be removed.
-done
2012-09-13 10:32:33 -04:00
Rudi Grinberg 24b3fb7e8a Remvod unused CC_CONFIG, reformatted some code 2012-09-13 10:26:50 -04:00
Martin Konecny 0df0c41012 CC-1710: FLAC, BWF, AAC support
add required packages for Liquidsoap
2012-09-12 23:35:10 -04:00
Martin Konecny 1f3bab2458 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 23:06:19 -04:00
Martin Konecny 54d7f496d9 add bootstrap.js to bootstrap.php 2012-09-12 23:06:05 -04:00
Rudi Grinberg cc88a9a8e3 Fixed a lot of unused variables 2012-09-12 18:36:27 -04:00
Martin Konecny 4998a63a6a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 17:34:32 -04:00
Martin Konecny 1c293839da CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
-disable preview icon
2012-09-12 17:32:19 -04:00
Rudi Grinberg 536fdabb77 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 17:27:08 -04:00
denise 3b43efefe0 CC-4413: Unused local variables in models.
-done
2012-09-12 17:26:41 -04:00
Rudi Grinberg 8e91c515f0 cc-4397: Fixed handling for bad metadata. 2012-09-12 17:26:37 -04:00
Vladimir 8938eaa637 Added missind Bootstrap CSS (bootstrap_custom.css) 2012-09-12 23:18:37 +02:00
Rudi Grinberg e708f60f68 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 17:08:58 -04:00
denise 9c8f4fe404 CC-4414: Unused local variables in forms
-done
2012-09-12 17:09:00 -04:00
Rudi Grinberg af8c813f35 Documented unimplemented interface methods 2012-09-12 17:08:51 -04:00
denise 32b1ee95b7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 16:29:35 -04:00
denise 5ac6877e60 CC-4362: Smart Block: error for multiple criteria
-fixed
2012-09-12 16:29:26 -04:00
Rudi Grinberg 88604eabcc Removed unused variable 2012-09-12 16:24:49 -04:00
Rudi Grinberg 15355f9e30 Formatted comment 2012-09-12 16:12:00 -04:00
Rudi Grinberg 6e8313a395 Fixed typo in SQL missing , 2012-09-12 16:10:56 -04:00
Rudi Grinberg db5dbab086 Removed unused local variables 2012-09-12 16:09:53 -04:00
Rudi Grinberg 414d1fa511 PDO'd UpdateBroadcastedStatus 2012-09-12 16:09:28 -04:00
Rudi Grinberg 643c00418a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 15:59:53 -04:00
Rudi Grinberg 64a1dade9b Massive formatting of SQL 2012-09-12 15:59:46 -04:00
Martin Konecny 20f5fe6480 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	airtime_mvc/application/models/Block.php
	airtime_mvc/public/css/styles.css
2012-09-12 15:55:43 -04:00
Martin Konecny 87fb9998dd increase mem warning limit to 30MB 2012-09-12 15:44:26 -04:00
Martin Konecny a418f5777c CC-4393: Please ignore AAC and Flac items for Playlist Preview and disable to preview it as a single track
-initial commit
2012-09-12 15:43:50 -04:00
Rudi Grinberg 9e7e9639ae Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-12 15:42:09 -04:00
Rudi Grinberg 2c1acf8b17 Removed reference to CC_CONFIG 2012-09-12 15:42:00 -04:00
Rudi Grinberg 6fc8df9226 Here doc'd sql 2012-09-12 15:39:02 -04:00
Rudi Grinberg b2737688cc Added space to sql squery 2012-09-12 15:36:37 -04:00