jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,705 Commits 1 Branch 0 Tags
b9fcfe04422eead23a768ea2fe77ee621da4ea1c
Commit Graph

6705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
evazion
cf27de2ec9 Fix #3532: Make Enter key accept current tag during autocomplete. 
Previously we patched the jqueryui-autocomplete library in order to
customize how the Tab and Enter keys behaved. Specifically, we wanted to
prevent the Tab key from moving the focus out of the tag input box, and
we wanted to prevent the Enter key from submitting the page when editing tags.

These things can achieved without patching the library by using
`event.preventDefault` and `event.stopImmediatePropagation` to prevent
other event handlers from running after these keys trigger the
`autocompleteselect` event.
 2018-02-06 19:11:01 -06: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
BrokenEagle
31114b716a Fix the auto resize in desktop mode (ref: a95af95e) 2018-02-05 10:20:24 -08:00
evazion
f2a7d3c41a /janitor_trials, /ip_bans: fix default ordering. 2018-02-04 16:48:35 -06:00
evazion
dac095f318 /user_feedbacks: change default order to created_at. 
Order by created_at instead of by id because old feedbacks aren't in id order.
 2018-02-04 16:43:00 -06: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
evazion
d4298ea493 Fix #3527: Bookmarklet timeouts for Members. 2018-02-01 17:35:20 -06: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
BrokenEagle
3933c273c4 Add mod action for move favorites 2018-01-30 11:27:28 -08:00
BrokenEagle
92f7bb46a2 Add missing mod action category 2018-01-30 11:27:24 -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
BrokenEagle
d829ab3a00 Move all order logic to models 
- Have a default order for each model
-- The overall default is ID DESC
- Allow for custom orderings
-- When comma-separated IDs are used
 2018-01-29 11:42:53 -08:00
evazion
5ea61c6921 /bans: fix undefined ordering when no params are passed. 
Fixes the /bans listing being ordered randomly by default.
 2018-01-28 15:38:12 -06:00
evazion
100c1d2828 Fix #3523: Feedback notification dmails should include the text of the feedback. 2018-01-28 14:32:38 -06:00
evazion
64186c004f Add pbs.twimg.com to artist finder blacklist. 
ref: https://danbooru.donmai.us/forum_topics/14938.
 2018-01-26 18:30:18 -06:00
evazion
f8a5620768 Partial fix for #3514: Handle https://twitter.com/i/web/status/:id URL. 2018-01-23 23:07:21 -06: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
evazion
2833239fa0 Fix #3513: Missing rating error causes weird behavior in tag list on upload page. 
Fix bug in the double submit prevention from #2789. Rather than
unbinding the enter key on submit, have the enter key click the submit
button instead. This avoids form submission when the submit button is disabled.
 2018-01-21 11:55:24 -06:00
evazion
46b0f9e6d6 Update dotenv. 
dotenv-2.2.1 no longer loads .env.local in the test environment. Load it
manually for backwards compatibility.
 2018-01-20 19:04:48 -06:00
evazion
074a4be38f Update gems. 2018-01-20 19:04:48 -06:00
evazion
a923a64220 tests: fix pixiv profile image test. 2018-01-20 14:51:05 -06:00
evazion
53f7207716 tests: remove bad_id pixiv test. 2018-01-20 14:50:44 -06:00
evazion
57c4d2a54f related tag calculator: fix unstable sorting of related tags. 
Fix this test failure:

    1) Failure:
    RelatedTagCalculatorTest#test_: A related tag calculator should convert a hash into string format.
    [test/unit/related_tag_calculator_test.rb:65]:
    Expected: "aaa 3 bbb 3 ccc 2 ddd 1"
      Actual: "bbb 3 aaa 3 ccc 2 ddd 1"

The related tag string didn't use a stable sort. Sort first by tag
count, then by tag name.
 2018-01-20 14:33:36 -06:00
evazion
e596a7fd0f tests: fix <char>_(cosplay) alias test. 2018-01-20 14:26:16 -06:00
evazion
83ab90d495 tests: fix tag removal warning tests. 2018-01-20 13:59:21 -06:00
evazion
2deefcc090 Fix exception when viewing /favorite_groups while logged out. 
Also fixes a test failure in the favgroups controller tests.
 2018-01-20 13:47:41 -06:00
evazion
e47c983cfd tests: fix pawoo tags test. 2018-01-20 13:25:13 -06:00
evazion
c29785268d tests: fix iqdb controller test (#3479). 2018-01-20 13:22:05 -06:00
evazion
ce06736374 tests: fix timestamp comparison in artist notes saving test. 
Equality test failed due to microsecond level differences. Truncate to
seconds to avoid this.
 2018-01-20 13:08:40 -06:00
evazion
3d09ce5e55 tests: fix status:active test for #3472. 2018-01-20 12:50:30 -06: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
evazion
989854b3dd Fix #3507: Include ban length in feedback. 2018-01-17 19:53:49 -06:00
BrokenEagle
f626c7ebd7 Fix how cosplay tags are handled 2018-01-15 18:01:06 -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