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

1739 commits

Author SHA1 Message Date
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