 Albert Yi
|
4ff5af626f
|
upgrade to ruby 2.5.1
|
2018-03-29 09:56:35 -07:00 |
|
|
Albert Yi
|
fa9442209e
|
fix typo in storagemanager/s3
|
2018-03-28 17:23:07 -07:00 |
|
|
Albert Yi
|
18dd47c557
|
Merge branch 'master' of github.com:r888888888/danbooru
|
2018-03-28 17:19:35 -07:00 |
|
|
Albert Yi
|
929b2fa896
|
move default base url to method to deal with deployment issues
|
2018-03-28 17:19:21 -07:00 |
|
 Albert Yi
|
8bdb7e982d
|
Merge pull request #3584 from evazion/feat-libvips
Fix #3582: Switch from ImageMagick to libvips
|
2018-03-28 16:34:18 -07:00 |
|
|
Albert Yi
|
6c790c61d3
|
replace uploader information post previews and comment listing, rename tagger to top tagger
|
2018-03-27 10:49:41 -07:00 |
|
|
Albert Yi
|
ce7e31325c
|
Merge pull request #3577 from evazion/feat-storage-manager
Introduce storage manager concept
|
2018-03-27 09:28:17 -07:00 |
|
|
Albert Yi
|
448ec81e97
|
Merge pull request #3541 from evazion/fix-3539
Fix #3539: Open redirect vulnerabilities
|
2018-03-08 16:02:02 -08:00 |
|
|
Albert Yi
|
418b2beae5
|
Merge pull request #3566 from r888888888/most-valued
Post taggers
|
2018-03-08 16:01:40 -08:00 |
|
|
r888888888
|
3657cacd17
|
* post keeper is calculated synchronously
* add fallback mechanism in case archive service is not up
* pass along most recently added tags to any keeper calculation
|
2018-03-08 16:00:44 -08:00 |
|
|
r888888888
|
0c5dcbbf68
|
Revert "Revert "implement post keepers""
This reverts commit b9fcfe0442.
|
2018-03-06 18:04:31 -08:00 |
|
|
Albert Yi
|
159d807026
|
Merge pull request #3568 from evazion/fix-3552
Fix #3552: Upload filesize limits can be bypassed
|
2018-02-28 10:44:50 -08:00 |
|
|
Albert Yi
|
77e7a6553c
|
Merge pull request #3567 from evazion/fix-3518
Fix #3518: Don't prune mod actions.
|
2018-02-27 16:17:39 -08:00 |
|
|
Albert Yi
|
7d5ad1bcc4
|
Merge pull request #3563 from evazion/fix-3528
Fix #3528: Add method to prevent image-hosting CloudFlare sites from altering the image
|
2018-02-26 17:40:46 -08:00 |
|
|
Albert Yi
|
f6716f3df5
|
Merge pull request #3564 from evazion/fix-3554
Fix #3554: BUR approval bugs
|
2018-02-26 17:40:00 -08:00 |
|
|
Albert Yi
|
e6d96a7f28
|
Merge pull request #3562 from evazion/fix-3548
#3548: Upgrade to jquery-2.2.4
|
2018-02-26 15:43:52 -08:00 |
|
|
r888888888
|
916a57b2fd
|
update deprecated jquery
|
2018-02-22 11:46:11 -08:00 |
|
|
r888888888
|
689b5690bf
|
fixes #3560
|
2018-02-22 11:15:42 -08:00 |
|
|
Albert Yi
|
f38960092d
|
Merge pull request #3559 from r888888888/revert-3551-fix-3528
Revert "Fix #3528: Add method to prevent image-hosting CloudFlare sites from altering the image"
|
2018-02-21 17:20:30 -08:00 |
|
|
Albert Yi
|
d8340f83db
|
Revert "Fix #3528: Add method to prevent image-hosting CloudFlare sites from altering the image"
|
2018-02-21 17:20:13 -08:00 |
|
|
Albert Yi
|
18871b60ba
|
Merge pull request #3551 from evazion/fix-3528
Fix #3528: Add method to prevent image-hosting CloudFlare sites from altering the image
|
2018-02-21 14:52:43 -08:00 |
|
|
Albert Yi
|
1938319504
|
Merge pull request #3555 from evazion/fix-3554
#3554: Allow admins to edit BUR forum topic/post ids
|
2018-02-21 14:52:11 -08:00 |
|
|
Albert Yi
|
ceecc62aa8
|
Merge pull request #3557 from evazion/fix-autocomplete-consistency
Fix inconsistencies in autocomplete behavior
|
2018-02-21 14:51:50 -08:00 |
|
|
Albert Yi
|
9204cd825e
|
Merge pull request #3550 from evazion/fix-3548
#3548: Upgrade to jquery-1.12.4
|
2018-02-15 20:21:04 -08:00 |
|
|
Albert Yi
|
26b260f1c8
|
Merge pull request #3549 from evazion/fix-autocomplete-autofocus
Autocomplete: Fix issues with Enter key
|
2018-02-15 11:19:32 -08:00 |
|
|
Albert Yi
|
8d3e3dd523
|
Merge pull request #3546 from evazion/fix-3545
Fix #3545: Autocomplete: enter key should submit on exact match
|
2018-02-13 10:30:04 -08:00 |
|
|
Albert Yi
|
4e10913e31
|
Merge pull request #3544 from BrokenEagle/fix-autocomplete-nosource
Clear results when a non-autocomplete metatag is used
|
2018-02-13 00:30:31 -08:00 |
|
|
Albert Yi
|
27f2b9d365
|
Merge pull request #3540 from r888888888/revert-3529-most-valued
Revert "implement post keepers"
|
2018-02-07 12:29:06 -08:00 |
|
|
Albert Yi
|
b9fcfe0442
|
Revert "implement post keepers"
|
2018-02-07 12:28:56 -08:00 |
|
|
Albert Yi
|
2e62916832
|
Merge pull request #3529 from r888888888/most-valued
implement post keepers
|
2018-02-07 12:10:38 -08:00 |
|
|
Albert Yi
|
a6a2c7a3a1
|
Merge pull request #3538 from evazion/fix-3532
Fix #3532: Make Enter key accept current tag during autocomplete.
|
2018-02-07 12:10:24 -08:00 |
|
|
Albert Yi
|
b03c8084a5
|
Merge pull request #3536 from BrokenEagle/fix-resize-with-user-setting
Fix the auto resize in desktop mode (ref: a95af95e)
|
2018-02-05 15:11:26 -08:00 |
|
|
r888888888
|
ba6e3f4a0e
|
gracefully handle bad connection errors to replica db ref #3212
|
2018-02-05 15:05:21 -08:00 |
|
|
r888888888
|
308e3670df
|
gracefully handle unavailable pg connection errors
|
2018-02-05 12:38:01 -08:00 |
|
|
r888888888
|
d10c6a3af7
|
display uploader for mods
|
2018-02-01 17:10:09 -08:00 |
|
|
r888888888
|
da2864e233
|
change keeper name to tagger
|
2018-02-01 17:07:30 -08:00 |
|
|
r888888888
|
e0ec9ed518
|
fix ordering of forum posts in topics
|
2018-02-01 16:35:47 -08:00 |
|
|
Albert Yi
|
bd58a5be10
|
Merge pull request #3530 from evazion/fix-3528
Fix #3527: Bookmarklet timeouts for Members.
|
2018-02-01 16:03:17 -08:00 |
|
|
r888888888
|
32cc508edb
|
hide uploader information on posts/show page, add keeper information
|
2018-02-01 14:38:03 -08:00 |
|
|
r888888888
|
146b27f4cf
|
update rbenv version
|
2018-01-30 12:05:38 -08:00 |
|
|
r888888888
|
2c4a0cd79d
|
set rbenv path for staging
|
2018-01-30 12:03:03 -08:00 |
|
|
Albert Yi
|
a114af107f
|
Merge pull request #3526 from BrokenEagle/fix-mod-actions
Fix mod actions
|
2018-01-30 11:40:54 -08:00 |
|
|
r888888888
|
f82d6fa686
|
fixes #3512
|
2018-01-30 11:04:50 -08:00 |
|
|
r888888888
|
cee3c5522b
|
update dtext gem
|
2018-01-30 10:54:11 -08:00 |
|
|
Albert Yi
|
47bd812811
|
Merge pull request #3525 from BrokenEagle/fix-index-default-order
Fix index default order
|
2018-01-29 13:11:24 -08:00 |
|
|
r888888888
|
f83480cc8a
|
hard core path to rbenv root
|
2018-01-22 18:04:55 -08:00 |
|
|
Albert Yi
|
1afce1c88e
|
Merge pull request #3511 from evazion/fix-update-gems
Upgrade gems
|
2018-01-22 12:55:55 -08:00 |
|
|
r888888888
|
f501281139
|
update cityhash gem
|
2018-01-18 14:25:18 -08:00 |
|
|
r888888888
|
97fe82e74b
|
fix default naming scheme for large file urls
|
2018-01-18 12:52:17 -08:00 |
|
|
Albert Yi
|
9f578b3270
|
Merge pull request #3504 from BrokenEagle/fix-3494
Fix how cosplay tags are handled
|
2018-01-18 12:47:02 -08:00 |
|
|
Albert Yi
|
7ca3d2735c
|
Merge pull request #3495 from BrokenEagle/fix-missing-super-search
Fix missing controllers for search[id] (Ref #3430)
|
2018-01-15 11:11:24 -08:00 |
|
|
Albert Yi
|
dfd343f70e
|
Merge pull request #3496 from BrokenEagle/feat-mod-action-event-ids
Add categories to mod actions
|
2018-01-15 11:09:38 -08:00 |
|
|
Albert Yi
|
20487e131d
|
Merge pull request #3498 from evazion/fix-3497
Fix #3497: Invalid DText denial of service attack
|
2018-01-15 11:07:43 -08:00 |
|
|
Albert Yi
|
33e25314e7
|
Merge pull request #3501 from BrokenEagle/fix-2974
Fix erroneous updates to wiki page when nothing changes
|
2018-01-15 10:52:36 -08:00 |
|
|
r888888888
|
1a7bfca9bd
|
fix reference to config.image_server_host
|
2018-01-04 13:10:15 -08:00 |
|
|
r888888888
|
b60f4d62fd
|
delegate post url generation to config
|
2018-01-04 13:06:52 -08:00 |
|
|
r888888888
|
af6ab74f8d
|
support dedicated image servers
|
2018-01-03 13:32:50 -08:00 |
|
|
Albert Yi
|
3a5eaad685
|
Merge pull request #3490 from BrokenEagle/fix-autocomplete-results
Fix fuzzy autocomlete results
|
2018-01-03 11:33:11 -08:00 |
|
|
Albert Yi
|
e8f2160901
|
Merge pull request #3489 from BrokenEagle/fix-post-version-spacing
Fix spacing issues on versions
|
2018-01-03 10:29:29 -08:00 |
|
|
Albert Yi
|
7bb1a44cf3
|
Merge pull request #3488 from BrokenEagle/fix-autocomplete-metatags
Fix metatag handling in autocomplete
|
2018-01-03 10:28:50 -08:00 |
|
|
r888888888
|
a8c4179083
|
fix html class in uploads/new
|
2018-01-02 15:34:43 -08:00 |
|
|
r888888888
|
604e9e9866
|
fix some unit tests
|
2018-01-02 15:12:48 -08:00 |
|
|
r888888888
|
4a80d6c337
|
refactor User#validate_sock_puppet to disable for tests
|
2018-01-02 14:32:38 -08:00 |
|
|
Albert Yi
|
ed948ad655
|
Merge pull request #3486 from BrokenEagle/fix-version-index-revert
Differentiate version index views with reversion links
|
2018-01-02 12:36:45 -08:00 |
|
|
Albert Yi
|
927b2f00a2
|
Merge pull request #3485 from evazion/fix-3484
Fix #3484: /posts: don't show wiki tab for metatags
|
2018-01-02 10:45:06 -08:00 |
|
|
Albert Yi
|
6647aecb5b
|
Merge pull request #3482 from evazion/fix-3480
Fix #3480: NoMethodError error when adding artist tag to post.
|
2018-01-02 10:39:43 -08:00 |
|
|
Albert Yi
|
99c0c4ade6
|
Merge pull request #3479 from BrokenEagle/feat-add-iqdb-page
Initial add of IQDB standalone page
|
2018-01-02 10:29:27 -08:00 |
|
|
r888888888
|
c3aff42458
|
add defaults for cloudflare keys
|
2017-12-29 17:15:39 -08:00 |
|
|
Albert Yi
|
00f091ef3e
|
Merge pull request #3478 from BrokenEagle/fix-post-replacement-autocomplete
Add autocomplete to tags input on post replacements
|
2017-12-29 15:53:14 -08:00 |
|
|
Albert Yi
|
e1bfd29a7f
|
Merge pull request #3475 from evazion/fix-3468
Fix #3468: Approval queue should not show one's own uploads or previous approvals.
|
2017-12-29 11:54:34 -08:00 |
|
|
r888888888
|
59cd4d71d3
|
fixes #3467
|
2017-12-28 14:56:03 -08:00 |
|
|
Albert Yi
|
0f7b9c3a21
|
Merge pull request #3472 from BrokenEagle/fix-status-active-search
Fix status:active so that it doesn't show flagged posts
|
2017-12-28 13:47:25 -08:00 |
|
|
Albert Yi
|
b315ee25bc
|
Merge pull request #3471 from BrokenEagle/fix-controller-views
Various fixes for controller views
|
2017-12-28 11:18:44 -08:00 |
|
|
r888888888
|
d110f91198
|
updated related tags expiry for reltags delegated to reportbooru service
|
2017-12-27 17:30:26 -08:00 |
|
|
Albert Yi
|
94f7b91673
|
Merge pull request #3466 from evazion/fix-1563
Fix #1563: Warn users attempting to upload with very few tags.
|
2017-12-27 13:26:19 -08:00 |
|
|
Albert Yi
|
12ce69171a
|
Merge pull request #3465 from evazion/fix-3464
Fix #3464: CurrentUser.ip_addr isn't set for anonymous users.
|
2017-12-27 12:01:28 -08:00 |
|
|
Albert Yi
|
7651497b23
|
Merge pull request #3463 from evazion/fix-nico-seiga-timeout
Fix #3457: Timeout when fetching source data from NicoSeiga.
|
2017-12-27 12:00:38 -08:00 |
|
|
Albert Yi
|
4c947fb127
|
Merge pull request #3462 from evazion/fix-3460
Fix #3460: Timeout in `update_last_ip_addr`.
|
2017-12-27 10:53:33 -08:00 |
|
|
r888888888
|
c757cdeb12
|
fix text on mod random queue
|
2017-12-27 10:52:25 -08:00 |
|
|
r888888888
|
f11c731e32
|
fixes #3461
|
2017-12-27 10:51:17 -08:00 |
|
|
r888888888
|
659eb62402
|
css tweaks
|
2017-12-26 16:06:16 -08:00 |
|
|
Albert Yi
|
2e0e8e1365
|
Merge pull request #3456 from BrokenEagle/fix-3455
Fix 3455: Convert tag category Javascript/CSS assets to ERB
|
2017-12-25 13:22:04 -08:00 |
|
|
Albert Yi
|
010e70e6c7
|
Merge pull request #3454 from evazion/fix-3448
Fix #3448: Lower the limit for tag category changes
|
2017-12-25 13:20:45 -08:00 |
|
|
Albert Yi
|
fb0095d7fc
|
Merge pull request #3453 from evazion/fix-3450
Fix #3450: Aliased tags show up under translated tags.
|
2017-12-25 13:20:20 -08:00 |
|
|
Albert Yi
|
b2ba0cb9a9
|
Merge pull request #3452 from evazion/fix-favorites-show
Fix "The action 'show' could not be found for FavoritesController"
|
2017-12-25 13:20:04 -08:00 |
|
|
Albert Yi
|
8d81b96a28
|
Merge pull request #3449 from BrokenEagle/fix-3267
Add autocomplete to wiki page versions
|
2017-12-25 13:19:46 -08:00 |
|
|
Albert Yi
|
8c2b657349
|
Merge pull request #3451 from evazion/fix-js-double-render
Fix double render error in `/blah.js`.
|
2017-12-25 13:19:33 -08:00 |
|
|
r888888888
|
461ddbf017
|
fixes #3422
|
2017-12-21 11:33:23 -08:00 |
|
|
Albert Yi
|
796a83d7cf
|
Merge pull request #3447 from evazion/fix-3443
Fix failure in `rake db:migrate` on fresh install (#3443).
|
2017-12-21 11:21:50 -08:00 |
|
|
Albert Yi
|
5bc3c677d1
|
Merge pull request #3446 from BrokenEagle/fix-validator-addtag-cutoffs
Fix cutoff for what is considered an added tag
|
2017-12-21 11:21:26 -08:00 |
|
|
r888888888
|
5177829aff
|
revert twitter source change
|
2017-12-21 10:58:28 -08:00 |
|
|
Albert Yi
|
b48d5e59ad
|
Merge pull request #3445 from BrokenEagle/fix-3444
Fix #3444: Add validation warning for non-general/meta tags
|
2017-12-20 17:26:17 -08:00 |
|
|
Albert Yi
|
a72e708d17
|
Merge pull request #3436 from BrokenEagle/feat-public-favgroups
Give option to make favorite groups public
|
2017-12-19 15:56:13 -08:00 |
|
|
Albert Yi
|
dc744726b6
|
Merge pull request #3442 from evazion/fix-3440
Fix #3440: Implications aren't applied to automatic tags.
|
2017-12-19 15:50:36 -08:00 |
|
|
Albert Yi
|
9094deb140
|
Merge pull request #3441 from evazion/fix-3438
Fix #3438: Thumbnails on user profiles don't respect safe mode.
|
2017-12-19 15:49:38 -08:00 |
|
|
Albert Yi
|
7af5b133c4
|
Merge branch 'master' into feat-public-favgroups
|
2017-12-19 15:42:56 -08:00 |
|
|
Albert Yi
|
a1985a9ca2
|
Merge pull request #3435 from evazion/fix-3324
Fix #3324: Incorporate replacement comment info in the replacement history
|
2017-12-19 15:02:06 -08:00 |
|
|
r888888888
|
87d3da95b1
|
add test case for RelatedTagQuery#other_wiki_category_tags
|
2017-12-19 13:02:44 -08:00 |
|
|
Albert Yi
|
b973e97648
|
Merge pull request #3434 from BrokenEagle/feat-copyright-other-wikis
Add character list wikis to copyright related tag response
|
2017-12-19 11:37:46 -08:00 |
|
|
Albert Yi
|
f5cb49d9bf
|
Merge pull request #3433 from BrokenEagle/fix-fav-privacy
Fix incorrect showing of favorites and favorite groups with privacy settings enabled
|
2017-12-18 14:58:54 -08:00 |
|