Commit Graph

5960 Commits

Author SHA1 Message Date
Albert Yi
9d725f1132 Merge pull request #3163 from evazion/fix-3159
Fix #3159: Upload bookmarklet not provided using same protocol accessed page.
2017-06-16 12:48:29 -07:00
Albert Yi
d74b8d8ba5 Merge pull request #3164 from evazion/feat-dtextify-twitter
Fix #3162: Twitter commentary links
2017-06-16 12:48:12 -07:00
Albert Yi
2ee702075d Merge pull request #3165 from evazion/fix-applicationrecord
Fix #3154: Inherit models from ApplicationRecord
2017-06-16 12:22:23 -07:00
evazion
1a998cb3fb Move API methods from initializer to ApplicationRecord. 2017-06-16 13:28:31 -05:00
evazion
c1834ab8dd Inherit models from ApplicationRecord instead of ActiveRecord::Base. 2017-06-16 13:28:31 -05:00
evazion
5dd3151d5b twitter: convert commentary to dtext.
* Convert hashtags and mentions to dtext links.
* Replace http://t.co urls to the actual url.
* Strip the http://t.co url linking to the tweet itself.
2017-06-16 12:56:55 -05:00
evazion
9909ff20cd twitter: memoize api response. 2017-06-16 12:56:55 -05:00
evazion
aef7fcd34c /static/bookmarklet: update bookmarklet description.
Better explain what the bookmarklet does, why it should be used, and how
to install it.
2017-06-15 22:29:18 -05:00
evazion
b80111ea05 /static/bookmarklet: fix typo in page id. 2017-06-15 22:29:18 -05:00
evazion
4806297fde /static/bookmarklet: use HTTPS in bookmarklet if connected via HTTPS. 2017-06-15 22:28:14 -05:00
Albert Yi
56b1651cd4 Merge pull request #3157 from r888888888/more_metatags
Add more support for negated existing metatags
2017-06-15 11:36:14 -07:00
Albert Yi
a7b8a0d9f7 Merge pull request #3158 from evazion/fix-expunge-post
Fix #3156: Expunging posts is broken
2017-06-15 11:34:02 -07:00
Type-kun
bf6add5273 Add more support for negated existing metatags 2017-06-15 18:11:53 +05:00
evazion
5c6eb0f475 posts: remove unused update_iqdb method.
Unused since 7aab50f.
2017-06-14 21:31:30 -05:00
evazion
d84feaa4bb posts: fix expunging posts not removing image from iqdb.
`File.exists?(preview_file_path)` is always false because the file has
already been deleted by this point. Remove the check entirely.
2017-06-14 21:31:30 -05:00
evazion
b27f98dc58 posts: fix expunging posts to delete files only after transaction succeeds. 2017-06-14 21:31:30 -05:00
evazion
a844a1daf4 posts: fix expunging posts not deleting files.
Fix expungement to ignore the "file still in use" check.
2017-06-14 21:31:24 -05:00
r888888888
d691c1de36 fixes #3066: add bootsnap support 2017-06-14 16:35:16 -07:00
r888888888
f27d065e1f fixes #3119 2017-06-14 16:30:19 -07:00
r888888888
b2245349b3 fixes #3136 2017-06-14 16:21:05 -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
cdef9fda7d tests: fix send_message in post/pool archive helpers.
Since efe5e0e send_message is called with an extra param; fix mocked
send_message to handle this param.
2017-06-14 14:13:52 -05:00
evazion
155faf8380 commentaries: merge versions (fix #3149). 2017-06-14 13:52:24 -05:00
r888888888
85fa58cb7c add test for #3153 2017-06-14 11:36:04 -07: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
Type-kun
ca2adac3f0 Include user with every level/privilege in seeds.rb 2017-06-14 18:33:54 +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
caebdef9fd commentaries: trim whitespace from existing commentaries. 2017-06-13 16:42:30 -05: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
abb7117996 commentaries: add tests. 2017-06-13 15:13:53 -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
12dc2a4c9b adjust scratch gitignore 2017-06-12 15:25:07 -07: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