Commit Graph

775 Commits

Author SHA1 Message Date
r888888888
11c3c6be20 Merge branch 'master' of github.com:r888888888/danbooru 2013-05-20 17:50:21 -07:00
r888888888
e510e4d35f remove unused deletion code from user 2013-05-20 17:50:13 -07:00
Toks
ad60ae1739 Revert "fixes #1648"
This reverts commit a11bcf4dbd.
2013-05-20 20:35:29 -04:00
Lightforger
a11bcf4dbd fixes #1648 2013-05-21 03:17:18 +03:00
r888888888
b767a1c447 fixes #1620 2013-05-20 16:42:40 -07:00
r888888888
27a6136aee Merge branch 'master' of github.com:r888888888/danbooru 2013-05-20 16:28:29 -07:00
Toks
5aeab8247c fixes #1433 2013-05-20 10:40:19 -04:00
Toks
e2622d82a9 add feedback count for #1323 2013-05-20 09:38:05 -04:00
Toks
d99e9c5d81 fixes #1561 2013-05-20 08:42:15 -04:00
Toks
5fa931f148 Merge branch 'copy-notes' 2013-05-18 16:26:00 -04:00
Toks
17af05b2b1 fixes #720 2013-05-18 16:25:46 -04:00
Toks
a680555e72 fixes #1487 2013-05-18 09:36:29 -04:00
Toks
06b007205d fixes #1630 2013-05-17 18:14:25 -04:00
Toks
c250501bc4 add artist version search 2013-05-17 14:46:00 -04:00
Toks
bbf2181f4d fixes #1631 2013-05-17 10:17:16 -04:00
r888888888
7db85d8301 Merge branch 'master' into close-accounts 2013-05-16 14:16:47 -07:00
Toks
69d500e9f5 fixes #1626 2013-05-16 09:49:24 -04:00
Toks
6ca588f2e0 fixes #1549 2013-05-14 12:02:35 -04:00
Toks
d5a686a5b7 fixes #1160 2013-05-13 15:30:49 -04:00
Toks
8741aab71c fixes #1314; fixes #1313 2013-05-13 15:30:47 -04:00
r888888888
3ea4b8daaf Merge branch 'master' of github.com:r888888888/danbooru 2013-05-13 10:45:42 -07:00
r888888888
e3493f6cd3 hide deleted posts in tag subscriptions/favorites 2013-05-13 10:45:33 -07:00
Toks
cc17c9ce55 fixes #1560 2013-05-11 20:53:11 -04:00
r888888888
09e117049b fixes #1573 2013-05-08 11:48:09 -07:00
r888888888
0535237704 fixes #1512 2013-05-07 18:19:30 -07:00
r888888888
49de333b74 fixes #1579 2013-05-07 17:58:27 -07:00
r888888888
5a1a3baa1c fixes #1514 2013-05-07 17:33:33 -07:00
r888888888
72b18051f8 fixes #1546 2013-05-07 17:20:42 -07:00
r888888888
4237215dad fix conflicts 2013-05-07 15:33:52 -07:00
Toks
b85c67f984 fixes #1577 2013-05-07 18:23:12 -04:00
Toks
f165919512 fixes #1559 2013-05-07 17:23:11 -04:00
r888888888
1ec02dbe4b change increment/decrement calls to sql 2013-05-07 13:42:58 -07:00
r888888888
a031a4eba8 fix test 2013-05-07 13:27:21 -07:00
r888888888
9eb1333cbf Merge branch 'master' of github.com:r888888888/danbooru 2013-05-07 13:05:42 -07:00
r888888888
75fdaa496e Revert "fixes #1438"
This reverts commit 1d0c77dc7c.
2013-05-07 01:40:15 -07:00
r888888888
b6d0f34e59 remove extraneous code 2013-05-06 18:16:42 -07:00
r888888888
edbc8b82d6 Merge branch 'master' of github.com:r888888888/danbooru 2013-05-06 18:15:32 -07:00
r888888888
8ba43c8cd1 fix regression with tag post counts 2013-05-06 18:15:27 -07:00
Toks
1a743356ce fixes #1396; expand tests 2013-05-06 20:01:34 -04:00
r888888888
890e11f532 potential fix for #1500 2013-05-06 13:33:04 -07:00
r888888888
b11001519f Merge branch 'master' of github.com:r888888888/danbooru 2013-05-06 12:54:36 -07:00
r888888888
1ce7953730 fixes #1473 2013-05-06 12:54:31 -07:00
Toks
dcd00a52a1 fix argument error regression 2013-05-06 15:29:02 -04:00
r888888888
c33a6e376a Merge branch 'master' of github.com:r888888888/danbooru 2013-05-06 10:20:33 -07:00
r888888888
a958a3bf4a potential fix for #1310 2013-05-06 10:20:25 -07:00
Toks
ab6e9ce722 Revert "fixes #1327"
This reverts commit 96a468b51a.
2013-05-05 21:19:26 -04:00
Toks
79e2ea95d8 fixes #1113 2013-05-05 21:10:26 -04:00
Toks
357332a506 fix xml for #13235 2013-05-05 17:50:32 -04:00
Toks
9c410dee4a partial fix for #1323 2013-05-05 17:42:30 -04:00
Toks
2e6cb69ff2 fixes #1322; unhides created at and base upload limit 2013-05-05 07:43:25 -04:00