badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4283 commits 1 branch 0 tags 17 MiB
Commit graph

1993 commits

Author SHA1 Message Date
Shish
cf95e28144 firefox complains about invalid email in an email field 2017-10-28 20:28:23 +01:00
Shish
7d478a809c this is PHP :( 2017-09-21 15:35:13 +01:00
Shish
977c3db1e3 PHP7 type annotations 2017-09-21 05:21:42 +01:00
Shish
df3f061533 PHPUnit 6 2017-09-21 04:16:36 +01:00
Shish
8a4616bc7d Merge branch 'develop' 2017-09-18 23:56:40 +01:00
Shish
236b444ccd fix test 2017-09-17 19:38:44 +01:00
Shish
186ea55348 safety 2017-09-17 19:11:51 +01:00
Shish
5763b77e2b strnorm 2017-09-17 19:10:10 +01:00
Shish
2c0e49507e limit / offset 2017-09-17 19:06:10 +01:00
Shish
47ff7f185e Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2017-09-17 19:00:40 +01:00
Shish
860e828c3e Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2017-09-17 18:59:59 +01:00
Shish
a32bc6448c make user list slightly more useful 2017-09-17 18:59:48 +01:00
Shish
cdbb4e8c7b add resize/script.js 2017-09-17 15:09:25 +01:00
Shish
408b45e4cc Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2017-08-24 10:17:47 +01:00
Shish
473c0f0bcb explicitly mark some block types as ignored when calculating 404ness 2017-08-24 10:17:24 +01:00
Shish
d875ab66a1 60 second post-list cache 2017-08-22 01:05:18 +01:00
im-mi
08f1475007 Fixed bookmarklets on imageboards running gelbooru 2017-08-06 20:30:38 -04:00
Shish
3c3529a4cc don't respond to autocomplete requests for blank string 2017-07-20 23:29:17 +01:00
Shish
8fcf721045 use image link for video 2017-07-20 23:28:55 +01:00
Shish
d105644d1b use php sorting for alphabetic tag list, as utf8 sort ignores punctuation 2017-06-08 09:36:59 +01:00
Shish
9f4caaddea remove some unused variables 2017-06-01 20:44:26 +01:00
Shish
53c6f6df30 bulk thumb regen 2017-06-01 20:44:17 +01:00
Shish
2666d83579 fix URL for video fallback flash player 2017-06-01 20:44:02 +01:00
jgen
fc7d96b530 Another location where $tags should be an array instead of a string. 2017-05-14 22:18:44 -07:00
jgen
cf5aacaddf Use empty array instead of array with empty string. (Thanks Shish!) 2017-05-14 14:00:20 -07:00
jgen
3ffb2da91c More checking to ensure tags is an array. 2017-05-13 23:18:47 -07:00
jgen
7ebe301ffd Check if already an array before exploding. 2017-05-13 18:01:31 -07:00
jgen
f492c6c2c3 Ensure that the Image object tag_array and the metadata array tags are always arrays. 2017-05-12 00:57:50 -07:00
jgen
c0e87ae2ae Fix issue with archive handler if no add_status method. 2017-05-11 23:43:10 -07:00
John Brooks
f934baa207 bulk_add_csv: Run Tag::explode() on the tags before passing them to handlers 
Fixes #575
 2017-04-23 02:21:39 +00:00
im-mi
495776cac1 Fixed bookmarklet when logged in on imageboards running gelbooru 2017-03-23 20:46:30 -04:00
Daku
acba60e7aa remove extra newline 2017-03-18 00:49:08 +00:00
Daku
2b62cc8171 loading SVG via <img> instead of <object> to stop inline JS execution 2017-03-18 00:13:16 +00:00
jgen
204ea1d239 And more linting. 2017-03-12 17:13:32 -07:00
Scrutinizer Auto-Fixer
1caef6d633 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-03-12 23:45:38 +00:00
jgen
7bd581b530 Scrutinizer commets. 2017-03-12 14:29:35 -07:00
Shish
44bead8b92 Merge pull request #603 from jgen/develop 
PHP Version check in the code should use a configurable value.
 2017-03-12 16:13:02 +00:00
Shish
7968f336fd Merge pull request #601 from DakuTree/develop 
Updated/removed various libs + tweaks
 2017-03-12 16:12:01 +00:00
jgen
ec4111430d More linting. 2017-03-12 00:29:10 -08:00
jgen
8de816d7dd Some more linting via PHPDoc comments. 2017-03-12 00:18:26 -08:00
jgen
ebab9eddeb Merge branch 'master' into merge-from-master 
Conflicts:
	ext/tag_list/theme.php
 2017-03-11 00:52:16 -08:00
Daku
f9d0c83d5b .audio > .audio_image (.audio is used for modernizr) 2017-03-10 19:18:35 +00:00
Daku
6fc3d51014 use HTML5 audio player, jsmediatags lib, default volume for audio/video 2017-03-10 19:16:54 +00:00
Daku
e07556c62d make sure video isn't bigger than container + linting 2017-03-10 18:26:07 +00:00
Daku
12d73c28a8 remove getID3 lib 2017-03-10 18:16:56 +00:00
Daku
84e86c4930 use mime_content_type instead of getID3 + use proper MP4 mimetype 2017-03-10 18:03:59 +00:00
jgen
9e7787de0c From Scrutinizer: The case 'r' would never be reached due to the default appearing before it. 2017-03-09 22:55:32 -08:00
jgen
ede2fcf4eb More linting and fixing 2017-03-08 23:52:31 -08:00
jgen
17307820e8 Add some PHPdoc comments as suggested by Scrutinizier 2017-03-08 23:02:26 -08:00
jgen
c379420a1f #597: Fix for XSS issue in chatbox extension. 2017-03-08 01:14:11 -08:00
Shish
e43b1b3aed Merge branch 'tag-tables' of git://github.com/im-mi/shimmie2 into im-mi-tag-tables 2016-10-10 14:19:57 +01:00
Shish
4b9278d09b Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2016-10-09 22:33:25 +01:00
Shish
623d34f20b Merge pull request #589 from im-mi/searchable-random-list 
Searchable random list
 2016-10-09 22:26:28 +01:00
Shish
7548c66a0b Merge pull request #578 from im-mi/enhance-zoom 
Enhance zoom
 2016-10-09 22:21:39 +01:00
im-mi
d5fd6f6821 url_escape tag info link tag 2016-09-28 10:26:13 -04:00
Shish
3daa83223e Merge pull request #588 from im-mi/arrow-key-nav-ignore-modifiers 
Ignore arrow key navigation when modifier keys held
 2016-09-26 15:22:06 -05:00
Shish
af0aa98649 Merge pull request #586 from im-mi/image-info-tweaks 
Image info tweaks
 2016-09-26 15:21:46 -05:00
im-mi
8805f0dd18 Remove get_ico page 
It's no longer needed because ICO now uses Image->get_image_link()
 2016-09-26 11:18:06 -04:00
im-mi
e6dd1b492c Sanitize ratings 2016-09-25 15:26:36 -04:00
im-mi
d4fda00dd9 Check for existence of POST var tag_edit__owner before using it 2016-09-25 15:26:36 -04:00
im-mi
05da5d0b4f Use Image->get_image_link() on ICO files 2016-09-25 15:26:36 -04:00
im-mi
1dd0dfc591 Read ICO header with proper sign 
Fixes width/height being read incorrectly when >= 128
 2016-09-25 10:17:46 -04:00
Shish
9c062f3385 case-insensitive wiki pages 2016-09-24 16:17:14 +01:00
im-mi
f763fc1356 React appropriately when there are no random list search results 2016-09-23 12:31:02 -04:00
im-mi
3bebe77add Made the random list searchable 2016-09-23 12:21:40 -04:00
im-mi
891e52f4b9 Ignore arrow key navigation when modifier keys held 2016-09-23 12:09:40 -04:00
im-mi
a49c5745b0 Use html_escape instead of htmlspecialchars 2016-09-14 18:08:12 -04:00
im-mi
c1083bbea1 Fixed comment-delete code-injection vulnerability 2016-09-14 17:42:32 -04:00
im-mi
3e52e332de Only show image rater if user can rate 2016-09-13 02:10:48 -04:00
im-mi
4dcee0eede Removed trailing period from "Parent: None." for consistency 2016-09-11 23:42:34 -04:00
im-mi
001a1176cc Show image rating in image info box even when not logged in 2016-09-11 23:42:34 -04:00
im-mi
e110b558b8 Hide the rating editor outside of edit mode 2016-09-11 23:42:34 -04:00
Shish
7efff25dcc Merge pull request #585 from im-mi/pool-placeholder-text 
Don't use javascript for pool search placeholder
 2016-09-07 23:49:19 +01:00
im-mi
e8c6f655b0 Don't use javascript for pool search placeholder 2016-09-07 08:43:34 -04:00
Shish
d36338d4c4 Merge pull request #582 from im-mi/minor-html-fixes 
Minor html fixes
 2016-09-07 10:31:25 +01:00
im-mi
58096e10c8 Fix tag list clipboard spacing 
This brings back the original behavior of having spaces between the columns when the tag list gets copied to the clipboard (tested in Chrome, Edge, and Firefox).

One caveat: Edge now adds multiple spaces.
 2016-09-06 22:10:09 -04:00
im-mi
73ff0e669d Use generic NavBlock instead of "Index" block on pool pages 2016-09-06 09:25:08 -04:00
im-mi
5919112477 Use tables for tag lists 2016-09-06 06:08:33 -04:00
im-mi
e5cfea028a Fixed mass source set's broken dialog 2016-09-03 14:43:56 -04:00
im-mi
91fea63319 Removed stray end tag 2016-09-03 14:26:24 -04:00
im-mi
ac53fe52de Removed obsolete language specification from <script> 2016-09-03 14:26:24 -04:00
im-mi
10d47409ad Added doctype to home page 2016-09-03 14:26:24 -04:00
im-mi
d39b084537 Properly end attribute list of tag on upload form 2016-09-03 14:26:24 -04:00
im-mi
d9903a969d Added zoom support to svg 2016-09-03 05:36:15 -04:00
im-mi
17f71094f2 Use the size of the outermost svg element 
... in case there are nested svg elements.
 2016-09-03 05:36:14 -04:00
Shish
3051334d8f be explicit that variables are variables 2016-09-02 16:19:02 +01:00
Shish
e96a5e1109 Merge pull request #579 from im-mi/fix-ico-256-256 
Fix .ico when size is 256 x 256
 2016-09-02 15:50:46 +01:00
im-mi
15ffdff387 Fix .ico when size is 256 x 256 2016-09-02 05:33:16 -04:00
im-mi
d2540a9619 Use CSS for mass tagger button styling 2016-09-02 05:30:00 -04:00
im-mi
49d6fa99da Clear the mass tagger's selection on load 
.. in case it was autocompleted by the browser.
 2016-09-02 05:29:59 -04:00
im-mi
35d2f8682c Don't save zoom mode cookie upon window resize 2016-09-02 01:14:53 -04:00
im-mi
84dbc3abff Re-apply zoom upon window resize 2016-09-02 01:12:35 -04:00
im-mi
f26fc5925b Added zoom support to ico 2016-09-02 01:12:34 -04:00
im-mi
eeb0c2b974 Only allow click-to-zoom on img 2016-09-02 01:12:33 -04:00
im-mi
b554e7505b Added zoom support to webm 2016-09-02 00:38:31 -04:00
Shish
29bdc5da22 Merge pull request #576 from im-mi/fix-pool-description-code-injection 
Update pool description formatter (code injection vulnerability)
 2016-09-01 11:18:37 +01:00
im-mi
10e8fc50d3 Fix "starts-with" header in tag list when escaping required 
This fixes the "starts-with" headers* on the tags/alphabetic page. Before, the headers would be wrong if they started with an escaped character.

This also escapes the resulting header so that it no longer generates invalid HTML in such cases.

* Note that these headers are only visible when paged tag lists is disabled.
 2016-09-01 03:33:17 -04:00
im-mi
bb64d12d9d Use TextFormattingEvent instead of raw BBCode formatter 2016-09-01 00:35:52 -04:00
Shish
bcef3fbc8f have tag sanitisation process ignore tags which are too long, fixes #565 2016-08-29 09:21:23 +01:00
im-mi
1bab0051f1 html_escape tag info link 2016-08-29 09:11:13 +01:00
im-mi
84b4ac3893 html_escape tag info link 2016-08-29 01:19:11 -04:00
Shish
a68407e12e Merge pull request #573 from im-mi/patch-2 
Fix log info section name
 2016-08-20 14:57:35 +01:00
Shish
98254ef5bd Merge pull request #572 from im-mi/video-playback-options 
Added video playback options for autoplay and loop
 2016-08-20 14:57:16 +01:00
im-mi
980e3b686b Fix log info section name 2016-08-19 21:52:48 -04:00
im-mi
cce24f9e80 Added video playback options for autoplay and loop 2016-08-19 21:25:58 -04:00
im-mi
8fe9212882 Fixed assertion failure upon upload due to incorrect type check 2016-08-19 15:55:18 -04:00
im-mi
85a3cc0a7e Fall back to file extension from path 2016-08-16 11:34:01 -04:00
im-mi
3323a50ea5 Made a few parts less site-specific 2016-08-16 11:32:34 -04:00
im-mi
adf723ad23 Fixed bookmarklet on Danbooru2 2016-08-16 11:30:34 -04:00
im-mi
91d609a4c6 Make back button go to page bookmarklet was executed on 2016-08-16 11:29:26 -04:00
im-mi
b10144492a Added supported video file extensions to bookmarklet 2016-08-16 11:28:16 -04:00
im-mi
9ba6e3f7db Remove trailing variables from image address 2016-08-16 11:27:22 -04:00
im-mi
8f974fba73 Fixed uploading scaled images from Gelbooru when logged in 2016-08-16 11:26:32 -04:00
im-mi
b24977e110 Fixed tag corruption bug 
If there was no newline at the end of the input, then the last tag would get corrupted.
 2016-08-16 11:25:04 -04:00
Shish
89dffd569a and mass tagger 2016-07-30 23:41:42 +01:00
Shish
26b2cd5c16 derp 2016-07-30 23:06:42 +01:00
Shish
bed04a1230 assert that metadata['tags'] is an array 2016-07-30 23:02:14 +01:00
Shish
ffce1a4683 more hinting 2016-07-30 22:54:42 +01:00
Shish
b81e8a2db8 also explode tags on transload input 2016-07-30 22:45:44 +01:00
Shish
7be951b271 Convert tags from user-supplied string to array once, on input 
This results in a fuckton of refactoring and code cancelling out
other code -- we no longer have a whole bunch of places trying
to support string params and array params, and doing their own
esaping and unescaping, never being quite sure if the data they've
been passed is escaped or not.

Also adds a bunch of type hinting, since we can now know what
data we're dealing with better.
 2016-07-30 22:11:49 +01:00
Shish
bc3e482247 more image report display options 2016-07-30 15:04:34 +01:00
Shish
8c8106c6a9 fix index var access 2016-07-03 11:48:08 +01:00
Shish
bb35421b05 Load AutoComplete before Home, so that the headers show up 2016-06-26 18:57:53 +01:00
Shish
6febdec7b5 more explicit variable types 2016-06-19 23:05:57 +01:00
Shish
f8b7909426 ExtensionInfo isn't private 2016-06-19 22:15:46 +01:00
Shish
333c74ba35 typo 2016-06-19 17:48:10 +01:00
Shish
dc10a18086 lots of minor doc tweaks, type hints, etc 2016-06-19 17:41:40 +01:00
Shish
edd3e49a2f mark wildcard test incomplete on pgsql / sqlite 2016-06-19 14:06:26 +01:00
Daku
a8d9f8ce5b make sure prev/next links aren't clipped outside the box 2016-06-19 11:56:41 +01:00
Daku
f973fcc9fa basic autocomplete support for metatags 2016-06-19 10:07:56 +01:00
Daku
03240220d4 make sure to get proper tag value + use selected tag if possible 2016-06-19 09:49:55 +01:00
Daku
862a84677f add docs column, showing what extensions have documentation 
previously it made every ext name into a link to /ext_doc, regardless if it had docs or not
 2016-06-19 05:05:12 +01:00
Daku
c0601640bf only show link if extension actually has documentation 2016-06-19 05:04:59 +01:00
Daku
5ae10473e3 closing tag is unneeded 2016-06-19 05:01:13 +01:00
Daku
6486a4757f js scrutinizer fixes 2016-06-19 05:00:09 +01:00
Daku
b75638cace get_last_insert_id requires param for pgsql support 2016-06-19 04:57:14 +01:00
Shish
4577ff70ef more linty bits 2016-06-18 19:26:56 +01:00
Shish
cfd3a9d248 lint fixes 2016-06-18 19:00:56 +01:00
Shish
24973ada17 don't run linter on ext/*/lib/* 2016-06-18 19:00:53 +01:00
Shish
0fd96fcdae remove incomplete and unmaintained bookmarks ext, see #532 2016-06-18 18:26:11 +01:00
Shish
06ee5347c7 https support for gravatars 2016-06-18 15:56:24 +01:00
Shish
0ff6da6d3c Merge #555 2016-06-18 15:16:47 +01:00
Daku
b5d56214cd fix case-insensitive autocomplete on postgres 2016-06-18 14:45:21 +01:00
Shish
20d0edb332 Merge pull request #556 from shish/html-headers 
fix and use get_all_html_headers()
 2016-06-18 14:05:44 +01:00
Daku
5d5b1d7059 this should be set to $res 2016-06-18 14:03:37 +01:00
Daku
56e5348470 autocomplete caching 
see 7dce8da850
 2016-06-18 13:20:07 +01:00
Daku
2546621c59 sort autocomplete by score + show score 2016-06-18 13:20:04 +01:00
Shish
cfc1268354 update non-layout.class.php uses of html_headers too 2016-06-18 12:49:46 +01:00
Daku
4bd9ee1c7f fix autocomplete search not looking correct on home page 2016-06-18 12:25:39 +01:00
Daku
6b6e4f04b6 html_headers should be properly sorted 2016-06-18 12:25:22 +01:00