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

1919 commits

Author SHA1 Message Date
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
Daku
2a747c8f2b move home css to style.css 2016-06-18 12:10:37 +01:00
Daku
559a4c7e40 move autocomplete js to script.js so it's cached 2016-06-18 11:58:41 +01:00
Daku
c59995c807 search button can sometimes be on same line as input 2016-06-18 11:47:04 +01:00
Daku
b6e181efb1 excess whitespace 2016-06-18 11:24:18 +01:00
Daku
a9e3ef26be space should always create new tag 2016-06-18 08:06:59 +01:00
Daku
1db62901be disallow spaces in tags 2016-06-18 07:41:59 +01:00
Daku
78c2731a12 move notes libs to ext folder, fix a few bugs 
it would be nice to take this out of beta, but it still has major issues with image resizing / unable to edit or delete notes
 2016-06-18 06:28:33 +01:00
Daku
9e7c318df0 notes ext code cleanup 
initial prep to fix & take the ext out of beta
 2016-06-18 06:27:44 +01:00
Daku
b9893cbbda $_POST["tags"] isn't always set 2016-06-18 06:27:41 +01:00
Daku
caed53de6a jQuery.cookie is deprecated so use js-cookie instead (+ composer), some js tweaking too 
Conflicts:
	ext/blotter/script.js
	ext/handle_pixel/script.js
	ext/index/script.js
	ext/pools/script.js
	lib/shimmie.js
 2016-06-18 06:27:32 +01:00
Daku
951323abcf default handle_video thumbgen to ffmpeg if ffmpeg in path & is_executable 2016-06-18 06:20:52 +01:00
Daku
b0daab8766 move from Jaris > MediaElement for <video> fallback + use composer 
also made it so the video element is no longer bigger than parent div
 2016-06-18 06:20:49 +01:00
Daku
ba6ab8fb16 move S3.lib to ext folder 
toggleable exts should really keep any libs they use in their own dir
 2016-06-18 06:17:15 +01:00
Daku
d5a58916f7 get recaptcha lib with composer + fixes #498 2016-06-18 06:17:07 +01:00
Daku
57fb4e0a34 grab tablesorter lib with composer 2016-06-18 06:17:04 +01:00
Daku
516488a625 load akismet via composer 
note: we should probably be using a more recent library for this, but there doesn't seem to be any general ones..
 2016-06-18 06:16:31 +01:00
Daku
f17812c64b working autocomplete 2016-06-18 06:16:21 +01:00
Daku
1bfec55690 tag lib for autocomplete 
--not added autocomplete yet
 2016-06-18 06:16:17 +01:00
Daku
a7021e190e Merge pull request #554 from shish/js-cookie-update 
migrate to a non-deprecated (and dependency-free) cookie library
 2016-06-18 03:34:12 +01:00
Shish
7dce8da850 caching for autocomplete 2016-06-18 01:19:34 +01:00
Shish
79648b04d2 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2016-06-18 01:18:29 +01:00
Shish
7bc9a73357 migrate to a non-deprecated (and dependency-free) cookie library 2016-06-18 00:00:02 +01:00
Shish
dda634b068 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2016-06-17 23:42:20 +01:00
Shish
76c2815b2b unit test bettering 2016-06-17 23:42:12 +01:00
Shish
57fa354842 fnmatch has a string length limit :| 2016-06-17 22:51:30 +01:00
Shish
190d8bd7d7 log api stats seperately 2016-06-17 22:48:28 +01:00
HungryFeline
94ba42fc70 Set ffmpeg's "overwrite output files" switch (-y) 
Regenerate thumbnail doesn't work since the output file already exists and ffmpeg expects the user to decide wether to replace the file or not. With the -y switch set, ffmpeg does so without asking.

https://ffmpeg.org/ffmpeg.html#Main-options
 2016-06-16 16:40:51 +02:00
Shish
3d05c2896a expand test cases 2016-06-07 01:56:05 +01:00
Shish
c41c9d680f search tests 2016-06-06 22:42:40 +01:00
Shish
43eed32958 Merge pull request #551 from shish/contact-link 
Have contact_link support http: and mailto:
 2016-06-06 12:37:27 +01:00
Shish
aeeaabb22e allow both http: and mailto: contact links 2016-06-06 12:12:25 +01:00
Shish
8326ef631f Merge pull request #546 from DakuTree/fix-relationships 
Fix relationships ext checking for TRUE/FALSE instead of Y/N
 2016-05-22 18:11:57 +01:00
Daku
44876a58d9 we should be using bool_escape instead... 2016-05-22 16:17:31 +01:00
Shish
3e57f725d3 update ban message 2016-05-22 16:12:43 +01:00
Daku
a3296e18ae create index for has_children 2016-05-11 14:49:22 +01:00
Daku
32dbdccd00 has_children uses Y/N, not TRUE/FALSE 2016-05-10 21:15:50 +01:00
Matthew Barbour
898bcfae94 Fixes for bulk add results 2016-03-21 18:14:48 -05:00
Daku
9235025165 fix integrity constraint violations when mass-editting an image that already contains the new tag 2016-01-24 09:56:47 +00:00
Daku
6d1c7c414b mysql < 5.6 has terrible subquery optimization, using EXISTS / JOIN fixes this 2015-12-04 11:38:44 +00:00
Shish
ac9dc1b8d8 Merge pull request #523 from DakuTree/patch-tagevent 
Move tag sanitization, alias resolving & tag parsing from set_tags > TagSetEvent
 2015-10-26 19:22:08 +00:00
William Crandell
7b8d8c2a2d chatbox bugfix 
might cause new bugs checking into this now
 2015-10-26 11:22:57 -04:00
William Crandell
b7114a142e Hotfix for better block id character filtering 2015-10-26 09:20:09 -04:00
Daniel Oaks
144ac6bd89 Fix the notes extension to work properly on dbs other than MySQL 2015-10-15 19:31:39 +10:00
Shish
3aed2abec7 don't complain if one image in a bulk revert doesn't exist 2015-10-12 19:17:16 +01:00
Daku
de761c11d7 speed: don't check tag for metatag if doesn't contain : or = 2015-10-08 19:20:40 +01:00
Daku
43d0a297b8 move metatag parsing to after set_tags is sent, rather than before 2015-10-08 18:58:52 +01:00
Daku
6ff80ab2c8 move tag sanitization, alias checking & tag parsing to TagSetEvent 2015-10-08 18:22:20 +01:00
Daku
23b9d7d8da improved metatag regex 2015-10-08 18:03:45 +01:00
Shish
d30665d274 more deduping 2015-09-27 21:09:27 +01:00
Shish
1ac88e8923 more comments 2015-09-27 12:38:48 +01:00
Shish
80f5a016c2 or else 2015-09-27 11:01:59 +01:00
Shish
cdcd762a52 more comments 2015-09-27 02:17:44 +01:00
Shish
78c44c7067 more tidying shimmie api and user page 2015-09-27 02:00:02 +01:00
Shish
793bc3614b loooooooads of artists refactoring and tidying 2015-09-27 01:03:58 +01:00
Shish
b9a0278f6e clean up danbooru api code 2015-09-26 22:50:05 +01:00
Shish
ff13e58f8f clamp to a valid value 2015-09-26 20:03:30 +01:00
Shish
e482f97955 more clamping 2015-09-26 19:53:15 +01:00
Shish
5a8df90fd9 splitting up huge functions in ext/comment 2015-09-26 19:14:11 +01:00
Shish
8c1e3bc92a mark tests as public 2015-09-26 11:17:13 +01:00
Shish
c54e336695 mark tests as incomplete rather than commenting them out 2015-09-24 23:16:38 +01:00
Shish
c337abe280 skip tests for extensions who don't support the current db 2015-09-21 10:05:32 +01:00
Shish
98d71f527d test fix 2015-09-20 23:24:26 +01:00
Shish
82ab2a8305 faster tests 2015-09-20 23:10:33 +01:00
Shish
fc2bbefcb9 test all the things 2015-09-20 22:40:04 +01:00
Shish
13dfb8861f more tests 2015-09-20 21:20:28 +01:00
Shish
2600ef042b setup tests 2015-09-20 20:44:34 +01:00
Shish
7bfc959547 upload tests 2015-09-20 20:28:27 +01:00
Shish
ff8da5be8e word filter tests 2015-09-20 20:18:55 +01:00
Shish
90cd823ece fix liveness testing, and comments tests 2015-09-20 20:05:06 +01:00
Shish
0617079afb test 2015-09-20 20:04:16 +01:00
Shish
83a1336b76 more test 2015-09-20 20:04:16 +01:00
Shish
ec484c1144 more phpunit-ing 2015-09-20 20:04:13 +01:00
Shish
2d622cf908 put test svg in a file 2015-09-20 20:03:29 +01:00
Shish
9af5995dcc PHPUnit proof of concept 2015-09-20 20:03:29 +01:00
Shish
e3959e5ec8 remove simpletest 2015-09-20 20:03:29 +01:00
Shish
ba3a61052f timeout on varnish purger 2015-09-20 20:02:36 +01:00
Shish
ffc636515f remove dead code 2015-09-20 20:02:34 +01:00
Shish
147b47a78c add comment style 2015-09-20 20:02:30 +01:00
Shish
1fc5fb755a handle null in tag_editcloud 2015-09-20 13:20:26 +01:00
Shish
35a4f385b3 phpstorm tidying 2015-09-12 11:43:28 +01:00
Daku
a55306f4be don't throw no handler error if empty directory / directory doesn't exist 2015-08-12 06:58:44 +01:00
Daku
ebfcf9389e using links as block title doesn't play nice with .js, so specify ID 
blocks use title as ID, which will break if the title is a link
 2015-08-10 00:45:06 +01:00
Shish
9ff2ef390d make handle_404 handle blotter 2015-08-09 13:40:34 +01:00
Shish
e415bd3fca more database support 2015-08-09 12:20:43 +01:00
Shish
0ef8db8371 not all requests have remote_addr 2015-08-09 12:20:37 +01:00
Shish
a70ca33f96 fix typo 2015-08-08 23:04:36 +01:00
Shish
df56213ec3 allow exts to mark themselves as not supporting sqlite 2015-08-08 22:23:27 +01:00
Shish
65289ed9c8 skip to latest db 2015-08-08 22:18:54 +01:00
Shish
45d090054b set_default_bool should take a bool, always 2015-08-08 22:18:25 +01:00
Shish
fa2f17817e scrutinizing 2015-08-04 13:53:58 +01:00
Shish
7762b2c703 do InitExtEvent in bootstrap, before user exists 2015-08-03 15:49:38 +01:00
Shish
83435e3266 set cookies on Page object 2015-08-03 15:49:36 +01:00
Shish
eb246ef1ee count_execs is legacy code from adodb anyway... remove another global 2015-08-02 21:31:55 +01:00
Shish
ec5d9bb6f4 more sensible naming 2015-08-02 21:23:45 +01:00
Shish
18490ed488 more global removal 2015-08-02 20:39:41 +01:00
Shish
c17250b6b9 there is no more purge unused tags 2015-08-02 19:41:06 +01:00
Shish
90e86b99ae page->set_code() to set HTTP status 2015-08-02 19:40:57 +01:00
Shish
e5e7f891e2 scrutinizer suggestions 2015-07-21 01:20:53 +01:00
Shish
7064e9ffcd merge 2015-07-20 23:49:33 +01:00
Shish
f3c9f57e62 Merge pull request #491 from shish/more_https 
More https
 2015-07-20 23:28:21 +01:00
Shish
90539a32bc validate_input() function 2015-07-19 14:46:28 +01:00
Shish
06d8c7a879 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2015-07-12 22:40:34 +01:00
Shish
feecdd4d13 support for changing usernames 2015-07-12 22:14:57 +01:00
Shish
1907dc29bc cache event log size for 600 seconds, not cache the value '600' forever... 2015-07-12 22:12:37 +01:00
Shish
9f9f2735f4 case-insensitive autocomplete 2015-07-04 12:26:29 +01:00
Shish
cabc600207 show all html headers on the front page, so autocomplete can work 2015-07-04 12:25:23 +01:00
jgen
4bf56364eb Missed one use of $headers. Was used in only one other place. Also, change the function so that if anyone else uses it in the future it doesn't throw warnings. 2015-06-01 17:57:34 -07:00
jgen
6a6480181d Move zoom function inside closure so it isn't potentially knocked out by other functions (with same name) in global scope. 2015-06-01 15:38:04 -07:00
Shish
1aaaeb69fb fix merge 2015-06-01 16:00:03 +01:00
Shish
21d96db771 remove unused var 2015-06-01 10:50:26 +01:00
jgen
1c43fd9dc4 Remove duplicate 'class' attribute on html element. Fixed tag edit box so that auto complete works again. 2015-06-01 02:39:08 -07:00
jgen
edc9e07919 Only examine the headers if we actually have them. 2015-05-31 21:39:22 -07:00
Shish
2aea79ac35 merge common parts of handle_archive and bulk_add 2015-05-24 16:08:46 +01:00
Shish
9a28f0f51a split vote recounting on user deletion into chunks 2015-05-18 23:40:21 +01:00
Shish
bb490ac413 stop comment info from concealing comments 2015-04-26 12:54:54 +01:00
Shish
98c1c763aa show when tags/sources were set on the history pages 2015-04-26 12:45:32 +01:00
Daku
be18140944 added option to hide random link on paginator (only post/list should show now) 2015-04-18 10:41:32 +01:00
Daku
a7de21523f user confirm on mass source set 2015-04-18 10:40:02 +01:00
Daku
83c0c284ac fix first setup block positioning 2015-04-18 10:39:56 +01:00
Daku
b1ec0c434e move tag category css to it's own file 2015-04-18 10:39:42 +01:00
Daku
8c2d8df81d use html5 input types 
we would use type='url' for source but non-urls can be used as source too
 2015-04-18 10:39:34 +01:00
Daku
7166259cc5 autocomplete='off' for tag input 
this disables autocomplete/captilize on "most" mobile keyboards
autocompletejs still works with this off
 2015-04-18 10:39:22 +01:00
Daku
845543b2ba fixes #478 - import now uses AddAliasEvent rather than manually adding itself 2015-04-18 10:39:09 +01:00
Daku
6289402f2e make sure aliases.csv is downloaded, and not opened in browser 
SEE: http://stackoverflow.com/questions/6468517
 2015-04-18 10:38:57 +01:00
Shish
97a0aa7e4c give unread PM count a class, so custom themes can make it red if they wish 2015-04-18 10:31:24 +01:00
Shish
519749559f Merge pull request #481 from jgen/develop 
Fix XSS in arrowkey extension
 2015-03-13 08:37:08 +00:00
jgen
adec7e1763 Fix XSS vulnerability. 2015-03-12 23:12:27 -07:00
jgen
3511711008 Should be consistent about using the int_escape method. 2015-03-12 23:12:06 -07:00
Shish
bdbf95f2fa Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2015-02-08 04:28:03 +00:00
Shish
f92f286fa0 remove all reports from user 2015-02-08 04:27:54 +00:00
Shish
610b144fb2 minor CSS tweak 2015-02-07 22:29:07 +00:00
jgen
8e3fc1da9f Change generated links to be aware of HTTPS. 2015-02-02 00:13:05 -08:00
Shish
d523781481 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2015-01-30 03:54:31 +00:00
Shish
52dc36cfa6 str_getcsv rather than explode, for handling quotes 2015-01-30 03:53:58 +00:00
Shish
09d03d9036 allow dashes and underscores in static files, for apple-touch-icon 2015-01-25 22:58:25 +00:00
Shish
0d2d7eedd7 minor opt-in class to style 2015-01-25 06:55:37 +00:00
Shish
8eee2c0c92 logstash logger 2015-01-24 16:57:28 +00:00
Shish
67628816a4 Finally commit ext for purging varnish on-demand 2015-01-24 16:54:18 +00:00
Shish
b47e4aacb1 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2015-01-24 16:44:33 +00:00
Shish
67fc50e6c3 Merge pull request #475 from Diftraku/ouroboros_api 
Fix duplicate handling
 2015-01-24 08:41:06 -08:00
Shish
8dc27c6b97 home page mobile tweaks 2015-01-08 23:31:24 +00:00
Diftraku
3af95b5ebe Fix duplicate handling 
Now with 17% less fat:
* Moved validation logic into OuroborosPost for sanity
* Added sanity checks for OuroborosPost values
* Changed defaults to be more sane (mainly tags)
* OuroborosPost now accepts an MD5 hash along the metadata (like it
should!)
* Fixed dupe handling logic
 2015-01-05 13:47:53 +02:00
Shish
0fcfa49e75 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2014-12-18 14:38:37 +00:00
Shish
be4ae9da32 fix missing global (how did this pass tests? o.o) 2014-12-18 14:38:22 +00:00
Shish
caa2691bb9 Merge pull request #468 from jgen/develop 
Allow Shimmie to work with older versions of FFmpeg
 2014-12-17 13:44:25 +00:00
Shish
7bcf2fc29e Merge pull request #465 from shish/min_space_config 
Turn MIN_FREE_SPACE into a userspace config option
 2014-12-17 13:41:55 +00:00
Shish
c0279565f4 Merge pull request #462 from shish/bypass_comment_checks 
Allow admins to bypass comment checks (rate limit etc)
 2014-12-17 13:40:06 +00:00
jgen
d878526487 Button should say "Regenerate Thumbnail" for clarity. 2014-12-14 16:07:00 -08:00
jgen
95b94bd115 Some minor linting. 2014-12-14 16:06:31 -08:00
jgen
433d67453c This fixes issue #466. You can now optionally generate thumbnails for videos with the newer versions of FFmpeg that take into account the aspect ratio. 2014-12-14 15:22:44 -08:00
jgen
5012b15ce9 Comment as to why the default is to ignore the aspect ratio. 2014-12-14 15:20:47 -08:00
jgen
2ff036d250 Remove unused variables. 2014-12-14 15:19:59 -08:00
jgen
02efa180de Add a default option to ignore aspect ratio when creating a thumbnail with FFmpeg. 2014-12-13 16:54:21 -08:00
Shish
e1a7986239 Merge remote-tracking branch 'origin/master' into develop 2014-12-13 01:52:34 +00:00
Thasan
f2fc69cef4 Fixing "rating=safe" search bug 2014-12-13 03:23:44 +02:00
Shish
40734ef711 turn MIN_FREE_SPACE into a userspace config option 2014-12-07 13:54:47 +00:00
Shish
5d099c06f9 remove references to unused cache values 2014-12-06 23:51:58 +00:00
Shish
1bf3fba756 Merge branch 'develop' 2014-12-06 23:46:14 +00:00
Shish
8c1eb60367 Remove twitter_soc; any twitter ext will need to be different, fixes #395 2014-12-01 14:16:53 +00:00
Shish
a3880e2b49 Merge pull request #463 from shish/user_list_link 
add a link to the user list, fixes #460
 2014-12-01 14:04:04 +00:00
Shish
fcb7166b0c Merge pull request #461 from shish/dbtime 
Log time spent in database (and some other minor performance debugging tweaks)
 2014-12-01 14:03:28 +00:00
Shish
7f22f99aaa add a link to the user list, fixes #460 2014-11-30 15:42:43 +00:00
Shish
8511399076 bypass ban_words too 2014-11-30 13:52:29 +00:00
Shish
010b0620df add a user flag for bypassing comment checks 2014-11-30 13:52:29 +00:00
Shish
c0dfd9adc0 a little extra consistency in cache variable names 2014-11-26 13:09:49 +00:00
Shish
4721d666cd log time spent waiting for database queries 2014-11-26 13:09:22 +00:00
Shish
a846c16bd7 Merge pull request #457 from shish/show_bad_word_bans 
Show when a banned regex is invalid
 2014-11-10 23:57:17 +00:00
Shish
565b466721 Merge pull request #450 from DakuTree/patch-zipcheck 
Hide "Download All Images" if ZipArchive doesn't exist/not enabled - Fixes #441
 2014-10-15 18:33:30 +01:00
Shish
824d078ece Show when a banned regex is invalid 2014-10-15 18:31:06 +01:00
Shish
63a619d295 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2014-10-10 22:20:29 +01:00
Shish
ccfc22aa8b make block placement more explicit 2014-10-10 22:19:54 +01:00
Shish
a066c5ac0e regex for word filtering 2014-10-10 22:19:20 +01:00
Daku
693b18f50c fix "Image Only" not working with nice_urls disabled 2014-09-02 17:06:39 +01:00
Daku
1cb59572f9 Merge pull request #445 from shish/bbcode_anchor 
[anchor] bbcode tag, to make linking to parts of a page easier
 2014-08-30 13:37:01 +01:00