Commit Graph

1238 Commits

Author SHA1 Message Date
albert
7dd4d8a313 Merge branch 'master' of github.com:r888888888/danbooru 2013-02-23 17:53:47 -05:00
Albert Yi
d284150b75 Merge pull request #577 from kotarou3/blacklists
Use OR instead of AND when excluding tags for blacklist.
2013-02-23 14:53:30 -08:00
albert
b2fc148956 add post count to pool listing 2013-02-23 17:17:46 -05:00
albert
eb08c12998 tweaks to user profile layout 2013-02-23 17:14:01 -05:00
albert
4a61498f0e delete action from post/show requires confirmation+flag reason now 2013-02-23 16:53:03 -05:00
albert
138f3eb3db add option to delete subscriptions 2013-02-23 16:29:01 -05:00
albert
3accc2ab5f allow big tag in dtext 2013-02-23 16:24:29 -05:00
albert
35c35e4af0 fix bug with tag query limit 2013-02-23 16:21:48 -05:00
albert
403db4cc2f show unchanged rating/source in post version listing 2013-02-23 16:14:17 -05:00
albert
6927d07bc2 indicate when pools are deleted 2013-02-23 16:07:06 -05:00
albert
8911738909 fix post version diff method 2013-02-23 16:04:09 -05:00
albert
56dd8707fd controller tweaks 2013-02-23 15:58:21 -05:00
albert
096f1be22b fixes #563 2013-02-23 13:27:18 -05:00
albert
3c1176b077 fixes #558 2013-02-23 13:17:44 -05:00
albert
c49eddf2df fixes #553 2013-02-23 13:07:01 -05:00
albert
c51a406083 remove category column from feedback listing 2013-02-23 12:58:37 -05:00
albert
09c5791309 fixes #551 2013-02-23 12:55:10 -05:00
albert
c62b8ee46e fixes #547 2013-02-23 12:36:45 -05:00
albert
0e0d83c7eb add legacy artist json api 2013-02-23 12:21:27 -05:00
albert
abefc91a42 add legacy artist xml api 2013-02-23 12:15:23 -05:00
albert
3967cf7343 fixes #442 2013-02-23 11:55:11 -05:00
albert
f2bdd7557f Merge branch 'master' of github.com:r888888888/danbooru 2013-02-23 11:40:08 -05:00
Albert Yi
1755a1671f Merge pull request #584 from 6/https-source
Upload from HTTPS sources
2013-02-23 08:39:42 -08:00
albert
402f13e202 fix similar button for post/show 2013-02-23 11:37:07 -05:00
albert
17bf33672c show error messages for user feedback creation 2013-02-23 11:21:48 -05:00
albert
ec8c0e8f19 fix ip ban bug 2013-02-23 11:20:16 -05:00
albert
4c3159b662 more robust validation for ip bans 2013-02-23 11:16:23 -05:00
albert
e7da9b2a37 sign out no longer requires http delete, can open up in new window 2013-02-23 11:01:33 -05:00
albert
dbdbdd2337 fix artist test 2013-02-23 10:58:31 -05:00
albert
6bc5b96d8e moved artist ban to separate action/button 2013-02-23 10:56:27 -05:00
albert
7585462368 add test case for note 2013-02-23 10:44:42 -05:00
albert
309110b44d fix tag api json 2013-02-23 10:28:40 -05:00
Peter Graham
a725c81e1e Upload#is_downloadable? returns true for https sources 2013-02-22 23:08:31 -08:00
Peter Graham
4330e85b17 Support HTTPS in Downloads::File#http_get_streaming 2013-02-22 23:07:34 -08:00
小太
bb521794e9 Fix coding style 2013-02-23 15:13:39 +11:00
小太
8f3f997a57 Remove useless code 2013-02-23 14:54:11 +11:00
小太
e975664f48 Use OR instead of AND when excluding tags for blacklist.
This is because there currently is no way to do this, and this commit doesn't remove the AND capability either.
For example, take the original blacklist "a -b -c".
Currently, that means "Don't show a unless both b and c are present", but now it means "Don't show a unless either b or c are present".
For the original meaning, you now have to do this with two blacklists: "a -b" and "a -c"
2013-02-23 14:54:11 +11:00
小太
97a5579d0d Remove trailing whitespace in files I'm about to edit 2013-02-23 14:50:01 +11:00
albert
c0257916b4 fix for ads 2013-02-22 21:42:50 -05:00
albert
38f75961f6 improve mod queue 2013-02-22 21:33:11 -05:00
albert
658b3bea12 fix mod queue logic 2013-02-22 21:20:02 -05:00
albert
6db391f6a2 fixes to post flag logic 2013-02-22 21:13:11 -05:00
albert
4203f344c0 fix for mod queue logic 2013-02-22 20:59:21 -05:00
albert
e0dfd14804 add fix script 2013-02-22 16:58:05 -05:00
albert
d18b44fb1b janitors can undelete/delete 2013-02-22 16:35:25 -05:00
albert
0b6dfcc90d fix favtags (still untyped) 2013-02-22 16:33:23 -05:00
albert
d788e8c1c0 remove is_flagged from user limit calculations, deleting a posts now takes it out of pending status 2013-02-22 16:26:35 -05:00
albert
3f57952710 fix comment searches from user profile 2013-02-22 16:16:37 -05:00
albert
42d7caae25 link to artist in artist version listing 2013-02-22 16:06:03 -05:00
albert
d113f0f068 remove quote link on single forum posts 2013-02-22 15:59:18 -05:00