Commit Graph

790 Commits

Author SHA1 Message Date
Toks
ce39e45594 merge pool category branch; fixes #1521 2013-05-26 08:23:46 -04:00
Toks
c60a5fcc31 add resolved search for flags 2013-05-25 21:32:24 -04:00
Toks
7a693ad2c8 fixes #1468 2013-05-25 20:13:01 -04:00
r888888888
560aad8a2d fixes #1635 2013-05-24 13:24:45 -07:00
r888888888
719ff4ee0f fixes #1644 2013-05-24 13:00:18 -07:00
r888888888
6df8f5b7fd fix conflict 2013-05-24 12:59:50 -07:00
r888888888
4dff618863 Use webmock instead of fakeweb for VCR; Fix tests; Use Timecop to speed up tests previously using sleep; Move artist rename into seperate operation 2013-05-24 12:59:13 -07:00
Toks
e9593dd975 fixes #1664 2013-05-23 23:20:22 -04:00
Toks
c353f9c041 Revert "fixes #1653"
This reverts commit 861ade54cf.
2013-05-23 23:20:21 -04:00
r888888888
9dfb8aa33e fixes #1614 2013-05-23 17:26:20 -07:00
Toks
861ade54cf fixes #1653 2013-05-23 13:59:22 -04:00
r888888888
54e5869dfc fixes #1636 2013-05-21 18:02:35 -07:00
r888888888
cb2e1e9f57 fixes #1639 2013-05-21 17:58:09 -07:00
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
633bc8cb31 possibly better fix for ordering pools by category 2013-05-15 01:09:18 -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