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

1559 commits

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