Martin Konecny
|
f717efd7fb
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 13:23:14 -04:00 |
|
Martin Konecny
|
ca0fb969b7
|
fix jplayer errors for mp3 and firefox (flash)
|
2012-09-19 13:23:06 -04:00 |
james
|
51bcf04803
|
CC-4491: Calendar -> Add /Remove contents: Cannot expand/collapse Advanced Search Options
- fixed
|
2012-09-19 13:11:08 -04:00 |
|
james
|
b2e452acbb
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 12:51:13 -04:00 |
|
james
|
8652681eda
|
CC-4306: Watch folder: rescan watch directory and remove watch directory tooltips should be shifted depending on the path length
- fixed
|
2012-09-19 12:51:03 -04:00 |
Rudi Grinberg
|
0158d3f936
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 12:47:18 -04:00 |
|
Rudi Grinberg
|
a6f1d4b7ec
|
Completely reworked event contractor
|
2012-09-19 12:47:11 -04:00 |
denise
|
801edc2fcf
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 12:42:08 -04:00 |
|
denise
|
81620d4f94
|
CC-4481: Library -> Advanced Search -> Validation icon does not show up sometimes
-fixed
|
2012-09-19 12:41:54 -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
|
6001995e01
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 11:15:09 -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 |
|
denise
|
dc95ab1d00
|
CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-changed null values to empty strings
|
2012-09-19 11:05:17 -04:00 |
|
Martin Konecny
|
ddc0e8d2ba
|
remove console.log from javascript library :/
|
2012-09-19 11:04:01 -04:00 |
|
denise
|
281e7d1092
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-19 10:49:52 -04:00 |
|
denise
|
0c823af660
|
CC-4155: Playlist Builder: Style static/dynamic expansion blocks in playlist contents
-done
|
2012-09-19 10:49:17 -04:00 |
|
Rudi Grinberg
|
20b79374e2
|
Removed empty method
|
2012-09-19 10:25:29 -04:00 |
|
Rudi Grinberg
|
58620203cf
|
line wrap
|
2012-09-19 10:24:45 -04:00 |
|
Rudi Grinberg
|
fb4f7c1cb5
|
psr
|
2012-09-19 10:23:54 -04:00 |
|
Martin Konecny
|
1da4f44768
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 21:29:19 -04:00 |
|
Martin Konecny
|
7036036a86
|
CC-4476: Make all green notification boxes fade out after 5 seconds
-fixed
|
2012-09-18 21:29:02 -04:00 |
|
Martin Konecny
|
be4e02cbf1
|
multiline comment on liquidsoap dev scripts
|
2012-09-18 21:13:31 -04:00 |
|
Rudi Grinberg
|
33be48e9e3
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 18:21:00 -04:00 |
|
Rudi Grinberg
|
a9eefe21fa
|
cc-4304: Add call to save after each file reassignment
|
2012-09-18 18:20:33 -04:00 |
|
Martin Konecny
|
7e96e3ead8
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 18:19:37 -04:00 |
|
Martin Konecny
|
70192ad7c9
|
update liquidsoap generation scripts
|
2012-09-18 18:19:29 -04:00 |
|
denise
|
92b40bea0c
|
CC-4484: Some js files do not have the airtime version appended
-fixed
|
2012-09-18 17:43:13 -04:00 |
|
denise
|
5003e86eac
|
- changed smart block qtip text
|
2012-09-18 17:37:38 -04:00 |
|
denise
|
ac8d7818eb
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 17:26:44 -04:00 |
|
denise
|
f9778f2da4
|
-removed windows CRLF
|
2012-09-18 17:26:34 -04:00 |
|
Rudi Grinberg
|
be302d70c2
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 17:23:56 -04:00 |
|
Rudi Grinberg
|
bb00659687
|
cc-4483: Fixed raising exceptions before writing
|
2012-09-18 17:23:47 -04:00 |
|
denise
|
610a5da24e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 17:23:37 -04:00 |
|
denise
|
2a15269d33
|
redoing last commit
|
2012-09-18 17:23:26 -04:00 |
|
denise
|
1d699fe0b8
|
CC-4479: Buttons in dialog windows are not styled
-done
|
2012-09-18 17:22:24 -04:00 |
|
Martin Konecny
|
b69f3288d3
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 17:22:22 -04:00 |
|
Martin Konecny
|
6420e6a830
|
remove trailing whitespace
|
2012-09-18 17:22:14 -04:00 |
|
Martin Konecny
|
8787a72195
|
-ensure stream metadata formatting is correct
|
2012-09-18 17:21:57 -04:00 |
|
Rudi Grinberg
|
083bee38fd
|
cc-4483: Fixed import
|
2012-09-18 17:14:25 -04:00 |
|
Rudi Grinberg
|
0e407a05be
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 17:09:22 -04:00 |
|
Rudi Grinberg
|
a20dc7dc96
|
cc-4493: Cleaned up handling of metadata specific to filetypes.
|
2012-09-18 17:09:12 -04:00 |
|
denise
|
39e1bd5271
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 16:55:57 -04:00 |
|
denise
|
b77429164b
|
CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-removed setInterval function
|
2012-09-18 16:55:46 -04:00 |
James
|
3ecbab3259
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 16:50:57 -04:00 |
|
James
|
8433ec5445
|
CC-4482: Smart Blocks -> tracks with empty "Album" name are NOT filtered in
- fixed
|
2012-09-18 16:50:42 -04:00 |
|
denise
|
cc966ca62b
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-09-18 16:49:52 -04:00 |
|
denise
|
54ab58a9c7
|
CC-4465: Calendar: Remove warning icon on empty shows if show is in the past
-removed (commented out) code for this ticket
-postponing for now
|
2012-09-18 16:49:45 -04:00 |