Commit Graph

6126 Commits

Author SHA1 Message Date
Albert Yi
9b982b3379 Merge pull request #3228 from r888888888/ccs
integrate with ccs
2017-07-21 18:00:05 -07:00
Albert Yi
7df638c14c Merge pull request #3232 from evazion/fix-user-update-redirect
Redirect back to settings page after saving account settings.
2017-07-21 17:59:09 -07:00
evazion
6682ae10eb /users/:id/edit: redirect back to settings instead of profile. 2017-07-21 01:18:42 -05:00
Albert Yi
5673efe131 Merge pull request #3227 from evazion/fix-3225
Fix #3225: Exception in NoteSanitizer#relativize_links.
2017-07-20 15:44:15 -07:00
r888888888
2947b25d6e script to remove expunged posts from users' favorites 2017-07-20 15:42:59 -07:00
Albert Yi
2e09d5f1e7 Merge pull request #3226 from evazion/fix-3224
Fix #3224: 403 Forbidden when logging in to DeviantArt.
2017-07-20 15:37:26 -07:00
r888888888
c5a40628e6 integrate with ccs 2017-07-20 15:25:19 -07:00
evazion
1fe6a5fc65 Fix #3225: Exception in NoteSanitizer#relativize_links. 2017-07-19 21:13:04 -05:00
evazion
93d44c6b84 Fix #3224: 403 Forbidden when logging in to DeviantArt.
Login fails if the User-Agent isn't set while POST'ing the login
credentials.
2017-07-19 20:25:27 -05:00
evazion
8125d8e796 Set the default User-Agent sent for outgoing http requests.
* Add a `Danbooru.config.http_headers` config option.

* Refactor various places to use this option instead of setting the user
  agent manually.
2017-07-19 20:25:27 -05:00
Albert Yi
8dafa15069 Merge pull request #3223 from evazion/fix-remove-dtext
Remove ruby DText implementation (#3206).
2017-07-19 17:59:59 -07:00
evazion
7cb7c2fbab Remove ruby DText implementation (#3206). 2017-07-19 16:48:42 -05:00
r888888888
d48ed95191 favoritescontroller#destroy should work even if the post doesn't exist, remove from favorites on expunge (fixes #3222) 2017-07-19 13:39:24 -07:00
evazion
5d013f9c88 /dmails: remove max-width: 50em rule (#3185). 2017-07-19 15:30:14 -05:00
r888888888
3a0a032908 remove destroy callback on Post#favorites 2017-07-18 16:32:28 -07:00
evazion
b545a5e7f4 Fix related tags overflow in detachable tag edit dialog (fix #3219).
Bug: resizing the tag edit dialog then expanding the related tags
section doesn't resize the dialog to fit the expanded related tags
section. Instead a scrollbar appears.

Fixes this by expanding the dialog's height when the related tags are
shown.
2017-07-17 19:00:12 -05:00
evazion
ffbf5bbcdf Factor out related tags visibility toggling code. 2017-07-17 18:58:20 -05:00
evazion
5d48244df4 Fix related tags overflow in detachable tag edit dialog (#3219).
Fixes these issues with the detachable tag edit dialog:

* Moving the edit dialog then expanding the related tags causes the
related tags to overflow outside the dialog.

* Expanding the related tags, moving the edit dialog, then collapsing
the tags causes the dialog to not resize back to its minimized size.
2017-07-17 18:29:06 -05:00
evazion
be4414ae70 /user_upgrades/new: mention debit cards (fix #3221). 2017-07-17 17:01:18 -05:00
evazion
269f69efd8 /user_upgrades/new: convert tabs to spaces. 2017-07-17 16:58:38 -05:00
evazion
19d3df058f /user_upgrades/show: fix typo. 2017-07-17 16:58:34 -05:00
evazion
099ae86cc6 Remove duplicate WikiPageVersion#visible? method.
Already defined by `delegate :visible?, :to => :wiki_page`.
2017-07-14 18:43:52 -05:00
evazion
695804fdda Remove duplicate FavoriteGroup#strip_name method.
This method was defined twice.
2017-07-14 18:39:48 -05:00
evazion
cbbf68bdd8 Remove unused tests (#3206). 2017-07-14 18:22:02 -05:00
evazion
4ead45a787 Remove Post#validate_parent_does_not_have_a_parent method (#3206).
Not used; posts are allowed to have grandparents.
2017-07-14 17:49:12 -05:00
evazion
45676491ff Post.fast_count: remove uses of unused statement_timeout param (#3206).
Not used since 81684e6.
2017-07-14 17:35:42 -05:00
r888888888
ee6581ab7f restore streaming behavior for Downloads::File#http_get_streaming 2017-07-13 15:31:29 -07:00
evazion
79b21bbca8 Fix failure in Pixiv API call (#3135).
Forgot to send authentication headers with API call.
2017-07-13 15:58:17 -05:00
evazion
5066f75d8c Fix Net::HTTPOK#read_body called twice error during upload (#3135)
Fixes this exception:

    An error occurred: error: IOError - Net::HTTPOK#read_body called twice

    /home/admin/.rbenv/versions/2.3.4/lib/ruby/2.3.0/net/http/response.rb:196:in `read_body'
    /home/admin/.rbenv/versions/2.3.4/lib/ruby/gems/2.3.0/gems/httparty-0.15.5/lib/httparty/response.rb:91:in `method_missing'
    /home/admin/src/danbooru/app/logical/downloads/file.rb:43:in `block (2 levels) in download!'
    /home/admin/src/danbooru/app/logical/downloads/file.rb:41:in `open'
    /home/admin/src/danbooru/app/logical/downloads/file.rb:41:in `block in download!'
    /home/admin/src/danbooru/app/logical/downloads/file.rb:100:in `http_get_streaming'
    /home/admin/src/danbooru/app/logical/downloads/file.rb:39:in `download!'
    /home/admin/src/danbooru/app/models/upload.rb:408:in `download_from_source'
    /home/admin/src/danbooru/app/models/upload.rb:113:in `block in process_upload'
2017-07-13 15:41:36 -05:00
evazion
9d9ac53e4d /artists/:id - add missing blacklist controls. 2017-07-13 14:15:07 -05:00
Albert Yi
66eff24b39 Merge pull request #3217 from evazion/fix-remove-tag-subs
Remove unused tag subscription code (#2956, #3206).
2017-07-13 11:59:04 -07:00
evazion
3e3844a796 Remove unused tag subscription code (#2956, #3206). 2017-07-13 13:44:26 -05:00
evazion
d3d4e3cc8d Fix #3216: Allow note URL # anchors to work from the post itself 2017-07-12 21:53:26 -05:00
r888888888
023c488bd5 fixes #3199 2017-07-12 16:47:28 -07:00
r888888888
97ce9cafac add httparty option config 2017-07-12 15:52:48 -07:00
r888888888
7f4d3052b3 add proxy config 2017-07-12 15:52:48 -07:00
r888888888
eb6c5e3af5 switch to httparty 2017-07-12 15:52:48 -07:00
evazion
ed7b80c016 /{pools,favgroups}/:id/order/edit: add blacklist controls. 2017-07-11 21:18:00 -05:00
Albert Yi
638f7522dd Merge pull request #3215 from evazion/fix-ss-autocomplete
Fix #3214: Add autocomplete for saved searches.
2017-07-11 17:45:11 -07:00
evazion
58923deaa7 saved_searches.js: fix typo. 2017-07-11 19:40:54 -05:00
evazion
6e3763e7d7 Remove minlength for autocompleting labels in saved search dialog.
Trigger autocomplete after typing the first letter when adding labels in
the saved search dialog.
2017-07-11 19:27:04 -05:00
evazion
51d0feb2c6 Fix #3214: Add autocomplete for saved searches.
* Autocomplete the `search:<label>` metatag.

* Make label autocompletion do a prefix match instead of a substring
  match. Example: `search:ar` matches `artists`, not `characters`. This
  is how tags and most other things are autocompleted.
2017-07-11 19:24:49 -05:00
evazion
dc079d7932 /saved_searches/labels.json: support wildcards in search[label] param. 2017-07-11 19:21:41 -05:00
r888888888
69fcbaae7a update dtext gem 2017-07-11 15:47:09 -07:00
Type-kun
7b05b9dd64 Update upgrade page (fix #3213) 2017-07-11 18:06:28 +05:00
Albert Yi
ca7e841735 Merge pull request #3211 from evazion/fix-remove-key-value
Remove unused KeyValue model (#3206).
2017-07-10 16:55:54 -07:00
Albert Yi
d61d432005 Merge pull request #3210 from evazion/fix-translated-tags
Fix #3208: Fix translated tag suggestions for Pixiv.
2017-07-10 16:54:04 -07:00
evazion
76c90cc0e4 Remove unused Pool methods: create_anonymous/options/id_to_name (#3206)
* Pool.id_to_name: never used.
* Pool.create_anonymous: never used.
* Pool.options: unused since e7aff87.
2017-07-09 14:32:17 -05:00
evazion
f3b0a0a9e9 Remove unused KeyValue model (#3206). 2017-07-09 14:30:44 -05:00
evazion
af35c82d96 Remove unused Artist#legacy_api_hash method (#3206).
Added in 0e0d83c7 but never used. app/views/legacy/artists.{json,xml}.erb
is what *would* use this, but neither does.
2017-07-09 13:49:20 -05:00