Commit graph

2796 commits

Author SHA1 Message Date
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
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
Shish
c651845401 make anchors visible in the page, not just in the markup 2014-08-30 13:18:14 +01:00
Daku
ab3366e518 Hide "Download All Images" if ZipArchive doesn't exist/not enabled 2014-08-26 16:16:15 +01:00
Daku
9719464c8b Merge pull request #448 from shish/theme_breakdown
Make IndexTheme a little easier to customise
2014-08-26 15:51:41 +01:00
Shish
fc4bd27529 simplify user_can_edit_user -- many nested if/else's to one if 2014-08-24 20:43:12 +01:00
Shish
9c71f59061 [anchor] bbcode tag, to make linking to parts of a page easier 2014-08-24 16:55:00 +01:00
Shish
50d40c1c81 give IndexTheme:display_page some sub-functions to make them easier to customise 2014-08-24 16:29:32 +01:00
Geosohh
3185af3280 Remove tags from images using mass_tagger
Using negative tags removes them from the selected images.
2014-07-29 19:11:29 -03:00
Geosohh
3d2c55a9d5 Fixed mass_tagger bug when selecting images with similar ids
The mass_tagger extension behaves incorrectly if the id of an image is
the same as the ending of the id of another image.

Example:
Select image 143: var string == "143:"
Select image 113: var string == "143:113:"
Select image 43: var string == "1113:"
So either the wrong image will be tagged, or it will cause an error if
that image doesn't exist.
2014-07-29 18:02:50 -03:00
Daku
b89dd52b47 bumped the tag char limit to 255
there wasn't really much reason to have this so low, and this puts it to the same limit as other booru software
2014-06-19 23:14:11 +01:00
Shish
9069b0c1fb Merge pull request #429 from DakuTree/patch-misc
Pool updates + other misc tweaks.
2014-06-09 21:05:19 +01:00
Pascal 'muhkuh2005' Borkenhagen
3468480864 Added check to initialize tags, when only categorized tags are available for image 2014-06-09 14:07:24 +00:00
Daku
5bd7369d7c Merge pull request #427 from shish/bcrypt
Use bcrypt for password storage
2014-06-05 18:00:19 +01:00
Daku
24f2741a50 rating_to_name no longer exists
was removed in commit eadf1d9e87
2014-06-01 21:56:33 +01:00
Daku
90232b0a4c rename "index" to "pool index" to help differentiate between the two index links 2014-05-31 18:20:57 +01:00
Daku
183a2c7ae6 docs + added pool:lastcreated metatag which uses the ID of the last pool created by the user 2014-05-30 16:04:12 +01:00
Daku
df6b9245ec optional setting to set pool order with the pool metatag
example: pool:10:3 (pool #10 with order 3)
2014-05-30 15:21:42 +01:00
Daku
77769d2c17 allow setting of image_order via add_post() 2014-05-30 15:21:32 +01:00
Daku
bca4fdffa5 make sure pool nav & manage pool show when needed 2014-05-30 14:41:03 +01:00
Daku
6a14360e7a option to use autoincrementing pool order when post is added
rather than having everything default to 0 order
2014-05-30 13:12:34 +01:00
Daku
1dc668ca41 main.php shouldn't be generating HTML.. 2014-05-30 11:55:53 +01:00
Daku
f228a8eb4f pools css should be in it's own folder, not the themes 2014-05-30 00:23:12 +01:00
Daku
1dada97adc prev link for pools 2014-05-30 00:22:04 +01:00
Daku
77607e0c02 keep aspect ratio when created video thumbnail 2014-05-29 18:40:17 +01:00
Shish
a3f9e12ea0 octal for permissions 2014-05-24 10:18:44 +01:00
Shish
1b655704f3 Merge remote branch 'yaoifox/patch-1' into develop 2014-05-24 10:18:10 +01:00
Shish
d5c5cfd428 Merge pull request #426 from DakuTree/patch-notesfix
Fix for #422 + Fix Note Positioning
2014-05-24 10:12:58 +01:00
Shish
eb51a9b639 migrate to bcrypt for password storage 2014-05-24 09:47:42 +01:00
Daku
36713803e3 Merge pull request #418 from jgen/develop
Even more linting and cleaning!
2014-05-23 23:24:32 +01:00
Daku
ae0a4725a0 avoid loading imgnotes until image is fully loaded 2014-05-23 21:46:13 +01:00
Daku
3d11df44a9 fix various bugs with notes ext 2014-05-23 20:48:11 +01:00
Daku
64e2565236 check for lowercase header if camelcase header doesn't exist
fixes #423
2014-05-19 07:32:16 +01:00
YaoiFox
349d7bfa4d curl --silent now
curl --silent now
2014-05-07 07:10:23 +02:00
YaoiFox
f5f48d8a0b Update main.php 2014-05-07 05:38:12 +02:00
YaoiFox
5f0642f349 some bug fixes to cron uploader 2014-05-07 05:30:44 +02:00
jgen
a58bdbdc62 More PHP Doc comments. 2014-04-29 17:45:13 -04:00
jgen
317028a63b More PHP Doc comments. 2014-04-29 01:33:03 -04:00
jgen
b3f9925839 PHPDoc all the things! 2014-04-28 18:22:57 -04:00
jgen
2a9f76d2f0 More comments, removing dead code, fixing small bugs. 2014-04-28 17:36:52 -04:00
jgen
eadf1d9e87 Remove dead code. 2014-04-28 17:18:51 -04:00
jgen
9f838c0c11 Clean all the things. 2014-04-28 03:32:43 -04:00
jgen
b56e390676 Lots of linting again. 2014-04-28 03:26:35 -04:00
jgen
158819cb28 Linting: These actually were bugs. 2014-04-28 03:16:09 -04:00
jgen
d4ac6ca451 Such linting, such wow. Much clean. 2014-04-28 02:56:58 -04:00
jgen
8fd532e5a8 More linting and removing dead code. 2014-04-28 02:43:49 -04:00
jgen
3cd8c33ed1 Convert Spaces -> Tabs 2014-04-28 02:24:19 -04:00
jgen
e37c5cb9d0 More linting! 2014-04-28 02:23:45 -04:00
jgen
022c162f40 More linting and fixing of comments and PHP Doc, types, etc. 2014-04-28 01:26:22 -04:00
jgen
a0a39784d4 Make webm videos auto-loop by default. 2014-04-28 00:57:49 -04:00
jgen
76fd27f87c Fixing/Cleaning more PHP Doc related issues. 2014-04-28 00:56:19 -04:00
jgen
8a2eb4b121 Fixing more PHP Doc related issues. 2014-04-27 19:29:36 -04:00
jgen
4f51e942be Updating/Fixing/Adding more comments with the PHP Doc style. 2014-04-27 15:33:57 -04:00
jgen
b1d123c960 Add more escaping to the shell command for ffmpeg. 2014-04-26 17:09:18 -04:00
jgen
2e4b53c3f4 Merge branch 'code_removal' of github.com:jgen/shimmie2 into develop 2014-04-26 16:55:11 -04:00
jgen
1ecf33e39d Merge branch 'video_thumb' of git://github.com/shish/shimmie2 into develop 2014-04-26 16:54:28 -04:00
jgen
86b6d12819 Merge branch 'linting' of github.com:jgen/shimmie2 into code_removal 2014-04-26 16:50:14 -04:00
jgen
95ba85ee43 This js file relies on functions defined in 'shimmie.js' which is all globed together when rendering a page. Adding an ignore line to scrutinizer to prevent false-positives. 2014-04-26 05:32:15 -04:00
jgen
a8dd045586 Combine these if statements into one to reduce the cyclomatic complexity. 2014-04-26 03:56:06 -04:00
jgen
42407116a8 Removing this file. 2014-04-26 03:33:20 -04:00
jgen
013222e4ee Code Removal: PHP has had JSON support directly baked into the language since 5.2.0 - there is no need to rely on an external library from 2006 for json support. 2014-04-26 03:31:02 -04:00
jgen
298344048c Make these functions public to prevent scrutinizer from complaining. 2014-04-26 00:27:16 -04:00
jgen
1ca3865a1c Removing the closing PHP "?>" tag as per style guidelines. (Also see: https://stackoverflow.com/questions/4410704/why-would-one-omit-the-close-tag ) 2014-04-25 22:54:51 -04:00
jgen
3e899710d7 Stop scrutinizer from complaining here. 2014-04-25 17:40:42 -04:00
jgen
c85630198f These variables where never defined depending on the execution path. 2014-04-25 17:40:14 -04:00
jgen
6f685ca227 Use the method from core/util to parse the bool from the DB instead. 2014-04-25 17:39:46 -04:00
jgen
3a1197256a Need to pull in the global $page variable for this method. 2014-04-25 17:39:06 -04:00
jgen
1e15c5e47a Explicitly declare this class variable 2014-04-25 17:38:25 -04:00
jgen
bcd3f991de Removing the closing PHP "?>" tag as per style guidelines. 2014-04-25 17:34:20 -04:00
jgen
b4e6c0b743 Explicitly check if we can actually find the image by Id. 2014-04-25 16:08:00 -04:00
jgen
478eb3a4cc Linting: Check for null return value, and throw an exception if null. 2014-04-25 15:39:00 -04:00
jgen
7ef68b15f9 Fix indentation. 2014-04-25 15:38:15 -04:00
jgen
b241390fa4 Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 22:34:45 -04:00
jgen
50686ac61e More linting, fix PHPDoc style. 2014-04-24 22:29:29 -04:00
jgen
daee99c1bc Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 22:28:53 -04:00
jgen
860af25550 Need to pull in the global $user variable. 2014-04-24 22:22:45 -04:00
jgen
4ec5a7ce52 Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 22:22:16 -04:00
jgen
780d5f8709 More linting. Explicitly declare these class variables, as well as comment out dead code. 2014-04-24 22:13:00 -04:00
jgen
6e4ae229ef Explicitly declare this class variable 2014-04-24 19:13:41 -04:00
jgen
4cc31df737 Update the comments to PHPDoc style guidelines. 2014-04-24 19:02:43 -04:00
jgen
ab3f9850e4 Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 19:01:47 -04:00
jgen
709366b70c Explicitly declare these class variables. 2014-04-24 18:44:46 -04:00
jgen
7b90331f02 Add missing semi-colon. 2014-04-24 16:56:04 -04:00
jgen
e2f5c7a6ec Check for null, just in case. 2014-04-24 05:09:38 -04:00
jgen
332c8538b7 Change the function syntax to quiet JSHint. 2014-04-24 04:46:23 -04:00
jgen
506e699f8a Not sure if we really need the triple equals. 2014-04-24 01:15:30 -04:00
jgen
866d39a68e The 'tags' box actually has a different ID. 2014-04-24 01:15:03 -04:00
jgen
51c145d5c9 Some more linting on the bookmarklet.js file. 2014-04-24 01:08:47 -04:00
jgen
4b90faf89d Even more linting of JS files. 2014-04-24 00:55:14 -04:00
jgen
a105090039 Some more JS linting. 2014-04-23 23:39:09 -04:00
jgen
887f963e17 Add the jshint comment to alter how scrutinzer-ci deals with the js. 2014-04-23 23:38:53 -04:00
jgen
b775c007cd Give these HTML headers some slight priority over the default value of 50. 2014-04-23 23:07:10 -04:00
jgen
a0ab3864c0 Push the headers for the chatbox even further down to make sure that jQuery is already loaded. 2014-04-23 23:01:51 -04:00
jgen
8cdf919827 More linting. This time of the JavaScript for the chat-box extension. 2014-04-23 22:43:42 -04:00
jgen
0bd031a269 Merge branch 'develop' of github.com:jgen/shimmie2 into linting
Manually resolved conflicts:
	ext/chatbox/js/yshout.js
2014-04-23 22:42:30 -04:00
jgen
21e1359b86 Avoid short open tag for PHP. 2014-04-20 05:07:26 -04:00
jgen
60980c8839 One more jQuery reference. 2014-04-20 05:04:45 -04:00
jgen
a7ba0f887b Again, the chatbox needs help from the jQuery migrate plugin. 2014-04-20 05:00:59 -04:00
jgen
2df54b911a Don't use short open tags for PHP as they are not turned on by default in production environments. 2014-04-20 05:00:34 -04:00
jgen
e2516fa5cf Chatbox should be fixed now.
The chatbox extension actually needs some functionality that was removed from jQuery versions 1.9 and up. When Shimmie's version of jQuery was bumped up to 1.11 this actually broke the chatbox.
2014-04-20 04:51:19 -04:00
jgen
880840623a Need to ensure that this html header is added last. 2014-04-20 04:36:25 -04:00
jgen
717401ccab Removing this as jQuery is already included in Shimmie now. 2014-04-20 04:35:33 -04:00
jgen
8b698e1b6f Revert this commit. 2014-04-20 04:29:11 -04:00
jgen
54362a49c6 Fix the broken chatbox issue. 2014-04-20 04:25:08 -04:00
jgen
57a390eaab Massive linting! 2014-04-19 23:38:42 -04:00
Shish
dc6653d3be Merge pull request #407 from jgen/hotfix/downtime_theme_edits
Hotfix/downtime theme edits
2014-04-20 00:30:57 +01:00
Shish
75c3d8e453 Merge pull request #409 from jgen/linting
Linting
2014-04-20 00:29:53 +01:00
jgen
c527ae91d6 More linting and cleanup. 2014-04-19 04:17:28 -04:00
jgen
be385deaab Clean up this js file as well. 2014-04-19 02:58:36 -04:00
jgen
28d83fda0d Even more linting and cleaning. 2014-04-19 02:33:34 -04:00
jgen
2da8c19a07 More linting! 2014-04-19 01:36:18 -04:00
jgen
bdf49b33cb Some more linting thanks to scrutinizer-ci 2014-04-19 01:18:49 -04:00
jgen
505a3e5233 Merge branch 'develop' of git://github.com/shish/shimmie2 into hotfix/downtime_theme_edits 2014-04-18 20:25:36 -04:00
jgen
71d7474476 Add <section> tags to the downtime page so that theme render correctly. 2014-04-18 20:21:50 -04:00
jgen
7fd655fc4e Added conditional message for IE users to download plugin from Google for webm. 2014-04-18 18:47:14 -04:00
jgen
b5d005710c Fix indentation (spaces -> tabs) 2014-04-18 02:10:10 -04:00
jgen
2f380f5d59 Video thumbs are working for webm files now. 2014-04-18 02:06:12 -04:00
jgen
273d386d22 Working on thumbnail support for video files. 2014-04-18 01:37:27 -04:00
Justin Brewer
f243092634 count("") == 1 2014-04-11 23:55:30 -04:00
Shish
6c9a4a3b86 A start on video thumbnailing; see #400
Almost certainly not working yet; not tested, just committing so that
other people have something to work with and we aren't duplicating
effort
2014-04-10 08:15:00 +01:00
Jeff Genovy
3a0da5df5a Merge pull request #399 from Diftraku/ouroboros_api
Special chars in tags barf filter_var
2014-04-09 22:33:05 -04:00
Diftraku
7ac61f4234 Special chars in tags barf filter_var
Due to how FILTER_SANITIZE_STRING works, if you had special chars in
your tags (eg. <3 or !) the string would be cut before the offending
character(s) and in worst case, result in no tags passing to the API
2014-04-10 04:11:43 +03:00
jgen
3c6b8b6fe6 Merge branch 'linting' of git://github.com/shish/shimmie2 into develop
Conflicts:
	ext/resize/main.php
2014-04-09 15:04:18 -04:00
Shish
f72bfbb050 fix indentation 2014-04-06 20:47:01 +01:00
Daku
f88ba20319 Merge pull request #393 from shish/resize_tweak
pass already fetched image object into resize()
2014-04-04 17:38:08 +01:00
Daku
2d25d43ecf Merge pull request #389 from HungryFeline/patch-1
Redirect to default page if referer isn't set
2014-04-04 17:30:19 +01:00
Shish
a0d1948a4f pass already fetched image object into resize(), rather than passing the ID to be re-fetched 2014-04-02 08:49:13 +01:00
jgen
1e49cc9122 More comments and fix undefined variables. 2014-04-01 22:02:36 -04:00
jgen
9b1c3db400 Slight re-word of the exception error message. 2014-04-01 21:43:12 -04:00
jgen
18b8e7912f Fix warning generated when an image doesn't have bits or channel info (and use sane defaults). 2014-04-01 21:42:40 -04:00
jgen
225d197790 Remove duplicate code. 2014-04-01 21:41:57 -04:00
jgen
749f846b79 Fix typo. 2014-04-01 20:33:36 -04:00
jgen
a442fbe409 Resizing images actually was broken, how nobody noticed I don't know. 2014-04-01 19:29:31 -04:00
Shish
c8aa3327a1 A bunch of small changes from scrutinizer-ci; some tidying, some actual bug fixes 2014-03-30 13:26:48 +01:00
Shish
db5aa56300 remove a bunch of dead code 2014-03-29 11:44:34 +00:00
HungryFeline
c215d6991a Redirect to default page if referer isn't set
Instead of displaying `You should be redirected to <a href=""></a>`
2014-03-27 09:57:43 +01:00
Shish
7a95325a5f Merge pull request #388 from DakuTree/patch
Fixes issues 233 & 234.
2014-03-26 10:41:31 +00:00
Daku
7837362711 make sure source is still used if provided 2014-03-26 08:26:21 +00:00
Daku
994652c3f7 make sure mass_tag_edit reads high > low id if default order is different 2014-03-26 08:05:05 +00:00
Shish
7b68d8ebfd use new-style constructors everywhere 2014-03-22 09:00:59 +00:00
Shish
da29912646 tidy up a bunch of lint errors 2014-03-17 22:05:37 +00:00
Daku
76526f371c Add option to use transloaded URL as source
fixes #234
2014-03-14 16:54:14 +00:00
Daku
5f3ff8db86 don't add "tagme" when trying to mass-edit to null
fixes #233
2014-03-13 23:29:47 +00:00
Daku
4351dc53c5 make sure all existing exts are converted to lowercase 2014-03-08 15:27:39 +00:00
Daku
258fda188e use different selector rather than hardcoding url 2014-03-08 15:20:50 +00:00
Daku
ddb6d32e29 fix fourm errors under postgresql 2014-03-02 21:59:19 +00:00
Daku
87065d08f6 use elseif 2014-03-02 21:58:45 +00:00
Daku
524ead8344 PostgreSQL doesn't return trimmed results for CHAR columns, so use VARCHAR instead 2014-03-02 21:07:25 +00:00
Daku
a863072bfb DATETIME > SCORE_DATETIME
fixes #354
2014-03-02 18:50:46 +00:00
Daku
53a7e23b64 various autocomplete tweaks
* made limit for /api/internal/tag_list/complete optional (as this breaks the autocomplete on dbs with lots of tags)
* removed delay + minChars = 1 again (due to above change)
* first autocomplete tag is selected by default
* tab now works as a select button
* autocompleted tags will now be followed by a space (so the next tag can be instantly autocompleted)
2014-02-28 02:03:41 +00:00
Daku
d675827173 order[=|:]random_#### metatag
possible replacement for random_list ext?
2014-02-24 19:54:15 +00:00
Daku
320a92289b have query use EXISTS rather than IN
preferably we would have a table with image tag counts, but this works for now
2014-02-24 01:50:31 +00:00
Daku
790cb0d7a9 [.+]tags metatag for tag_categories
This is nowhere as near as fast as I'd like. Need to find a better query.
2014-02-24 01:40:35 +00:00
Daku
bdb3255116 speed: lowercase ext on image insert
avoids having to lowercase every build_thumb_html call
most extensions tend to match against their lowercase versions anyway
2014-02-23 22:27:52 +00:00
jgen
cebc197fba Merge branch 'develop' of git://github.com/shish/shimmie2 2014-02-23 03:11:09 -05:00
jgen
6f59de4d45 Prevent an internal server error occurring when mincount is less than 1. 2014-02-23 02:51:33 -05:00
jgen
2b4ffb1e60 Argh. 2014-02-23 02:18:45 -05:00
jgen
38b494125c Postgres requires you to include the GROUP BY column in the SELECT columns. Should be okay since we don't care about other columns though. 2014-02-23 02:15:19 -05:00
jgen
cf35bf82a8 Postgres doesn't support the DATETIME field. 2014-02-22 23:30:58 -05:00
jgen
e30520a5ef Fixing typo. 2014-02-22 23:23:23 -05:00
jgen
9892d1f7fd PostgreSQL does not support INDEX() inside the CREATE TABLE method. You must create the index as a separate query. Fortunately MySQL also support this way of doing things as well. 2014-02-22 23:02:11 -05:00
jgen
3d1217a1be Trim trailing blank space. 2014-02-22 15:36:52 -05:00
jgen
96358f0bc0 Nevermind, it doesn't work. 2014-02-22 15:33:55 -05:00
jgen
2d0edde2b2 We can check that admin users see the "Add" button though. 2014-02-22 15:25:25 -05:00
jgen
d6f0213a9f Commenting out the alias tests due to consistent failing on TravisCI. 2014-02-22 15:19:06 -05:00
jgen
6efe56eddf Well, lets try this. 2014-02-22 03:10:59 -05:00
jgen
b229e114c2 Dump all the post data on failure. 2014-02-22 03:06:09 -05:00
jgen
f1aed15f32 die doesn't support commas 2014-02-22 02:59:17 -05:00
jgen
cbfc0580f6 Temporary for debugging. 2014-02-22 02:35:56 -05:00
jgen
ba0aef4f30 The Database class should really throw an error here. This will likely break the existing tests. 2014-02-22 00:40:14 -05:00
jgen
bbfba90ad4 Merge pull request #380 from DakuTree/patch-3
Misc tweaks/fixes 2 (fixes #349)
2014-02-21 13:40:52 -05:00
jgen
f4f94e6273 Merge pull request #379 from DakuTree/patch-2
Misc tweaks/fixes (fixes/closes issue 17 & 323)
2014-02-21 13:40:15 -05:00
jgen
e8cba99111 Merge pull request #378 from DakuTree/patch
Post Relationships ext + TagTermParseEvent
2014-02-21 13:32:33 -05:00
jgen
9255c861f7 Cleaning up. 2014-02-19 20:50:00 -05:00
jgen
f3c379b8db Rename the file. 2014-02-19 18:36:38 -05:00
jgen
eea4d34978 We can actually push the trim functions to when we create the define, less overhead. 2014-02-19 18:17:26 -05:00
jgen
141be8768f Better detection of running on the command line. 2014-02-19 18:10:40 -05:00
jgen
5a49bb59e4 Check that regular users can't add aliases. 2014-02-19 17:03:35 -05:00
jgen
1a7cbc9b2a Check the actual http response code. 2014-02-19 16:40:28 -05:00
jgen
f1a516ef18 Extra debugging when Alias fails. 2014-02-19 16:24:47 -05:00
jgen
bdbb280064 Fixing the alias test cases. 2014-02-19 04:27:29 -05:00
jgen
55f07d0cfd Fix the tag_edit tests. 2014-02-19 04:15:00 -05:00
jgen
8b0ac0e9c1 The location of the webserver should be configurable in the travis file. 2014-02-19 03:29:12 -05:00
Daku
fe6b83412f use jQuery instead of JS + change spacing to tabs
this should fix IE/browser problems (see: #349)
2014-02-19 06:23:08 +00:00
Daku
5df6c09da6 reset_image_ids should properly change id for all possible tables 2014-02-19 05:48:20 +00:00
jgen
66f32e63cf These tests for Mass tagger only work with NiceURLs enabled. Commenting them out for now. 2014-02-18 17:02:41 -05:00
Daku
daad8d00d5 fix download all images not working 2014-02-18 12:33:10 +00:00
Daku
5a4b089a61 fix database_dump regex not working with no password 2014-02-18 08:20:52 +00:00
Daku
857f7e4041 don't force hellban ext + add [Beta] tags 2014-02-18 07:24:26 +00:00
jgen
8a700a34fc No idea why it was set to use the directory "2.Xm" 2014-02-17 14:46:00 -05:00
jgen
fe83e3d343 Adding comments to help explain the simpletest setup. 2014-02-17 13:59:41 -05:00
jgen
c05b4719d6 Fix the tests for the Alias extension. 2014-02-17 01:52:30 -05:00
jgen
807b0c7037 Commenting this out as it assumes Nice URLs, and fails if they are not enabled. 2014-02-17 01:51:40 -05:00
jgen
073813d0ea Fix the warning that these variables aren't defined. 2014-02-17 01:49:16 -05:00
Daku
7c36902537 updated js libs
jQuery 1.7.1 > 1.11.0
jQuery UI custom (highlight effect) 1.10.3 > 1.10.4
jQuery autocomplete 1.1 > 2.4.4
jQuery imgareaselect 0.4 > 1.0.0
jQuery imgnotes 0.2 > 1.0
jQuery tablesorter ? > 2.0.5
jQuery timeago 1.1.1 > 1.3.1
Modernizer 2.5.3 > 2.7.1
2014-02-17 03:02:14 +00:00
jgen
3cb79f0e8a SimpleTest works now. 2014-02-16 19:36:52 -05:00
Daku
c51d1388c0 remove lazyload lib + make random list ext more readable
lazyload is no longer used, see: 7c95981319
2014-02-16 23:24:05 +00:00
Daku
c065e38145 adds widget/thumb option to random_thumb ext (for #323)
this code was suggested in the comments, but never actually added
2014-02-16 04:38:58 +00:00
Daku
e8607ab6f2 cleaned up popular_by pages
my old code was so messy :<
2014-02-16 02:29:16 +00:00
Daku
eb16ab09ed order images sorted by score
this is solution for issue #17 (Method to sort by top scored images in numeric_score module)
2014-02-16 02:28:39 +00:00
Daku
16bb38f343 onSearchTermParse regex should be case insensitive 2014-02-15 21:26:31 +00:00
Daku
7b8395b341 have pool description use BBcode 2014-02-15 21:04:26 +00:00
Daku
50c2271ca6 complete rewrite of the update ext (again)
much cleaner than previous version
affixed the [beta] tag since this still has a few issues (mainly error checking/displaying etc.)
2014-02-15 03:44:53 +00:00
Shish
134f9082fd fix typo 2014-02-08 11:53:45 +00:00
Shish
88432215ce make image deletion message work, fixes #368 2014-02-08 11:53:35 +00:00
Daku
b7a4de90e4 updated docs with new metatags 2014-02-05 14:11:13 +00:00
Daku
c4150c15ce make sure source/parent isn't set twice if metatag is used 2014-02-05 14:11:12 +00:00
Daku
6e54580f56 check for permissions 2014-02-05 14:11:03 +00:00
Daku
629f9940c3 thumbnail border-color for post relationships
also removed build_thumb_html from themes (mostly old versions of the default base function)
2014-02-04 18:41:40 +00:00
Daku
13cdb9ba5f Post Relationship ext 2014-02-03 16:55:42 +00:00
Daku
d19e7fff7b vote[=|:](up|down|remove) metatag 2014-02-01 09:54:33 +00:00
Daku
2ffb9e9b8a option for add_post & remove_post to log history
(for use with TagTermParse)
also make navbox show on pool history page
2014-02-01 09:36:23 +00:00
Daku
6a1a57b1a2 make "source[=|:]none" null the source 2014-02-01 09:36:17 +00:00
Daku
b7778b54c9 add TagTermParseEvent for parsing tags during tagging 2014-02-01 09:36:10 +00:00
Shish
711ad775da Merge branch 'master' of https://github.com/shish/shimmie2 2014-01-29 21:38:07 +00:00
Shish
cbe5f27eb6 in-place tag renaming when possible, rather than mass editing thousands of images 2014-01-29 21:37:51 +00:00
Shish
d7ce075a43 Merge pull request #367 from DakuTree/patch
Metatag tweaks + Fix for issue 359 & 362.
2014-01-25 06:58:35 -08:00
Diftraku
85303d232e Fixing stuff with API output being output twice
Also some code formatting and a redirect from post/show for clients such
as CartonBox so you can actually view the image after opening it in the
browser on the client.
2014-01-15 23:28:40 +02:00
Diftraku
b856b13235 Fix EXIF data throwing a notice when showing an image 2014-01-15 23:06:27 +02:00
Daku
b5f70de496 change source metatag regex to allow searching for URLs 2014-01-14 07:52:45 +00:00
Daku
55ff224ac0 added any/none options to the source/pool metatags 2014-01-14 06:27:12 +00:00
Daku
ce256f5bf4 added pool & pool_by_name search metatags 2014-01-14 06:12:34 +00:00
Daku
325da11119 artist/comment/numeric_score metatags now work using :
also updated docs
2014-01-13 09:13:56 +00:00
Daku
7d49e21792 readability + moved stuff 2014-01-13 08:19:12 +00:00
Daku
152f5fbf26 add config option for default order 2014-01-13 08:19:11 +00:00
Daku
2c2f27ca64 add order metatag
not too happy with how this works...but it does work
2014-01-13 08:19:11 +00:00
Daku
9cae856df7 use the Content-Disposition header for filename & Content-Type for
extension
if either doesn't exist, it will fallback to using pathinfo
2014-01-13 08:19:01 +00:00
Daku
14899e79ad added height & width metatags 2014-01-02 14:10:08 +00:00
Daku
25c286b71f add support for using : as a metatag seperator + updated docs 2014-01-02 14:00:24 +00:00
Daku
85880804d2 have theme.php manage block creation
so themes can move/remove if they wish
2013-12-31 08:22:58 +00:00
Shish
2d40fcc92d Merge pull request #364 from DakuTree/patch
Pools ext tweaks/additions.
2013-12-30 02:49:06 -08:00
Daku
c892386bcb remove backticks 2013-12-30 10:36:32 +00:00
Shish
de6ad33e12 Merge pull request #356 from Diftraku/master
Bumping Ouroros API to v0.2: now with XML support and post creation!
2013-12-30 02:20:43 -08:00
Shish
bc2100940d Merge pull request #360 from DakuTree/master
bookmarklet.js support for danbooru2 + fixed most issues with other sites
2013-12-30 02:16:35 -08:00
Shish
7d3d331272 Merge pull request #358 from jgen/master
PHP Notice being generated in comment.php
2013-12-30 02:15:06 -08:00
Daku
fd6f2ddb43 show pool navigation box on pool/view pages 2013-12-30 08:42:29 +00:00
Daku
3dd3101995 added option to set pool & source via tag 2013-12-30 08:15:10 +00:00
Daku
9eaebfd1c2 if cookie doesn't exist, default to "created" 2013-12-30 06:52:17 +00:00
Daku
9511569ed4 added option to edit pool description to pool edit page 2013-12-30 06:51:47 +00:00
Daku
b79a042bdc added option to order pool list by created date/last updated/title/count 2013-12-30 06:47:29 +00:00
Daku
3e240fa78d return error when pool title exists + fix pool error reporting 2013-12-30 06:46:41 +00:00
Daku
59eb6d7ec2 pool title should be unique 2013-12-30 06:46:34 +00:00
Daku
453d9a453b bookmarklet now supports danbooru2 + fixed issues with other sites 2013-12-08 15:05:27 +00:00
Shish
63aa4c6330 avoid possibility of infinite loop in bbcode parsing 2013-12-08 10:52:59 +00:00
Shish
caa6d59a87 log base was changed years ago, comment never got updated 2013-12-08 10:52:59 +00:00
jgen
4635f333ae This should have been moved earlier in the fix for Issue 346. 2013-12-07 23:16:20 -05:00
jgen
1c8d07983e Fix for PHP Notice being generated.
"PHP Notice:  Trying to get property of non-object in /comment/main.php on line 325"
Details: We don't need to try and get comments for images that don't exist. This might also help speed things up a bit as it should eliminate an unnecessary database query.
2013-12-05 19:50:21 -05:00
jgen
a7ab12abdd Fix for issue 346 - "Only first page of comments is shown" 2013-12-03 14:39:12 -05:00
Diftraku
1a25014564 Derp, forgot I was actually giving the post[file] to OuroborosPost, making assert fail for null 2013-12-03 05:51:55 +02:00
Diftraku
095f743d57 Checking if the user can actually create new posts, seems the base DataHandlerExtension doesn't do this. Also forgot to update documentation! 2013-12-03 01:07:27 +02:00
Diftraku
6a4031dfd5 Bumping Ouroros API to v0.2: now with XML support and post creation! 2013-12-03 00:45:07 +02:00
jgen
049108e6ca Fix for issue 330 - "Tag list does not handle non-english text correctly". 2013-11-30 15:19:41 -05:00
Diftraku
9237c78f55 Adding basic Ouroboros API 2013-11-29 01:09:05 +02:00
Shish
9430ddc374 Merge pull request #350 from jgen/master
Fixed bookmarklet.js to allow uploading from Gelbooru. (was broken before)
2013-11-27 00:29:40 -08:00
Shish
0e90d58d85 Don't crash if no relevant tags are found, see #324 2013-11-27 08:28:07 +00:00
jgen
9d8bcbce37 Fixed bookmarklet.js to allow uploading from Gelbooru. (was broken before) 2013-11-24 14:54:10 -05:00
Shish
4fd58019e5 Merge pull request #324 from justinbrewer/editcloud_revamp
Tag Edit Cloud improvements
2013-11-24 09:07:43 -08:00
Thasan
b16be279a8 ext\rating documentation 2013-11-06 00:32:27 +02:00
Thasan
fe84c8d9dd Also checking rating permissions 2013-11-06 00:11:17 +02:00
Thasan
5aa2f823d8 Fixing rating= search 2013-11-05 22:43:46 +02:00
Shish
81d44cbb4f lower tags before checking for mass replacement 2013-10-25 09:26:25 +01:00
Shish
ae3ee1fe79 Merge pull request #341 from jgen/master
More small tweaks
2013-10-14 05:29:47 -07:00
Peter Lejeck
0e4717ecae Unify two regexes used in rating searches, intersect with user privs
Fixes issue with unpriveleged users being able to circumvent the ratings
they could see, just by searching for it.  Also makes code much much
prettier.
2013-10-06 04:38:34 -07:00
jgen
b01ca89220 Some more small speed related tweaks. 2013-10-04 17:53:26 -04:00
jgen
0512858bd4 Some more small tweaks for speed. 2013-10-04 17:17:42 -04:00
jgen
1db371345e Merge branch 'master' of git://github.com/shish/shimmie2 2013-10-03 20:33:47 -04:00
Justin Brewer
8c5987a6b2 Fixed tags with quotes killing the Javascript
Of course not.
2013-09-26 10:47:37 -05:00
Justin Brewer
7be1f9e637 Properly escape tags while building query
Could it really be that easy?
2013-09-25 23:39:40 -05:00
Justin Brewer
55bfa4cfd7 Use API calls 2013-09-25 22:59:08 -05:00
Shish
827ce2e0fe merge cron_uploader changes manually 2013-09-23 13:43:39 +01:00
YaoiFox
a7c39105e7 Cron Uploader: Link to install guide & info from board config. And now i'm going to sleep before I want to change more... 2013-09-23 13:41:43 +01:00
YaoiFox
5afeeb0991 Cron Uploader: Fixed documentation & added page /cron_upload with info & install guide if user is admin. 2013-09-23 13:41:36 +01:00
DrudexSoftware
f4b9c8aca2 Cron Uploader: Board Config wasn't getting the right root directory. 2013-09-23 13:41:30 +01:00
DrudexSoftware
455b94c4fa Cron Uploader Extension added that allows automatic image uploading from an image queue using cron jobs. 2013-09-23 13:41:25 +01:00
Shish
835361b272 make tags in the image info box clickable (#336) 2013-09-23 13:09:47 +01:00
Shish
b0b0324ee7 image only button 2013-09-19 19:30:50 +01:00
Shish
ff330d542d Merge pull request #335 from vomitcuddle/image_hash_ban_patch
[image_hash_ban] Fix confusing button label
2013-09-18 08:13:00 -07:00
vomitcuddle
ea21e0657b [image_hash_ban] Fix confusing button label 2013-09-18 09:28:07 +01:00
Shish
bf8b085de6 fix being logged in after changing password 2013-09-12 16:29:20 +01:00
Shish
76c7da0161 add hellban support to PMs 2013-09-09 13:47:42 +01:00
Shish
4584bf603a finally got that zero... 2013-09-09 13:46:47 +01:00
Shish
1b73dd4ddc add 'hellbanned' user class, with support from the comments extension 2013-09-09 13:41:08 +01:00
Shish
07304861f3 log IDs of things 2013-08-30 00:19:46 +01:00
Justin Brewer
e93785339f Fix another corner case
If $counter == $def_count and the next tag in the list is a used tag, the
tagcloud_extra div would be printed twice, breaking the list.

This solution feels ugly, perhaps there's a better way to do this?
2013-08-26 23:32:44 -05:00
Justin Brewer
946dec9415 readdir is not guaranteed to be in order
readdir's ordering is filesystem-dependent. On many systems, that means it
might as well be random. People uploading archives will reasonably expect the
files to appear in alphabetical order, so we should make sure they do.
2013-08-11 17:52:38 -05:00
Justin Brewer
305e25f676 Fix incorrect DataUploadEvent creation, triggering an assertion failure
I guess this one slipped through the cracks when $user was made global.
2013-08-11 17:38:50 -05:00
Justin Brewer
8732f1a9ef Extra-switch fixes
Wrong variable name, and don't do the math unless we have to.
Fixed the diplayed number being wrong.
Also fixed a corner case where number of tags in the cloud equals number to
display. Would display "[show 0 more tags]".
2013-08-10 16:19:03 -05:00
Justin Brewer
fa1fb45c1e Polish 2013-08-07 16:08:05 -05:00
Justin Brewer
03e78bd19f Tag Category integration 2013-08-07 15:58:58 -05:00
Justin Brewer
e133138be2 Config option for which tags to ignore 2013-08-07 15:25:11 -05:00
Justin Brewer
905dc2df31 Relevance sorting method 2013-08-07 14:47:44 -05:00
Justin Brewer
d27079ca9f Cleanup build_tag_map
Millions of temp variables. Assuming there's only two sorting methods. Grammar.
[show 100 more problems]
2013-08-07 14:15:04 -05:00
Shish
194b68e046 show when a ban was added, fixes #250 2013-08-05 20:46:54 +01:00
Shish
44deff21a8 Merge branch 'master' of https://github.com/shish/shimmie2 2013-08-05 20:37:40 +01:00
Shish
390db4d6f4 have setup 'Help' link link to github wiki, fixes #303 2013-08-05 20:34:50 +01:00
Shish
8bbf7e2171 hide https variable warning 2013-08-05 20:10:54 +01:00
Shish
2b628a395f resolve_list -> resolve_aliases, to better describe what it actually does 2013-08-04 18:13:50 +01:00
Shish
7e89481105 have Tag::resolve_list always take an array 2013-08-04 18:11:02 +01:00
Shish
9c70d1bd3f ban from mass delete 2013-08-04 18:03:31 +01:00
Shish
2ef76708c5 untag table titles 2013-08-04 02:20:28 +01:00
HungryFeline
e9b0553876 use upload_tmp_dir as temp place, see #297
We changed a line like this some time ago in upload/main
2013-07-21 02:10:17 +02:00
Shish
1c5d717d27 put untags in the database 2013-07-13 09:35:34 +01:00
HungryFeline
17efb92b4e Update main.php 2013-07-07 09:13:14 +02:00
Shish
b9a00e4c28 this doesn't work 2013-07-07 03:24:21 +01:00
Shish
bc253eef04 load list of voters in-place with ajax 2013-07-06 10:42:25 +01:00
Shish
48e40a6712 trim whitespace when adding aliases 2013-07-06 10:42:25 +01:00
Shish
589bda1b00 Merge pull request #316 from HungryFeline/patch-5
Fixing csv upload form
2013-07-06 01:53:29 -07:00
Shish
a212013d9d Merge pull request #314 from vomitcuddle/rm_dup_ext
Remove duplicate arrow key navigation extension
2013-07-06 01:50:38 -07:00
HungryFeline
03b0c82887 Better CSV validation
When uploading a CSV, check every entry before executing the INSERT. The checks are the same as with the normal add except that no errors are shown.
2013-07-06 00:33:31 +02:00
HungryFeline
db64370815 Fixing csv upload form
The 2nd argument of make_form is the method. Also, I don't see any point in defining the $multipart variable. Just true as argument is enough. C&P mistake?!
2013-07-06 00:12:25 +02:00
Shish
47c1b5d094 move query-string-passing to JS rather than embedding in the HTML, so that the HTML can be commonised and cached better 2013-07-05 22:32:16 +01:00
Shish
e4bfa7df70 further breakdown for page stats 2013-07-05 22:32:16 +01:00
Shish
47447ee982 generate rss thumbs in a different function, with cache 2013-07-05 22:32:16 +01:00
vomitcuddle
b8cf3562b0 Remove duplicate arrow key navigation extension 2013-07-04 01:30:48 +01:00
Shish
79ff722d10 Merge pull request #307 from HungryFeline/patch-1
Allow transload from urls with query string
2013-07-02 05:36:38 -07:00
HungryFeline
71117cf8fa Look for the source in _GET and not in _POST when uploading via _GET 2013-07-02 04:35:18 +02:00
HungryFeline
cbd927ffa2 Allow transload of image urls with querystrings
And remove them from the filename and fileext
2013-07-02 04:31:06 +02:00
Shish
e547b1362f Update theme.php 2013-07-01 09:45:32 +01:00
Shish
e6146d82ea Update theme.php 2013-07-01 08:05:30 +01:00
Daniel Oaks
2a51a9d6ba Fixed things Shish pointed out 2013-06-23 16:57:25 +10:00
Daniel Oaks
bf0146cc41 Danbooru2 theme, initial tag categories extension, tag list update/rework 2013-06-23 09:42:15 +10:00
Shish
1264ec5b35 Merge pull request #298 from aki--aki/master
Add reset_image_ids from shish/shimmie2-utils to the admin extension
2013-06-22 06:31:55 -07:00
Aki Jenkinson
e5e12220b3 Made reset image IDs button only appear on MySQL 2013-06-22 18:30:10 +12:00
Shish
5c13fcac62 resolve aliases on input as well, so the target shows in the url 2013-06-20 22:59:42 +01:00
Shish
4a2c47459c Chatbox 2013-06-19 20:59:59 +01:00
Drudex Software
a3486f9b29 Bulk Remove 2013-06-19 20:59:37 +01:00
Drudex Software
668ebdcb2e Arrowkey Navigation 2013-06-19 20:56:19 +01:00
vomitcuddle
35f7ccb3ba Include thumbnail dimensions 2013-06-18 22:31:24 +01:00
vomitcuddle
911caadc84 Support Gelbooru API page offsets 2013-06-18 22:31:16 +01:00
vomitcuddle
619382d1b9 Include image count and offset in root tag 2013-06-18 22:31:09 +01:00
Shish
b6235695da unique IDs for 'posted' search params 2013-06-16 12:20:53 +01:00
Shish
c8b12a0459 update comment 2013-06-15 19:57:15 +01:00
Shish
e7ddd2960b use upload_tmp_dir as temp place for transloading, see #297 2013-06-15 19:54:00 +01:00
Zarek Jenkinson
f2d0bc6cfa Merge branch 'master' of https://github.com/shish/shimmie2 2013-06-13 23:47:47 +12:00
Shish
e01b9b22c4 don't try to set tags / source if they aren't sent 2013-05-30 14:19:03 +01:00
Shish
b562de3e94 redirect to referrer after adding image hash ban 2013-05-30 10:21:11 +01:00
Zarek Jenkinson
ac764d0e9c protect reset_image_ids & move protected checkbox 2013-05-29 23:00:01 +12:00
Zarek Jenkinson
344e8afd98 Add reset_image_ids from shish/shimmie2-utils to the admin extension 2013-05-29 19:59:41 +12:00
Shish
261dee5a7c hacky source history 2013-05-18 13:52:11 +01:00
Shish
5a9f69afbe Numeric type and aspect keeping - #281 2013-05-18 10:20:08 +01:00
Shish
f4a49b2fb1 Current size as default for resize, if default is otherwise 0 - #281 2013-05-18 10:20:08 +01:00
jgen
cc95eb5deb Some more small speed tweaks. 2013-05-13 20:40:01 -04:00
jgen
bf49c7ce19 Fix for Enabling Image View count extension causes fatal error. 2013-05-11 22:49:36 -04:00
Shish
18b94a801d allow custom themelets to call TagEditTheme::format_source() 2013-05-07 09:13:26 +01:00
Shish
44e9714d88 logging for delete user 2013-04-28 07:48:42 +01:00
Shish
bb0ebc5d42 first version of pm_trigger ext 2013-04-26 17:27:22 +01:00
Bill Garrett
861e04d85f Use ['HTTPS'] to construct the nicetest URL, allowing Shimmie to use nice URLs when served over HTTPS 2013-04-23 21:48:32 -07:00
Shish
8d77d251a5 Merge pull request #285 from kenshiros/fixvoteslistlinks
fix numeric_score to use make_link for user profile links
2013-04-07 05:33:51 -07:00
kenshiros
455bf795de fix numeric_score to use make_link for user profile links 2013-04-07 07:30:38 -04:00
kenshiros
519cff827f fix pools link on home page to point at site://pool and not site://pools 2013-04-07 07:06:20 -04:00
DrudexSoftware
014975884b - Custom page titles rewritten, can now only use website title as prefix or suffix. This is done so admins can use this feature without too much difficulty or without it being bugged. 2013-03-10 09:38:06 +01:00
DrudexSoftware
a89d417546 a few more minor changes 2013-03-10 08:56:58 +01:00
DrudexSoftware
a4b29f0254 - Setup block added for Random Images List 2013-03-10 08:43:50 +01:00
DrudexSoftware
8e6fe9f7e3 - Random list page now has a title<br>
- Custom Html Headers extension now allows admin to set title prefix & suffix for all pages
2013-03-10 08:24:15 +01:00
DrudexSoftware
e54c8439cb Random List now displays actual random images...
Also arrowkey navigation extension now supports Random List extension
2013-03-10 07:53:09 +01:00
DrudexSoftware
8251133270 Amount of randoms displayed = images per page / 2 2013-03-10 07:35:35 +01:00
DrudexSoftware
fccd5d249d Merge branch 'master' of https://github.com/shish/shimmie2.git 2013-03-10 07:01:28 +01:00
DrudexSoftware
41709e419b Added extension allowing users to view a random page at www.website.com/random 2013-03-10 07:00:24 +01:00
Shish
3175e605da Merge branch 'master' of https://github.com/shish/shimmie2 2013-03-07 03:25:23 +00:00
Shish
e49e90f9ab fff, php 2013-03-07 03:23:35 +00:00
Shish
e013d86b56 disallow aliases to other aliases 2013-03-03 18:32:56 +00:00
Shish
d5bc06835d reserve block slot #0 for site announcements 2013-03-03 18:27:06 +00:00
DrudexSoftware
7155804505 Cleaned up code in some of my extensions
Removed function testImage in ext/chatbox/test.php because it no longer applies (there is a cache now)
2013-03-01 17:29:28 +01:00
Drudex Software
a03e4d5102 Custom HTML Headers added
I may also expand it to allow headers specific pages later
2013-02-25 01:59:43 +01:00
DrudexSoftware
cf9e0eae8c oops, forgot something 2013-02-24 01:26:48 +01:00
DrudexSoftware
937eefcb50 /post/view now also supports things like /post/view/4#search=tag1 2013-02-24 01:05:50 +01:00
DrudexSoftware
c55c984cfc also correctly handle post/list without a page ID given 2013-02-23 23:34:32 +01:00
DrudexSoftware
069b7ee9ea arrowkey navigation on post/list now supports tags 2013-02-23 23:26:08 +01:00
DrudexSoftware
13d8b0831e Fixed problems from notes by shish
Added arrowkey navigator to post/list as well
arrowkey navigator also works with tags on post/list now
2013-02-23 22:17:20 +01:00
DrudexSoftware
dfd7157cd2 arrow key navigation through images
allows visitors to use left-right keyboard keys to navigate to different images using post/next/(id) and post/prev/(id)
2013-02-23 08:00:59 +01:00
DrudexSoftware
b88f7a4d6b image_view_counter: also saving with user ID with addview() for later use 2013-02-23 07:17:58 +01:00
DrudexSoftware
93a431dce7 image_view_counter:
- now displays views below image (only if it's okay with the admin settings)
- comment changed
2013-02-23 06:47:06 +01:00
DrudexSoftware
1a38a152e6 image_view_counter:
- added view counter
- only adds view every hour from same person
- no way to display to user/admin yet (todo)
2013-02-23 06:21:00 +01:00
DrudexSoftware
4c170110e8 Moved sitemap file to /data/cache/sitemap.xml
Sitemap creation time now determined by filemtime instead of via config
2013-02-20 00:31:52 +01:00
Drudex Software
4b4d08c854 Merge pull request #12 from shish/master
Merged shimmie2 changes
2013-02-14 20:03:39 -08:00
Drudex Software
e64f1f0bcb Update ext/sitemap/main.php
- Added setup block to choose between generating full sitemap or smaller sitemap
- Added sitemap caching, regenerating at most every day
2013-02-15 04:31:31 +01:00
Drudex Software
52893d0f04 Update ext/sitemap/main.php
- Added setup block to choose between generating full sitemap or smaller sitemap
2013-02-15 03:04:58 +01:00
Drudex Software
c90689a63e Update ext/user/main.php
- Added board config option for user login forwarding
- Set user_loginshowprofile default to 0
- now only applies when user is on a page containing post/ in its url (to avoid weird messages)
2013-02-15 02:22:09 +01:00
Drudex Software
55b0919465 Update ext/user/main.php
Also don't return to same page if page is "user_admin/login". 
Otherwise it can occur if user first failed to log in with the correct credentials
2013-02-14 23:54:23 +01:00
Drudex Software
62ad4c0ecb Update ext/user/main.php
Site owners can now choose in board config what page users will go to when logging in:
- Previous page (default)
- My Profile (old default)
2013-02-14 22:34:43 +01:00
Shish
9fbc31dbf2 Merge branch 'master' of https://github.com/shish/shimmie2 2013-02-11 08:16:06 +00:00
Shish
9d5fed4a94 sneaky update 2013-02-11 08:15:28 +00:00
DrudexSoftware
59ec209c4a Caching not working properly for various reasons, removed for now 2013-02-11 08:43:06 +01:00
Drudex Software
b7b8786f18 Remade the sitemap extension
- now makes full sitemap with specific with higher priorities for newer/more popular content
- Sitemap is cached for 6 hours
several things still need to be added
2013-02-10 17:41:19 +01:00
Shish
ffdca16b30 read-ness column on PM table, for sorting 2013-02-09 10:35:59 +00:00
Shish
4366d3e3e9 Merge branch 'master' of https://github.com/shish/shimmie2 2013-02-09 10:28:14 +00:00
Shish
e69b72dfd3 only use >> quotes at the start of lines 2013-02-09 10:27:37 +00:00
Shish
4fe7855a70 nicer formatting for tag history log 2013-02-09 10:27:25 +00:00
Shish
279c3dd61a max-width 100% for images inside comments 2013-02-09 10:26:55 +00:00
Shish
ff39a1df91 explicit sorting for PM list 2013-02-09 10:26:30 +00:00
Drudex Software
c0e51b5f0c unnecessary code removed 2013-02-08 22:18:19 +01:00
DrudexSoftware
c709e12440 Google Analytics Integration
allows users to optionally use google analytics tracking in shimmie by
simply entring the analytics id in the board config.
2013-02-07 21:41:01 +01:00
Shish
06832bae48 Actually, that causes warnings in other versions; use the static version 2013-01-24 10:52:35 +00:00
Stijn Raeymaekers
160bdb3553 Replaced invalid operator
Caused all images and some other pages to get the following error:
syntax error, unexpected T_PAAMAYIM_NEKUDOTAYIM
2013-01-24 11:08:34 +01:00
Shish
471bc1805a escape title too 2013-01-04 22:40:16 +00:00
Shish
1664f932fe Merge pull request #269 from pachuco/master
Comment extension
2013-01-04 14:43:52 -08:00
Shish
17cd89455d Merge pull request #270 from Diftraku/master
Fix PHP errors about Strict Standards
2012-12-31 13:08:58 -08:00
Shish
78442e96c3 add daily cache breakage to gravatars 2012-12-30 18:08:58 +00:00
Shish
6a5b92502b Log user creation with created user 2012-12-30 16:04:05 +00:00
Shish
da11cc5d05 better error handling for report image 2012-12-30 16:00:55 +00:00
Diftraku
09a18b8710 Fix errors about PHP complaining of strict standards, Pools extension needs an overhaul due to display errors being different in BaseThemelet than it is in the ext/pools/main.php 2012-12-26 20:35:00 +02:00
pachuco
15de0f7732 Added page title. 2012-12-19 01:18:30 +02:00
pachuco
ef8c60f032 Things were fetched from the currently logged user instead of the viewed one. My bad. 2012-12-18 17:29:07 +02:00
Shish
cebebcd975 Merge branch 'master' of https://github.com/shish/shimmie2 2012-12-10 21:28:44 +00:00
Shish
5a3b4dae49 normalise usernames 2012-12-10 21:28:41 +00:00
Shish
80bdc565dd truncate filenames on insert 2012-11-24 20:01:14 +00:00
pachuco
cfe3fabd6d *Index link fixed in uaser and site comment navigators
*No bloody idea why I added the assertions in display_all_user_comments();
*Commented out some doohickey thing that did something and borke other stuff
*Added index link and paginator in user comment list
2012-11-24 20:36:00 +02:00
pachuco
f6f2638003 *Total number of pages correctly calculated for user comments
*Page number sanity checks for both user comments and site comments
2012-11-24 20:28:49 +02:00
Shish
fff8318f1f offset after limit 2012-10-17 00:05:48 +01:00
velocity37
44bcf6f322 Handle MP3: Use getID3() for validation, Fuzzy MP3 Detection + ID3 Reader 2012-10-16 21:42:21 +01:00
velocity37
c9bacdf56d Handle Video: Flash/HTML5 video player
Requires getID3() and Jaris FLV Player
2012-10-16 21:42:20 +01:00
velocity37
1a55d997e3 Bulk_add_csv: add note about custom thumbnails 2012-10-16 19:52:08 +01:00
velocity37
c42cc57977 Bulk_add_csv: add custom thumbnail support 2012-10-16 19:36:55 +01:00
Shish
112130b8ad the start of full per-user comment history 2012-10-15 21:48:55 +01:00
Shish
0ae4ef4110 get source from POST[source], if set 2012-10-15 20:21:09 +01:00
Shish
c6e5a4046a Merge branch 'master' of github.com:shish/shimmie2 2012-10-15 19:04:09 +01:00
Shish
3e516e143c cleaner image hash ban handling, allow specifying hash or ID 2012-10-15 19:03:59 +01:00
Shish
936c1a65ca fix off-by-ones 2012-10-06 15:59:13 +01:00
Shish
1acf839902 Merge pull request #260 from pachuco/master
Forum extension updates.
2012-10-06 07:58:11 -07:00
Shish
6abf65c062 option for making samefags public 2012-10-03 21:28:29 +01:00
Shish
e00299b376 autofocus for search box on front page 2012-09-25 23:20:52 +01:00
Shish
f59ea82e0e Merge pull request #259 from Agasa/patch-1
Update MassTagger redirect to reload page
2012-09-25 10:51:06 -07:00
pachuco
d333345a2c *Cosmetic changes to thread posts.
*Return link to forum index in thread page.
*Fixed pesky undefined $oe in theme.php.
*Reordered paginator for accessability
*Numbered posts.
2012-09-25 20:37:20 +03:00
pachuco
1db92e6f2a Some CSS love. 2012-09-25 20:34:50 +03:00
pachuco
9cebef5a50 *Inexistent threads are no longer accesible.
*Pages outside index cut to last one(thread index and threads).
*Return to last page in thread after posting reply.
2012-09-25 20:33:56 +03:00
Shish
e3d385aee5 Merge branch 'master' of github.com:shish/shimmie2 2012-09-24 22:36:28 +01:00
Shish
ac812b4a2a danbooru api updates 2012-09-24 22:36:09 +01:00
Agasa
af9d5ed185 Update MassTagger redirect to reload page
Modified Mass Tagger extension to make it so that instead of redirecting to post/list it reloads the page instead, unburdening the user from a click on Back and manually reloading.
2012-09-24 12:02:22 +03:00
Shish
bbe2b1dc46 don't need to load the file into memory if we're responding with '304 not modified'... 2012-09-22 23:10:29 +01:00
Shish
5c30eab6ad merge Agasa's mass tagger work (replace tags mode, as opposed to the default of adding) 2012-09-22 22:58:56 +01:00
Shish
01aacdb19c admin function for fixing tag cases 2012-09-03 12:06:11 +01:00
Shish
da0bb2d65e Merge branch 'master' of github.com:shish/shimmie2 2012-09-03 10:49:35 +01:00
Shish
11340ca6da regen thumbs permission hack 2012-08-25 20:28:34 +01:00
velocity37
86402f681c bulk_add_csv: bulk_add with metadata
Imports a CSV with:
path,tags,source,rating

It is basically bulk_add with an fgetcsv loop instead of a foreach glob.
I wanted an easy way to import tagged data from other sources.
2012-08-23 17:03:46 -07:00
velocity37
624468851e Only show thumb_convert_path if using ImageMagick 2012-08-21 19:00:25 -07:00
velocity37
a2e1edded5 Actually use thumb_convert_path
The check would always fail even on Windows, resulting in thumb_convert_path never being used. See:
https://github.com/shish/shimmie2/issues/254
2012-08-21 18:51:20 -07:00
velocity37
10fadb27d1 Make thumb_convert_path not Windows-specific 2012-08-21 18:46:34 -07:00
velocity37
d154b38680 Add thumb_convert_path to Board Config 2012-08-21 18:42:14 -07:00
Shish
99e431598c streamline rotation 2012-08-18 21:12:44 +01:00
Shish
7ec7ca623b rotate ext from Agasa 2012-08-18 21:10:35 +01:00
Shish
0d2c78939e streamline resize image process 2012-08-18 21:09:40 +01:00
Shish
216dada347 somehow ImageIOTheme wasn't extending Themelet, and things mostly worked... 2012-08-18 20:56:35 +01:00
Shish
b538fd4e27 make the forum not *completely* broken... 2012-08-18 20:43:55 +01:00
Shish
82d74b5719 report SCore errors as errors... 2012-08-18 20:36:54 +01:00
Shish
c1fbf128c9 hackily fix non-niceurl'ed tests 2012-08-18 20:31:13 +01:00
Shish
27c06f02ce remove debugging thing 2012-08-18 20:29:45 +01:00
Shish
0fd8157e5e part way towards running tests from the CLI 2012-08-18 20:27:12 +01:00
Shish
5ddd358d5f don't user build_thumb_html statically 2012-08-18 19:47:57 +01:00
Shish
7dd929e5a8 remove a whole load of event->user variables that weren't used -- things should be using global user 2012-08-18 19:45:39 +01:00
Shish
f3aad43fa3 merge the two List Controls blocks 2012-08-18 19:23:11 +01:00
Shish
6fcdf4717e Merge branch 'js-classes' 2012-08-15 21:26:56 +01:00
Shish
5022d2b965 more tags, more opera glitch workarounds 2012-08-15 21:19:51 +01:00
Shish
887c746e35 mass tagger -> shm-*, specify what data tags shm-thumb has, now it works with all themes 2012-08-15 21:05:08 +01:00
Shish
6394cd8100 make shm-thumb use consistent across themes, with data-tags and data-post-id 2012-08-15 20:42:56 +01:00
Shish
8c39c29528 make tag hiding a little more consistent 2012-08-15 20:22:25 +01:00
Shish
4470d937a4 handle_pixel -> shm-* 2012-08-15 19:46:51 +01:00
Shish
f5d787efbf while we're here, fix the blotter in general... 2012-08-15 19:46:36 +01:00
Shish
fd4e801756 convert blotter to use ui-* and shm-* 2012-08-15 11:13:25 +01:00
Shish
fed253dc18 sort bans by add date 2012-07-28 12:07:55 +01:00
Shish
7e8cf48b08 and trigger the update... 2012-07-28 11:59:11 +01:00
Shish
49a1ae94b6 ban IP as an inet type 2012-07-28 11:56:55 +01:00
Shish
442e1a0de1 stricter data for ban adding 2012-07-28 11:42:07 +01:00
Shish
0a73424679 Merge branch 'master' of github.com:shish/shimmie2 2012-07-28 11:12:40 +01:00
Shish
ee52d582c4 image replacing simplicity 2012-07-28 11:12:05 +01:00
Shish
a9bfd1bcdc break 2012-07-24 20:38:10 +01:00
Shish
8b83b90b53 make tags required in the HTML form 2012-06-27 11:13:36 +01:00
Shish
951da261e8 Use the same 'create new image' block for post/list and oekaki pages 2012-06-26 20:00:38 +01:00
Shish
7391dcf0b6 configuarable oekaki size, and more consistent creation 2012-06-26 19:58:35 +01:00
Shish
80673b73ec re-arrange oekaki bits for better permissions 2012-06-26 19:47:40 +01:00
Shish
756de7b023 Merge pull request #243 from pachuco/master
Oekaki extension tweaks
2012-06-26 11:43:18 -07:00
Shish
cd693630a3 width: 100% + shadows fails 2012-06-26 19:41:20 +01:00
Shish
b82fd133fc Merge branch 'master' of github.com:shish/shimmie2 2012-06-26 19:38:53 +01:00
Shish
a3d77c6f42 firefox ignores file upload width attribute :| 2012-06-26 19:38:22 +01:00
Shish
287cea7959 >> = quote... 2012-06-26 19:38:02 +01:00
pachuco
6453c767ef Added ability to input resolution both in post index and oekaki page, as well as a little warning about losing canvas contents. 2012-06-24 23:25:46 +03:00
pachuco
6b6f60faca Authors of updated iconset credited.
Icons taken from https://github.com/CatoTH/ChibiPaint-Animexx-Edition
2012-06-24 23:22:14 +03:00
pachuco
e1c04facdb Users with insufficient privileges are now unable to use oekaki. 2012-06-24 23:21:22 +03:00
pachuco
4535299b2a Replaced icons with something actually bearable.
Updated internal readme to credit authors.
Taken from https://github.com/CatoTH/ChibiPaint-Animexx-Edition
2012-06-24 23:19:06 +03:00
Shish
0bc4ebafa5 somewhat excessive caching for index pages 2012-06-24 02:07:59 +01:00
Shish
8dfeb7cda3 longer cache timings, with better invalidation 2012-06-24 01:57:12 +01:00
Shish
9ca07641d2 build_thumb_html can't be called statically 2012-06-24 01:13:24 +01:00
Shish
a640de5283 a little extra error checking 2012-06-24 01:11:07 +01:00
Shish
38f7555d98 get rid of direct references to Database's engine 2012-06-24 00:57:55 +01:00
Shish
dd505e556e avoid using magic internal database->db value 2012-06-24 00:27:21 +01:00
Shish
d87e53ab90 cache reported image count 2012-06-23 23:28:38 +01:00
Shish
5a93e650c1 make sure featured image object is fully populated before caching, else it still lazy-queries tags each time 2012-06-23 23:25:53 +01:00
Shish
ee1162309a block caching 2012-06-23 23:21:04 +01:00
Shish
1daf0416bd optionally run jpegoptim on newly created thumbs 2012-06-23 23:02:02 +01:00
Shish
f61b4b3fcb proper setup bits for livefeed 2012-06-22 22:30:22 +01:00
Shish
16f1c06734 more livefeed tweaks - put the URL first for consistency 2012-06-22 20:04:12 +01:00
Shish
2e897e097d live feed tweaks 2012-06-22 19:32:41 +01:00
Shish
8dcd56e0ec udp log_net, because it's faster and more elegant 2012-06-22 19:19:13 +01:00
Shish
7ed7f4bbb8 Merge branch 'master' of github.com:shish/shimmie2 2012-06-22 19:14:15 +01:00
Shish
9291601a30 livefeed extension 2012-06-22 19:13:57 +01:00
Shish
029719cafe statsd ext, for trivially making graphs of site activity 2012-06-22 18:34:23 +01:00
Shish
4b2cba4642 bulk add uses tags from filename if filename is '123 - tag1 tag2 tag3.ext' folder name otherwise 2012-06-21 09:11:26 +01:00
Shish
8173a7cafd clear event listener cache when exts change 2012-06-18 00:29:41 +01:00
Shish
a9b3ffe0eb start of command-line ext manager 2012-06-18 00:27:58 +01:00
Shish
5519c3a320 lots of tidying and removal of duplicate code 2012-06-18 00:00:21 +01:00
Shish
082e6fa31b nice, event-based command line support; try 'php index.php' for info 2012-06-17 20:06:02 +01:00
Shish
427175983b don't pre-populate the ban lists with fake data, things get confused 2012-06-17 18:50:46 +01:00
Shish
1065a1915d bold for *unread* PMs 2012-06-10 18:40:30 +01:00
Shish
4a6f9f3245 say who a PM is from 2012-06-10 18:18:50 +01:00
Shish
f8cc785560 flashes for user changes 2012-06-10 18:13:22 +01:00
Shish
97d280501c image ban messages 2012-06-10 17:57:57 +01:00
Shish
8c1e495ab7 better IP Ban logging 2012-06-10 17:49:17 +01:00
Shish
239e028662 flash messages everywhere~ 2012-06-10 04:21:03 +01:00
Shish
a38aaba328 postgres has microseconds, which is overkill to display 2012-06-09 16:25:51 +01:00
Shish
82cc77817a delete comments by IP 2012-06-09 16:08:29 +01:00
Shish
5186601805 wording 2012-06-09 16:08:15 +01:00
Shish
b1e5ba794b update comment styles for new classes 2012-06-09 15:52:28 +01:00
Shish
2542051bc4 show user classes 2012-06-09 15:25:07 +01:00
Shish
8de1bd0c56 different classes for different types of comment list 2012-06-05 13:11:15 +01:00
Shish
5d431b9b03 apparently 'false' is an object with length, and the length is 1. Fuck PHP. 2012-05-28 09:55:55 +01:00
Shish
a809e95ff1 anonymous functions are php 5.3, shimmie aims for 5.2.6 2012-05-28 09:46:16 +01:00
Shish
4f8332f3f7 use the global and well tested make_http() rather than local hostify() 2012-05-23 11:50:04 +01:00
Shish
5fdb54c9ec missed a couple of big globs 2012-05-23 11:35:30 +01:00
Shish
bfd4ddea17 check for classes being loaded, not files existing 2012-05-23 10:39:21 +01:00
Shish
2e76add61b enhance zglob to allow really long patterns 2012-05-22 12:46:56 +01:00
Shish
cb8b4f3329 have a single var for memory limit 2012-05-22 12:26:47 +01:00
Shish
61f3a9d372 Merge branch 'master' of github.com:shish/shimmie2 2012-05-22 12:15:14 +01:00
Shish
2d451224dd only one of tags/image-specific-tags needs filling 2012-05-22 12:14:46 +01:00
Shish
708b117b2a caching for related tags 2012-05-16 06:33:04 +01:00
Shish
4cbd00c039 Merge branch 'master' of github.com:shish/shimmie2 2012-05-16 05:32:56 +01:00
Shish
23fe15e8cd clear CSS cache on theme changes 2012-05-12 10:04:17 +01:00
Shish
1ae3c8e0ba Merge branch 'master' of github.com:shish/shimmie2 2012-05-08 18:45:41 +01:00
Shish
216d137064 when uploading an archive, say the file was handled 2012-05-08 18:32:55 +01:00
Daku
3618c2dbb9 forgot to removing testing :x 2012-05-02 21:13:37 +01:00
Daku
d6de529ca5 should work properly with lite theme now.. 2012-05-02 20:48:39 +01:00
green-ponies (jgen)
dd88127c30 Undoing this commit: Removing unnecessary call to int_escape(). Simply cast to int inline, saving function call overhead. 2012-04-18 00:54:18 -04:00
green-ponies (jgen)
3b6e113e8b Merge branch 'mime_types' 2012-04-16 16:46:27 -04:00
green-ponies (jgen)
540e82a27a Actually use the mime type. 2012-04-15 20:00:27 -04:00
green-ponies (jgen)
a0a0ba5bbc A better version of bool_escape() that uses filter_var if possible.
Also removed undb_bool() as it was basically a copy of the old bool_escape function.
2012-04-15 19:28:27 -04:00
green-ponies (jgen)
a82f9382d1 Removing unnecessary call to int_escape(). Simply cast to int inline, saving function call overhead. 2012-04-15 18:40:06 -04:00
green-ponies (jgen)
8aff5c39ce Fix for mass_tagger when Nice URLs are enabled. 2012-04-15 18:24:25 -04:00
green-ponies (jgen)
a2b94b31dd Collect information on the Thumbnail engine as well. 2012-04-09 17:11:03 -04:00
Shish
f81fa08077 source search 2012-04-05 17:33:50 +01:00
Shish
df4ab51dd9 ban bad phrases from appearing in tags and source too 2012-04-05 17:22:06 +01:00
Shish
fdb6727f41 don't fail at multiple searches on the same param (eg 'id>=X id<=Y') 2012-04-05 16:18:41 +01:00
Shish
2a8643d06e Merge branch 'master' of github.com:shish/shimmie2 2012-04-05 15:20:38 +01:00
Shish
03795e7d1c if user has no votes, don't delete all their votes 2012-04-05 15:20:04 +01:00
Shish
6991bb9462 tag_editcloud breaks 'for i in array' 2012-04-03 03:52:17 +01:00
Shish
14770e4733 show stats *after* gathering them 2012-04-01 20:47:59 +01:00
Shish
e24b144acb test updates 2012-04-01 18:47:14 +01:00
Shish
2831f61489 clean up even if the mass delete fails 2012-04-01 18:17:33 +01:00
Shish
678215e4bd width / height were never used individually, now just have images 2012-04-01 17:47:39 +01:00
Shish
84cdd21e09 don't try to load notes if there are no notes 2012-04-01 17:32:02 +01:00
Shish
d80d81ea78 move jquery libs to lib/ 2012-04-01 17:09:46 +01:00
Shish
2fc4292cef expiring images is advanced, and also rarely used as people should have niceurls 2012-04-01 16:58:42 +01:00
Shish
19fb6a16ae image zoom isn't an admin option any more 2012-04-01 16:53:47 +01:00
Shish
d1a4c32ef6 only test enabled exts 2012-04-01 16:45:12 +01:00
Shish
cf5e35bd2d simpletest updates broke things... 2012-04-01 16:41:05 +01:00
Shish
070ba8c276 test improvements 2012-04-01 16:37:38 +01:00
Shish
664e6fa509 *image_ad* is blocked by opera, which makes use of image_admin a pain... 2012-04-01 16:06:11 +01:00
Shish
ab128b4b24 make non-nice images work 2012-04-01 15:55:48 +01:00
Shish
eb05458c9f change user class / delete user separate from admin 2012-03-31 19:25:27 +01:00
Shish
4a95f502f8 fix includes 2012-03-31 19:07:45 +01:00
Shish
75abdc7c04 store enabled exts in a config file, rather than moving directories around 2012-03-31 19:07:05 +01:00
Shish
67f1c1c51d store enabled exts in a config file, rather than moving directories around 2012-03-31 18:59:28 +01:00
Shish
81c7ac0120 mass source set perm 2012-03-31 16:31:10 +01:00
Shish
1d648d0d32 remove redundant code 2012-03-31 15:54:29 +01:00
Shish
5a2a2fa7e4 more removal of distinct classes 2012-03-31 15:43:25 +01:00
Shish
567755a185 Merge branch 'master' of github.com:shish/shimmie2 2012-03-31 12:38:44 +01:00
Shish
11372366ad gravatar note 2012-03-31 12:38:39 +01:00
Shish
c2de49c248 tag list caches in data/cache 2012-03-30 18:35:05 +01:00
Shish
e538181fa1 add alias after finishing the mass tag edit 2012-03-30 16:40:14 +01:00
Daku
546b7ea21e blocked tags will also set thumbblock div to 0 if theme is lite 2012-03-30 05:05:16 +01:00
Shish
e7fc084f44 log mass tag edits 2012-03-29 21:31:04 +01:00
Shish
d7578e754f test for mass tag edit 2012-03-29 21:12:24 +01:00
Shish
7a6ef55114 bleh, source validation. Anything is allowed and it's only linked on output if appropriate 2012-03-25 04:45:47 +01:00
Shish
893afe5b61 Merge branch 'master' of github.com:shish/shimmie2 2012-03-25 04:12:31 +01:00
Shish
f2f5ec720d debugging 2012-03-25 04:11:40 +01:00
Shish
cd8ec7bf41 sort alias CSV file the same way as the table 2012-03-25 03:32:32 +01:00
Shish
b628bcfa86 user deletion event, with vote deletion 2012-03-25 02:41:33 +01:00
Shish
266f3c4a9a quotes on single lines 2012-03-25 02:20:51 +01:00
Shish
5efdbdeb91 set zoomer val on shotcut too 2012-03-24 23:34:00 +00:00
Shish
1d4836e6c4 toggle zoom on click 2012-03-24 23:30:19 +00:00
Shish
8336fbfce5 and update the select box from cookie 2012-03-24 11:48:44 +00:00
Shish
0b45042161 ui- prefix for UI cookies 2012-03-24 11:23:06 +00:00
Shish
eb705d29f5 image scaling cookie 2012-03-24 11:17:09 +00:00
Shish
ecad3b9891 only refresh if needed 2012-03-22 16:35:44 +00:00
Shish
f993b3c19d js cookie expires 2012-03-22 16:28:57 +00:00
Shish
cfe0547755 force reflow after hiding some thumbs 2012-03-22 15:44:04 +00:00
Shish
898df24dd9 function for selecting blocks 2012-03-22 14:19:46 +00:00
Shish
2226bc9f15 hide thumbnails with given tags 2012-03-22 13:40:13 +00:00
Shish
b156d4f380 no need for 'load files in a good way' to be optional, just do it 2012-03-21 15:04:17 +00:00
Shish
58c06893e1 if the comment succeeds, we still want to set the 'user tried to comment' cookie :P 2012-03-19 20:05:19 +00:00
Shish
713c3db01a remove trailing slashes from displayed sources 2012-03-19 19:48:03 +00:00
Shish
49c0d09281 mass source setter 2012-03-19 19:42:52 +00:00
Shish
57d687a7e1 give images priority 10 2012-03-19 19:09:52 +00:00
Shish
e3f00166a7 remove whitespace 2012-03-19 18:51:25 +00:00
Shish
cadc99ae90 delete image after adding it, not after not-adding it 2012-03-19 14:27:04 +00:00
Shish
4db92471e1 404 for no images 2012-03-19 14:25:43 +00:00
Shish
ee4b223f65 comment_anon bool -> create_comment perm 2012-03-19 13:17:47 +00:00
Shish
bca3dd919d upload_anon bool -> create_image perm 2012-03-19 12:59:02 +00:00
Shish
1a34557da7 if image replacement is unwanted, don't allow users to replace images 2012-03-19 11:07:13 +00:00
Shish
9004c8d555 use user classes 2012-03-19 10:41:07 +00:00
Shish
fda6fb09fa don't show options that don't do anything... 2012-03-19 10:33:42 +00:00
Shish
a826a9c81a expiration only applies without niceurls 2012-03-19 10:25:36 +00:00
Shish
d21b9e58ab Merge branch 'master' of github.com:shish/shimmie2 2012-03-15 06:19:16 +00:00
Shish
a23498a8d7 more recently updated comments 2012-03-15 06:17:19 +00:00
Shish
537ae6de18 remove jquery deletion
jquery deletion was deleting the wrong image if there were multiple
delete buttons on one page (eg, on the report image page); also it
stands out awkwardly being the only bit of jquery UI on the site.
Moving to jquery UI across the site might happen later, but for now
I just want to get a release out...
2012-03-15 05:49:24 +00:00
Shish
6f4f4f3235 redirect back to report list after deleting, if that's where we came from 2012-03-15 05:48:42 +00:00
Shish
1a8ea4eb08 some windowses are not NT? 2012-03-15 05:34:55 +00:00
Shish
3acf53a32a default style:width:100% overrides width:100%. Use a local style 2012-03-14 20:28:15 +00:00
Shish
0be4f83e4e don't allow showing of metadata at all if exif_read_data is undefined 2012-03-14 20:24:34 +00:00
Shish
6632521218 permission name tweaks 2012-03-14 19:24:10 +00:00
Shish
cf7d1dded5 Merge branch 'master' of github.com:shish/shimmie2 2012-03-14 19:17:56 +00:00
Shish
16af27e6b7 only display editors for editable fields 2012-03-14 19:17:52 +00:00
Shish
7a6741d202 TYPE -> ENGINE 2012-03-14 18:11:46 +00:00
Shish
e67d679194 regexes are fun and pleasant to work with, in the same way that oranges are purple 2012-03-14 03:15:35 +00:00
Shish
b4fb667eaa use URLs for linking to comments 2012-03-13 16:04:50 +00:00
Shish
e31b6af28b site:// protocol support 2012-03-13 16:01:13 +00:00
Shish
c887580074 with no more wordwrap, there's no need for unwrap 2012-03-13 16:01:03 +00:00
Shish
d11dad3055 sup/sub support in bbcode 2012-03-13 16:00:25 +00:00
Shish
d6227ef1b3 #c123 is now the comment element directly, no need for parent() 2012-03-13 15:25:04 +00:00
Shish
8b78fce982 more forminess 2012-03-13 15:23:56 +00:00
Shish
947fbfd820 comment index -> comment/list, not post/list 2012-03-13 09:28:05 +00:00
Shish
bdf24c1f2a Merge branch 'master' of github.com:shish/shimmie2 2012-03-13 08:09:41 +00:00
Shish
028457ec32 parsing 2012-03-13 07:34:39 +00:00
Shish
9a0228720a truncate as a function, which works 2012-03-13 07:01:27 +00:00
Shish
dde5d4c9b5 html5 validation 2012-03-13 06:33:21 +00:00
Shish
ba46af2045 Merge branch 'master' of github.com:shish/shimmie2 2012-03-13 06:04:57 +00:00
Shish
f5c4c20f4b mass edit as its own test 2012-03-13 06:04:52 +00:00
Shish
16b232c857 user needs perm /and/ the image needs to be unlocked 2012-03-13 04:48:18 +00:00
Shish
f67b049176 allow logout from link 2012-03-12 18:04:06 +00:00
Shish
2ed73f9a68 user signup form 2012-03-12 18:03:46 +00:00
Shish
34d42d27f4 delete with images / with comments, and check auth token 2012-03-12 17:44:07 +00:00
Shish
0e262f5500 change_X -> edit_X for consistency 2012-03-12 17:29:03 +00:00
Shish
05f8d0d23e justify~ 2012-03-12 15:43:18 +00:00
Shish
41971f907f missed a bit 2012-03-12 05:36:39 +00:00
Shish
78d13ff214 many theme updates 2012-03-12 05:31:19 +00:00
Shish
aaf9280ee4 more styling 2012-03-12 04:56:30 +00:00
Shish
f2dfbb9080 no background for image-list 2012-03-12 04:41:57 +00:00
Shish
98310df9ee nothing actually used this... 2012-03-12 03:28:24 +00:00
Shish
40b09c8ee1 less divvy comments 2012-03-12 03:28:08 +00:00
Shish
5d6cf955af refactoring styles 2012-03-12 03:06:14 +00:00
Shish
7d027494b6 toggle-id -> toggle-sel 2012-03-12 02:50:41 +00:00
Shish
5803920bcc more forms 2012-03-11 15:53:19 +00:00
Shish
b7006e90db Merge branch 'master' of github.com:shish/shimmie2 2012-03-11 15:50:04 +00:00
Shish
4c0b2dcb39 Merge branch 'master' of github.com:shish/shimmie2 2012-03-11 15:49:52 +00:00
Shish
c78ad128bf forms 2012-03-11 15:49:40 +00:00
Shish
071b783f56 forms 2012-03-11 15:49:25 +00:00
Shish
e4c95d5b56 Merge branch 'master' of github.com:shish/shimmie2 2012-03-11 04:33:23 +00:00
Shish
9e65732ea1 mysql ignores the FK names anyway, so all they were doing was bothering me ~_~ 2012-03-11 01:52:25 +00:00
Shish
97eb527714 named constraints 2012-03-10 19:38:50 +00:00
Shish
89efc3b524 Merge branch 'master' of github.com:shish/shimmie2 2012-03-10 19:13:42 +00:00
Shish
6c459c8323 make it so 2012-03-10 19:13:41 +00:00
Shish
a2d2ceb015 foreign keys delete comments now 2012-03-10 19:07:40 +00:00
Shish
f62edc3e83 add FKs for comments 2012-03-10 19:07:02 +00:00
Shish
37672bc1ee comment schema wibbles 2012-03-10 18:57:35 +00:00
Shish
1bfa656e35 another unused function 2012-03-10 02:21:42 +00:00
Shish
5c36d996e0 test 404 handler's static files too 2012-03-10 02:19:04 +00:00
Shish
b5bca91bee toggler in default setup theme 2012-03-10 02:04:15 +00:00
Shish
a20245ff70 Merge branch 'master' of github.com:shish/shimmie2 2012-03-10 01:07:02 +00:00
Shish
eb8c15b9a0 whitespace 2012-03-09 22:08:55 +00:00
Shish
788f25a12d Merge pull request #168 from DakuTree/master
Shimmie API
2012-03-09 14:02:12 -08:00
Shish
1f07a273f6 move copy & pasted transload code into a shared function 2012-03-09 21:07:21 +00:00
Daku
f76955123f update source & rating if &update is set 2012-03-09 20:46:26 +00:00
Shish
126ed2ee78 example.com changed... 2012-03-09 20:01:51 +00:00
Shish
36226d3b15 normalised source display 2012-03-09 19:18:20 +00:00
Shish
5d3d4e8d76 test fixes 2012-03-09 18:56:06 +00:00
Shish
5d8169c577 bbcode test fixes 2012-03-09 18:15:58 +00:00
Shish
d7d2bf7418 user test updates 2012-03-09 18:15:03 +00:00
Shish
79ce40abd0 less code 2012-03-09 18:14:14 +00:00
Shish
fb111803c7 save a warning 2012-03-09 18:12:46 +00:00
Shish
c7e2ef74f8 if username or password are blank, exit early (saves logging the failed attempt) 2012-03-08 04:35:52 +00:00
Shish
9ebe425520 Merge branch 'master' of github.com:shish/shimmie2 2012-03-08 03:35:17 +00:00
Shish
285b78c185 image specific tags on mass upload form 2012-03-08 03:34:57 +00:00
Shish
569e93cd6b postgres requires a sequence name to be passed to get_last_insert_id 2012-03-08 02:55:04 +00:00
Shish
58d533ceb9 put a snippet of each comment in the event log 2012-03-08 02:36:21 +00:00
Shish
90347a08dd extent rather than crop and repage 2012-03-06 20:30:41 +00:00
Shish
232991979c upload page wibbling 2012-03-06 15:38:53 +00:00
Shish
24c64b50b4 make bookmarlet code more readable 2012-03-06 12:22:08 +00:00
Shish
cba1e76b1f only force-wrap comments 2012-03-05 10:24:01 +00:00
Shish
4245cd268c if user has no js, default to showing info editor 2012-03-05 10:22:55 +00:00
Shish
8448a4cee1 don't overwrite global $user... 2012-03-05 09:55:11 +00:00
Shish
b17fe7e7bd make bookmarklet.js easier to read 2012-03-05 09:52:48 +00:00
Shish
8b62ad281a if upload_collision_handler is set to 'don't merge tags', then don't merge tags 2012-03-05 09:32:08 +00:00
Daku
0dd7d086f2 option to sort taglists alphabetically rather than by tag count 2012-03-04 22:18:03 +00:00
Daku
e5e27a7804 bookmarklet should now play nice with tags that contain + 2012-03-04 22:18:03 +00:00
Daku
74e307b55f update tags if image already exists 2012-03-04 22:18:02 +00:00
Josh Sutinen
fa77d999eb Wordwrapping BEFORE applying bbcode breaks long links
Wordwrapping AFTER breaks the HTML generated by bbcode when using PHP's wordwrap(), better not to hard wordwrap at all and just do it with CSS
2012-03-03 12:39:24 -05:00
Shish
74f0d38c04 comment snippets should link to the specific comment 2012-03-02 21:15:04 +00:00
Justin Brewer
8f49922556 Fixed Popular Tags List
All the links pointed to /post/list/$link
2012-02-27 17:37:09 -06:00
Shish
1ff0703a91 Merge branch 'master' of github.com:shish/shimmie2 2012-02-26 15:24:30 +00:00
Shish
dadcb809ba don't log for null->null 2012-02-26 15:24:02 +00:00
Shish
ff30b54130 better solution, replace /post/view/123#456 with #456 if #456 exists 2012-02-22 15:13:05 +00:00
Shish
11c804b347 only need to view the image page if the linked-to comment doesn't already exist on the current page 2012-02-22 14:46:47 +00:00
Shish
a4f2c417ec CSS3 powarr 2012-02-22 14:27:56 +00:00
Shish
2e66ca44d7 temporary old-syntax support; also, parent() makes sense for default and r34 themes 2012-02-22 14:14:40 +00:00
Shish
169ae5f590 installer fails 2012-02-22 13:58:55 +00:00
Shish
f9de9ece21 replace comment links with usernames 2012-02-22 13:49:57 +00:00
Shish
6222c0d093 redirect to the bottom of the thread when commenting 2012-02-22 13:25:03 +00:00
Shish
833ef69ec4 reliability 2012-02-22 13:21:37 +00:00
Shish
e03537f89b missed a char 2012-02-22 13:18:51 +00:00
Shish
f8fec8a036 prefix comment ID with c, so it isn't just a random number 2012-02-22 13:07:04 +00:00
Shish
aaceb99aa5 rather than <a name=foo>, stick an ID on the comment 2012-02-22 13:05:17 +00:00
Shish
eccea620ba only admins can change user classes, and they should be protected from moderators 2012-02-22 12:32:54 +00:00
Shish
cf621c066c remove duplicate code 2012-02-22 10:18:07 +00:00
Shish
5e8560facb move static files into lib/static, and allow different themes to override them 2012-02-22 09:54:49 +00:00
Shish
6110be6af9 Merge branch 'master' of github.com:shish/shimmie2 2012-02-22 09:38:01 +00:00
Shish
4d2a066717 user classes in the installer 2012-02-21 18:37:36 +00:00
Shish
7b6112dc2c and document it 2012-02-17 01:45:55 +00:00
Shish
a6f8ce2a14 better search by date 2012-02-17 01:43:49 +00:00
Shish
af7704825b use HTTP status codes with error messages 2012-02-16 15:37:05 +00:00
Shish
5fc7d6e574 Merge branch 'master' of github.com:shish/shimmie2 2012-02-16 15:20:36 +00:00
Daku
6ba66789e4 highlight comment on >> click (this seems like the wrong way of doing this) 2012-02-16 04:44:23 +00:00
Shish
c2bf42ef5a less passing of $page 2012-02-15 08:59:24 +00:00
Shish
3c1b20e05b user classes 2012-02-14 20:38:19 +00:00
Shish
809e1c22d6 Merge branch 'master' of github.com:shish/shimmie2 2012-02-14 06:34:28 +00:00
Shish
85fb34e20f allow failed upgrades 2012-02-14 06:33:59 +00:00
Shish
519e46578d more notation for which strings are HTML safe and which aren't 2012-02-13 20:51:34 +00:00
Shish
7ab867cc79 remove the extra </div> 2012-02-12 12:40:07 +00:00
Shish
2da52689cf upload box style 2012-02-12 12:00:19 +00:00
Shish
5241ed24b5 more style to file 2012-02-12 11:37:12 +00:00
Shish
6c29ccee40 split extension styles, so other themes can use them better 2012-02-12 11:25:58 +00:00
Shish
67623246e9 leave sizes to css 2012-02-12 11:14:04 +00:00
Shish
94eb1fab88 variable size longtext config fields 2012-02-12 10:19:35 +00:00
Shish
a2459da61b even better columns: CSS 2012-02-12 09:51:25 +00:00
Shish
830105193d better settings columning 2012-02-12 09:22:11 +00:00
Shish
1dcda150f7 nicer whitespace for upload settings 2012-02-12 07:30:29 +00:00
Shish
e535b1f002 only show samefag ID if showing regular IDs 2012-02-11 10:37:50 +00:00
Shish Moom
6da4da8060 Merge pull request #129 from green-ponies/master
Type hints
2012-02-11 01:22:43 -08:00
Shish
9aa5644504 colours don't scale either D: numbers then... 2012-02-11 08:33:09 +00:00
Shish
ce5db719c3 coloured anons 2012-02-11 08:18:51 +00:00
Shish
d83c596c01 consistent width for comment list tables 2012-02-11 04:27:00 +00:00
Shish
0a4a211c2b wider info box 2012-02-11 02:30:59 +00:00
Shish
0013d67a80 actually, go back to consistency; inconsistency can be a customisation 2012-02-11 01:34:24 +00:00
Shish
4b0bcf44f8 Merge branch 'master' of github.com:shish/shimmie2 2012-02-11 00:55:39 +00:00
Shish
f1c4684ac0 Merge branch 'master' of github.com:shish/shimmie2 2012-02-11 00:52:59 +00:00
Shish
a93247327a editable tags by default, and hide .edit by default 2012-02-11 00:52:42 +00:00
green-ponies (jgen)
a95766c410 More type hints. 2012-02-10 00:08:03 -05:00
green-ponies (jgen)
30eb5ddd8b More type hints! 2012-02-09 23:04:37 -05:00
Shish
77fc6f22b2 colour anons by IP address, for easier samefag spotting (commented out atm though) 2012-02-10 02:16:44 +00:00
Shish
0b26eba141 gaaah inconsistent database schema 2012-02-10 01:55:33 +00:00
Shish
c627e564c4 Merge branch 'master' of github.com:shish/shimmie2 2012-02-10 01:29:49 +00:00
Shish
34fd9751db username CSS, so that the name can be consistent even when it's a non-linked anon 2012-02-10 01:29:31 +00:00
Shish
01b89c2a1b function for showing IPs with ban button 2012-02-09 22:51:41 +00:00
Shish
f8af5c0e07 link to IP ban page from comments and images 2012-02-09 22:21:54 +00:00
Shish
d15c3010c8 clearer terminology 2012-02-09 17:35:42 +00:00
Shish
db9a1cc7d8 only show edit / set if the user can edit tags 2012-02-09 17:29:04 +00:00
Shish
5f4f941444 half-logged-in only for one day 2012-02-09 17:11:03 +00:00
Shish
912f096d8c give nocache cookies to people who /attempt/ to post on old forms, not just those who succeed 2012-02-09 17:07:36 +00:00
Shish
fbbdc898b0 Move image uploader info into the image info editor, make it editable 2012-02-09 17:03:39 +00:00
Shish
7ced04d0d0 separate uploader info 2012-02-09 15:35:59 +00:00
Shish
6e8970b15d functioning 2012-02-09 15:17:11 +00:00
Shish
f9c1f8229c remove non-functional bits 2012-02-09 15:06:35 +00:00
Shish
339f2b0497 more jquery magic, less inline scripting 2012-02-09 14:45:18 +00:00
Shish
8d15ae8c0a more js to lib/shimmie.js 2012-02-09 14:38:32 +00:00
Shish
efa7f4f17c autocomplete on a class name 2012-02-09 14:34:29 +00:00
Shish
3584f40551 Merge branch 'master' of github.com:shish/shimmie2 2012-02-09 01:07:21 +00:00
Shish
0698b780f9 remove regular Extension, have SimpleExtension take its place, optimise the event system based on SimpleExtension methods 2012-02-08 12:07:01 +00:00
Shish Moom
3b99605521 Merge pull request #116 from green-ponies/speed_tweaks
More Speed tweaks
2012-02-07 21:53:00 -08:00
Shish Moom
1b5f1dcafb Merge pull request #107 from DakuTree/master
Reset Image ids & Download all images
2012-02-07 20:32:28 -08:00
green-ponies (jgen)
d69fa6ae9d Merge branch 'master' into speed_tweaks 2012-02-07 23:21:56 -05:00
green-ponies (jgen)
2d443f0be9 Mostly just adding the Link to comments. 2012-02-07 21:52:11 -05:00
green-ponies (jgen)
0cdc303397 Just more comments. 2012-02-07 20:25:05 -05:00
Shish
37bffe0689 actually, ext-specific DB changes should live in that ext... 2012-02-07 19:26:40 +00:00
Shish
1455956f18 putting foreign key additions into auto-upgrade ext 2012-02-07 19:18:58 +00:00
Shish
0589f9d72e fine grained permission bits 2012-02-07 15:15:18 +00:00
Shish
ab7c62515e move JS bits into static files 2012-02-07 11:33:42 +00:00
Daku
e92d4f6809 fixes gelbooru with bookmarklet 2012-02-07 00:02:53 +00:00
Daku
94d2f99df2 this should fix bookmarklet not working with nice urls 2012-02-07 00:02:51 +00:00
Daku
9efce5378c small fix for bookmarklet image url 2012-02-07 00:02:50 +00:00
Daku
6e602aa430 forgot to remove this... 2012-02-07 00:02:50 +00:00
Daku
1f871a69e1 fixing flash again :x 2012-02-07 00:02:49 +00:00
Daku
a25f405470 bookmarklet now supports sankaku and konachan 2012-02-07 00:02:49 +00:00
Daku
26b688fe9b bookmarklet now supports oreno.imouto 2012-02-07 00:02:48 +00:00
Shish
a9ec9b6b70 comment info box 2012-02-06 14:42:38 +00:00
Shish
aa2696ca07 only add ellipsis if the comment actually is too long 2012-02-06 14:42:07 +00:00
Shish
e38f9e720f CSS has odd/even built-in now 2012-02-06 12:24:13 +00:00
Shish
d2d03396af info box 2012-02-06 12:23:56 +00:00
Shish
7a25fad4b0 link to specific comments 2012-02-05 07:37:20 +00:00
Shish
4e1300631b Merge branch 'master' of github.com:shish/shimmie2 2012-02-05 04:25:58 +00:00
Shish
0b13db8ed7 hide anonymous's user page - having made a million comments, it was taking upwards of 60 seconds to process that one page, triggering the DOS defences... 2012-02-05 04:25:50 +00:00
Shish
5843aae4f2 random unused global o_O 2012-02-05 04:20:42 +00:00
green-ponies (jgen)
3b028696a0 Rewind arrays before foreach loops over all the elements.
(fixed a small typo as well)
2012-02-04 15:35:21 -05:00
green-ponies (jgen)
68e9bd694e Storing copies of config variables outside of for loops. 2012-02-04 14:17:52 -05:00
green-ponies (jgen)
0a1e8f2af4 Store config values that are used inside a loop. 2012-02-04 12:20:49 -05:00
Shish
dab85e5f26 merge type hints 2012-02-02 14:16:14 +00:00
Shish
cc8f1f35a5 more type hints 2012-02-02 14:14:33 +00:00
Shish
bbb51b60f8 typos~ 2012-02-02 08:09:48 +00:00
Shish
dc6c173efd type hints for hiphop 2012-02-02 08:07:57 +00:00
Shish
ec0fab54d8 these are magicked now 2012-02-02 07:53:27 +00:00
Shish
465011a68c hiphop chokes on this 2012-02-02 05:27:40 +00:00
Shish
b3d5878ce8 use the param 2012-02-02 05:24:06 +00:00
Shish
d5527d6dc8 missed a global 2012-02-02 05:23:55 +00:00
Shish
75b9bc2650 typo in merged code 2012-01-31 14:46:19 +00:00
Shish
fe85b2b5ee Merge remote branch 'zshall/master' 2012-01-31 14:00:41 +00:00
Shish
6f22207603 merge pdo fixes 2012-01-31 13:55:12 +00:00
Shish
aed5e1a30e hand merge of speed tweaks 2012-01-31 13:20:43 +00:00
Shish
1cd4f867b5 don't die if [/code] comes before [code] 2012-01-31 12:24:29 +00:00
Shish
8192f278d5 different sql for different databases :( 2012-01-31 12:15:25 +00:00
Shish
7af442855d this isn't so necessary with latest upstream changes 2012-01-30 02:18:16 +00:00
Shish
21904794ea Upload to simpleext 2012-01-27 17:12:08 +00:00
Shish
7aeb0ec097 tag list needs no manual adding 2012-01-27 17:06:29 +00:00
Shish
cb1b45e4ad code formatting consistency 2012-01-27 17:05:02 +00:00
Shish
2d49d9b103 use the right inheritance 2012-01-27 17:02:36 +00:00
Shish
f5eadb9011 Tag List to simpleext 2012-01-27 17:02:08 +00:00
Shish
5c2140a028 Tag Editor to simpleext 2012-01-27 16:58:48 +00:00
Shish
ee40a9aad3 merge 2012-01-27 16:49:35 +00:00
Shish
7a5f87572c an image already knows what its own details are, it doesn't need to be passed them... 2012-01-27 16:27:02 +00:00
Shish
f3014e4e1e less regex 2012-01-27 12:24:38 +00:00
Shish
93c2aa2084 only show IP list to admin and self-user, and don't show anon's list 2012-01-27 10:17:44 +00:00
Shish
ad9dcfe926 make sure s is set 2012-01-26 18:03:04 +00:00
Shish
85af28c0b5 return after error, don't handle the bad data 2012-01-26 17:16:57 +00:00
Shish
52bbb36af4 shm_user breaks varnish cache 2012-01-26 16:51:24 +00:00
Shish Moom
38aa55dafd Merge pull request #99 from DakuTree/master
Auto resize on upload + Popular by Day/Month/Year
2012-01-26 08:01:37 -08:00
Shish
1877aa9973 Merge branch 'master' of github.com:shish/shimmie2 2012-01-26 15:26:08 +00:00
Shish
98f09695b6 sometimes tags are set with no images id... 2012-01-26 15:16:52 +00:00
Daku
0565568e5c source should log now when uploading 2012-01-26 09:56:29 +00:00
Shish
f38b45e2a9 there are some odd cases where anonymous is not user #1, so use the anon_id variable 2012-01-24 16:40:36 +00:00
NaGeL
ddd3f99835 deleting the user withouth images delete resulted in image deletion too: the DB entriy gets removed but the image stays on the Hard drive.
this is fixed.
also the Foreign key needs to be manually updated in images table.
named the foreign keys in install.php for easier altering in the future.
2012-01-22 20:14:35 +01:00
NaGeL
023384149f User deletion (Deletes the user with comments, favorites and private messages)
User deletion with uploaded images ( all above plus the images the user uploaded)
Also the Database fix that is all needed for this in DBupdate.php
2012-01-22 18:55:52 +01:00
NaGeL
1ccc26ebd4 Merge branch 'master' of git://github.com/shish/shimmie2 2012-01-22 16:30:12 +01:00
Shish
03204859c1 merge~ 2012-01-22 15:11:39 +00:00
Shish
ddf61714f6 argh sql syntaxes 2012-01-22 14:54:03 +00:00
Daku
3338ff0420 tags/source/rating/locked should only update/log if different than current 2012-01-21 00:17:07 +00:00
Daku
eeaa27133a fixed rating with bookmarklet 2012-01-20 12:45:43 +00:00
Daku
471e3d057a fixed bookmarklet on danbooru flash pages again.. 2012-01-20 12:45:42 +00:00
Daku
9a35401666 image replace form now uses jquery 2012-01-20 12:45:40 +00:00
Daku
79b4adf1d1 renamed style.css for the upload ext to avoid autoloading 2012-01-20 12:45:38 +00:00
Shish
f5edb4fb4e the 24 hour limit can apply to the page count too, making that also 70x faster 2012-01-20 05:24:29 +00:00
Shish
4c2adce744 limiting by date at the database level is ~70x faster than limiting by page at the PHP level 2012-01-20 04:34:06 +00:00