Commit Graph

5008 Commits

Author SHA1 Message Date
Type-kun
bf6add5273 Add more support for negated existing metatags 2017-06-15 18:11:53 +05:00
r888888888
f27d065e1f fixes #3119 2017-06-14 16:30:19 -07:00
Albert Yi
24ad435067 Merge pull request #3155 from evazion/fix-artcomm-version-merge
Fix #3149: Artist commentaries should merge versions
2017-06-14 12:26:46 -07:00
r888888888
6174d0eef2 normalize nijie popup urls (fixes #3153) 2017-06-14 12:26:13 -07:00
evazion
155faf8380 commentaries: merge versions (fix #3149). 2017-06-14 13:52:24 -05:00
Albert Yi
f780b32012 Merge pull request #3145 from r888888888/flagger_metatag
Add "flagger:" and "appealer:" metatags (fixes #3142)
2017-06-14 11:02:08 -07:00
evazion
1ffc9d286c Fix User#can_view_flagger?. 2017-06-14 12:08:25 -05:00
Type-kun
d4944d6c11 Avoid using creator_id as a local variable in flag model 2017-06-14 20:56:02 +05:00
Type-kun
1375cc5307 Added privilege check for seeing flagger usernames
Also reworked all places dealing with flagger names to use said privilege
2017-06-14 20:43:25 +05:00
r888888888
4a07848b6d add prefix for sqs message group id 2017-06-13 16:36:39 -07:00
r888888888
efe5e0e95e add message group id for post archives 2017-06-13 16:35:01 -07:00
Albert Yi
40d24278cf Merge pull request #3150 from evazion/fix-artcomm-whitespace
Fix #2174: Trim whitespace from artist commentary
2017-06-13 16:02:31 -07:00
Albert Yi
7881d06858 Merge pull request #3148 from evazion/fix-replacement-deletions
Post replacements: don't delete files currently in use.
2017-06-13 15:52:22 -07:00
Albert Yi
954666893f Merge pull request #3147 from evazion/fix-1908
Fix #1908: Allow E shortcut to work on upload page.
2017-06-13 15:40:29 -07:00
Albert Yi
ee28cf539f Merge pull request #3146 from evazion/fix-reltags-alias
Fix #1608: Show wiki page of alias consequent for Related Tags
2017-06-13 15:39:42 -07:00
evazion
f8afabd51c commentaries: trim whitespace from fields. 2017-06-13 16:42:30 -05:00
evazion
1aafdc3928 commentaries: migrate columns to non-null. 2017-06-13 16:42:29 -05:00
evazion
27aa9fe82a post replacements: don't delete files still in use.
Bug: if a user replaces a post with another image, then replaces the
post back to the original image, then the deletion job for the original
image will still run. The will delete the original file, but that file
is now in use again and should not be deleted.
2017-06-13 02:20:23 -05:00
evazion
a1c9f34027 Fix #1908: Allow E shortcut to work on upload page. 2017-06-12 20:28:56 -05:00
evazion
c06ae5277e Fix #1608: Show wiki page of alias consequent for Related Tags
Make related tags apply aliases before fetching tags from the wiki page.
2017-06-12 19:52:19 -05:00
r888888888
d9ea925f4e add support for searching for dup-related flags 2017-06-12 15:25:07 -07:00
Albert Yi
24154af54b Merge pull request #3143 from evazion/fix-post-versions-wordbreaks
Fix wordbreaks in tags on /post_versions
2017-06-12 15:16:40 -07:00
Albert Yi
73d9b8b5f5 Merge pull request #3141 from evazion/fix-da-login-only
Fix #3138: Support DeviantArt login-only works.
2017-06-12 14:44:22 -07:00
Albert Yi
e26a974578 Merge pull request #3140 from evazion/fix-reltags-xss
Fix #3139: XSS in Related Tags javascript.
2017-06-12 14:41:34 -07:00
Type-kun
5d4592e0e0 Add "flagger:" and "appealer:" metatags (fixes #3142) 2017-06-13 00:15:49 +05:00
Type-kun
04ef575704 Prevent exception if upload feedback topic is not set in config 2017-06-12 22:44:29 +05:00
evazion
1f2840917f /post_versions: fix taglist to wordbreak between tags. 2017-06-11 13:48:13 -05:00
evazion
f3f55daea6 Fix #3138: Support DeviantArt login-only works. 2017-06-10 10:34:51 -05:00
evazion
5f9fce7343 Fix #3139: XSS in Related Tags javascript. 2017-06-09 20:40:07 -05:00
Albert Yi
30fc9c93c3 Merge pull request #3137 from evazion/fix-da-artcomms
Autoconvert DeviantArt commentary from HTML to DText
2017-06-09 15:58:05 -07:00
evazion
82c7537270 deviantart: force commentary encoding to utf-8. 2017-06-09 13:19:24 -05:00
evazion
ccacfb40be deviantart: translate artist commentary from html to dtext. 2017-06-09 13:19:24 -05:00
evazion
42aed84975 /posts/$id: fix artcomm dialog to use dtext-ified commentary. 2017-06-09 12:29:04 -05:00
evazion
9234fa7885 post replacement: allow replacing ugoiras. 2017-06-08 23:54:51 -05:00
Albert Yi
f44f5d1fdb Merge pull request #3126 from evazion/feat-queue-pools
Fix #3125: Show pools in mod queue
2017-06-08 14:13:44 -07:00
Albert Yi
7fb0e561cc Merge pull request #3124 from evazion/fix-artstation-sources
Multiple ArtStation fixes
2017-06-08 14:11:21 -07:00
Albert Yi
7af1018f18 Merge pull request #3127 from evazion/fix-3123
Fix #3123: Error with user JSON query when the Archive service is not installed
2017-06-08 14:09:32 -07:00
Albert Yi
1548efbbae Merge pull request #3128 from evazion/fix-inline-blacklists
Fix #3121: No Blacklist Box on the various controllers
2017-06-08 14:05:56 -07:00
Albert Yi
ec27a4aa96 Merge pull request #3120 from evazion/fix-gallery-warning
Fix gallery warning for non-Pixiv galleries.
2017-06-08 14:05:13 -07:00
evazion
2929857682 blacklists: fix inline blacklist css to work on any page. 2017-06-07 23:31:34 -05:00
evazion
5c9b5cd21e blacklists: add missing blacklist controls on several pages (fix #3121). 2017-06-07 23:30:35 -05:00
evazion
23fb6b8d15 /users/$id.json: fix exception when pool archives is disabled (fix #3123). 2017-06-07 22:54:16 -05:00
evazion
58bd0670b7 Post#pools: avoid query when post has no pools. 2017-06-07 22:45:28 -05:00
evazion
151b276fb9 modqueue: display pools for each post (fix #3125). 2017-06-07 22:45:01 -05:00
evazion
12fffc3760 modqueue: factor out modqueue posts into partial. 2017-06-07 22:44:46 -05:00
Type-kun
b3cd93a75c Fixes #3122 2017-06-07 21:19:53 +05:00
evazion
39bd141667 artstation: fix fetch source data for image urls.
Fixes 'Fetch source data' when uploading an image url and the referer
url is available:

* https://danbooru.donmai.us/uploads/new?url=https://cdna.artstation.com/p/assets/images/images/006/029/978/large/amama-l-z.jpg&ref=https://www.artstation.com/artwork/4BWW2
2017-06-07 10:20:18 -05:00
evazion
edd02c4019 artstation: normalize to www.artstation.com/artwork/$id for sidebar. 2017-06-07 10:20:18 -05:00
evazion
b1171306a1 artstation: include only images in image_urls. 2017-06-07 10:20:18 -05:00
evazion
215569fbe0 artstation: fix source to page url after download. 2017-06-07 10:20:17 -05:00