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 |
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 |
Vladimir
|
77824afdd3
|
Added Bootstrap CSS, images and JS for new buttons and dropdown menues
|
2012-09-12 21:23:25 +02:00 |
Rudi Grinberg
|
d1b4ce3de6
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 15:19:57 -04:00 |
Rudi Grinberg
|
a432665146
|
Changed to heredoc
|
2012-09-12 15:19:39 -04:00 |
denise
|
07ac651f71
|
- move title and creator to top of library column view
|
2012-09-12 15:09:07 -04:00 |
Rudi Grinberg
|
92532cb708
|
cc-4394: Added m4a
|
2012-09-12 14:54:11 -04:00 |
denise
|
b43a1e3032
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 14:27:29 -04:00 |
denise
|
54d18b7bcd
|
CC-4382: Editing the color of a repeating show gives error message
-fixed
|
2012-09-12 14:27:17 -04:00 |
Rudi Grinberg
|
d62ba61ea6
|
Formatting schedule.php
|
2012-09-12 14:19:02 -04:00 |
Rudi Grinberg
|
806fd83ccc
|
Reformatted schedule
|
2012-09-12 14:14:55 -04:00 |
Rudi Grinberg
|
dd68f6d945
|
Changed schedule to use james' helper function
|
2012-09-12 13:44:20 -04:00 |
Rudi Grinberg
|
7f9642dcd2
|
Fixed typo
|
2012-09-12 12:18:06 -04:00 |
Rudi Grinberg
|
195008d1e4
|
more pdo fix
|
2012-09-12 12:16:53 -04:00 |
Rudi Grinberg
|
845ec23fa3
|
fixed booboo
|
2012-09-12 12:15:47 -04:00 |
Rudi Grinberg
|
ad75849a6f
|
Fixed array_map over query instances
|
2012-09-12 12:09:38 -04:00 |
Rudi Grinberg
|
d194ff1809
|
PDO'd a few things missed before in cancelShow()
|
2012-09-12 12:05:03 -04:00 |
Rudi Grinberg
|
6d32c03351
|
getHosts() changed sql style
|
2012-09-12 12:00:53 -04:00 |
Rudi Grinberg
|
cebfdd6558
|
Changed sql string to heredoc
|
2012-09-12 11:59:27 -04:00 |
Rudi Grinberg
|
6519512924
|
fixed array_map over iterable
|
2012-09-12 11:54:37 -04:00 |
Rudi Grinberg
|
f47593575c
|
switch defaults for verbose stack trace
|
2012-09-12 11:51:11 -04:00 |
Rudi Grinberg
|
8b433de006
|
Made verbose trace opt out.
|
2012-09-12 11:45:08 -04:00 |
Rudi Grinberg
|
d69391d2dd
|
Formatted Block.php
|
2012-09-12 11:35:28 -04:00 |
Rudi Grinberg
|
7b41d94352
|
Reforamtted Block.php
|
2012-09-12 11:31:41 -04:00 |
Rudi Grinberg
|
e4a072004e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-12 11:10:34 -04:00 |
Rudi Grinberg
|
e0286b112f
|
cc-4292: Removed unnecessary code related to md5.
|
2012-09-12 11:10:25 -04:00 |
denise
|
1461178118
|
CC-4375: DB Upgrade Error, from 2.0.3 to 2.2
-fixed
|
2012-09-12 10:46:27 -04:00 |
Rudi Grinberg
|
6b8cb52572
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 18:23:01 -04:00 |
Rudi Grinberg
|
faa04a2f5c
|
Refactored RecallByX
|
2012-09-11 18:22:46 -04:00 |
Rudi Grinberg
|
975830ff90
|
Removed wrong comments
|
2012-09-11 18:22:24 -04:00 |
Rudi Grinberg
|
77215d175c
|
More verbose exceptions
|
2012-09-11 18:22:12 -04:00 |
Rudi Grinberg
|
e2d69df4a6
|
Removed unused code
|
2012-09-11 17:51:39 -04:00 |
Rudi Grinberg
|
dc91db1f46
|
formatting
|
2012-09-11 17:48:08 -04:00 |
denise
|
acaf5f76c2
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 17:40:36 -04:00 |
denise
|
ceccb547c2
|
CC-4355: Smart block criteria do not match library columns or metadata editor
-put library column filter in alphabetical order to match smart block criteria order
|
2012-09-11 17:39:47 -04:00 |
Rudi Grinberg
|
bc5718ec09
|
logging removed
|
2012-09-11 17:39:28 -04:00 |
Rudi Grinberg
|
cc3ba90ec3
|
added debugging
|
2012-09-11 17:32:26 -04:00 |
Rudi Grinberg
|
32297111f5
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 17:23:19 -04:00 |
Rudi Grinberg
|
b8db419717
|
All hands for America. Added robust debugging
|
2012-09-11 17:23:07 -04:00 |
Rudi Grinberg
|
fc8b2096af
|
Added debugging for Clifford
|
2012-09-11 17:21:20 -04:00 |
denise
|
c6ab540120
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-11 17:19:12 -04:00 |
denise
|
f1b8ada1e6
|
- removed logging
|
2012-09-11 17:19:02 -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
|
03d3dc8312
|
Added good debugging for removed_watch_directory
|
2012-09-11 17:03:49 -04:00 |