Martin Konecny
|
d534f22ce4
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 16:11:15 -04:00 |
Martin Konecny
|
505b53fa16
|
cc-1665: fix broken checkin for webstream
|
2012-09-13 16:11:06 -04:00 |
Martin Konecny
|
da72c00f28
|
CC-4370: Transitioning between two webstreams: a hiccup in the stream is audible
-fixed
|
2012-09-13 16:10:17 -04:00 |
Rudi Grinberg
|
11ef613d1c
|
comment formatting
|
2012-09-13 15:16:46 -04:00 |
Rudi Grinberg
|
e31d570a1c
|
Sql formatting
|
2012-09-13 15:13:37 -04:00 |
Rudi Grinberg
|
f754d78687
|
Formatted comments and =
|
2012-09-13 15:12:54 -04:00 |
Rudi Grinberg
|
410a3406af
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 15:05:48 -04:00 |
Martin Konecny
|
14db5053b1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 14:56:10 -04:00 |
Martin Konecny
|
203378e60a
|
More exception handling
|
2012-09-13 14:56:03 -04:00 |
Rudi Grinberg
|
8d08aa888b
|
cc-4421: Added special handling for files that mutagen returns None for.
|
2012-09-13 14:54:52 -04:00 |
James
|
b2d61f2402
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 14:22:27 -04:00 |
James
|
2293fcda01
|
CC-4393: Please ignore Flac items for Playlist Preview and disable to preview it as a single track
- fixed
|
2012-09-13 14:22:13 -04:00 |
Rudi Grinberg
|
4137602116
|
Cleaned up API controller
|
2012-09-13 14:21:15 -04:00 |
Rudi Grinberg
|
8a2703c50d
|
Made method static
|
2012-09-13 12:33:15 -04:00 |
Rudi Grinberg
|
2b9e6081a4
|
Added log for exception
|
2012-09-13 12:27:04 -04:00 |
Rudi Grinberg
|
e043816bf4
|
Removed superfluous logging
|
2012-09-13 12:23:48 -04:00 |
Rudi Grinberg
|
3fb7526fbb
|
Shortened logging
|
2012-09-13 12:15:51 -04:00 |
Rudi Grinberg
|
b28116f622
|
removed empty space
|
2012-09-13 11:34:00 -04:00 |
Rudi Grinberg
|
d564b85e7c
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-13 11:12:32 -04:00 |
denise
|
a779142a08
|
-fix commenting error
|
2012-09-13 11:12:39 -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 |
Rudi Grinberg
|
dced49c425
|
Removed unused variable
|
2012-09-13 10:52:58 -04:00 |
Rudi Grinberg
|
55993352bf
|
Removed unused variables.
|
2012-09-13 10:35:24 -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
|
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 |
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 |
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
|
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 |