Merge branch 'master' of github.com:MayhemYDG/4chan-x into qr

This commit is contained in:
Nicolas Stepien 2011-12-26 17:48:26 +01:00
commit 6d2f082be3
3 changed files with 4 additions and 3 deletions

View File

@ -133,7 +133,7 @@
filesize: '',
md5: ''
},
flavors: ['http://iqdb.org/?url=', 'http://google.com/searchbyimage?image_url=', '#http://tineye.com/search?url=', '#http://saucenao.com/search.php?db=999&url=', '#http://3d.iqdb.org/?url=', '#http://regex.info/exif.cgi?imgurl=', '#http://imgur.com/upload?url='].join('\n'),
flavors: ['http://iqdb.org/?url=', 'http://google.com/searchbyimage?image_url=', '#http://tineye.com/search?url=', '#http://saucenao.com/search.php?db=999&url=', '#http://3d.iqdb.org/?url=', '#http://regex.info/exif.cgi?imgurl=', '#http://imgur.com/upload?url=', '#http://ompldr.org/upload?url1='].join('\n'),
time: '%m/%d/%y(%a)%H:%M',
backlink: '>>%id',
favicon: 'ferongr',
@ -2841,7 +2841,6 @@
text-decoration: none;\
}\
\
[hidden], /* Firefox bug: hidden tables are not hidden. fixed in 9.0 */\
.thread.stub > :not(.block),\
#content > [name=tab]:not(:checked) + div,\
#updater:not(:hover) > :not(.move),\

View File

@ -1,4 +1,6 @@
master
- mayhem
add omploader to the list of optional flavors (http://ompldr.org/upload?url1=)
2.23.7
- mayhem

View File

@ -64,6 +64,7 @@ config =
'#http://3d.iqdb.org/?url='
'#http://regex.info/exif.cgi?imgurl='
'#http://imgur.com/upload?url='
'#http://ompldr.org/upload?url1='
].join '\n'
time: '%m/%d/%y(%a)%H:%M'
backlink: '>>%id'
@ -2216,7 +2217,6 @@ Main =
text-decoration: none;
}
[hidden], /* Firefox bug: hidden tables are not hidden. fixed in 9.0 */
.thread.stub > :not(.block),
#content > [name=tab]:not(:checked) + div,
#updater:not(:hover) > :not(.move),