Commit Graph

2100 Commits

Author SHA1 Message Date
r888888888
5efdc55d79 fixes #1685 2013-05-29 16:31:46 -07:00
r888888888
92f4ea4b7d fixes #1683 2013-05-29 16:28:49 -07:00
r888888888
d79c906aa0 fixes #1683 2013-05-29 16:26:00 -07:00
Toks
3faee4a0b5 Merge branch 'master' of https://github.com/r888888888/danbooru 2013-05-29 16:58:36 -04:00
Toks
a4f47cfc41 revert fix for #1691 2013-05-29 16:55:29 -04:00
r888888888
9df5952778 typo fix 2013-05-29 13:21:24 -07:00
Toks
85207de73c minor js fix 2013-05-29 15:57:17 -04:00
Toks
5c3dc88b36 Revert "fixes #1691"
This reverts commit 8766faa3dd.
2013-05-29 14:25:14 -04:00
Toks
1d20bc1bb0 Merge branch 'master' of https://github.com/r888888888/danbooru 2013-05-29 13:53:31 -04:00
Lightforger
8766faa3dd fixes #1691 2013-05-29 20:50:55 +03:00
Toks
8c44ba5520 partial fix for #1558 2013-05-29 13:31:50 -04:00
Toks
27b55acc2a fixes #1691 2013-05-29 13:31:28 -04:00
Toks
8a1ec7dc68 fixes #926 2013-05-28 13:12:33 -04:00
Toks
285bda1145 possible fix for #926 2013-05-28 12:25:35 -04:00
Toks
9a2dce89aa fixes #1674 2013-05-26 10:25:00 -04:00
kittey
bf20130082 Remove old footer
Remove the old page footer that apparently was never used and was superseded by the footer from static/footer some time ago.
2013-05-26 15:50:38 +03:00
Toks
ce39e45594 merge pool category branch; fixes #1521 2013-05-26 08:23:46 -04:00
Toks
1ee492c97b add blank category search option 2013-05-26 08:14:05 -04:00
Toks
240b160b8a style user deletion page (#1676) 2013-05-26 08:08:05 -04:00
Toks
c60a5fcc31 add resolved search for flags 2013-05-25 21:32:24 -04:00
Toks
bb8fde1516 fixes #1348 2013-05-25 20:35:54 -04:00
Toks
7a693ad2c8 fixes #1468 2013-05-25 20:13:01 -04:00
Toks
77dfd91702 fixes #1658; fixes #1592 2013-05-25 19:49:19 -04:00
Toks
3d25776017 fixes #1496 2013-05-25 15:22:06 -04:00
Toks
dd715b7c03 fixes #1673 2013-05-25 14:58:58 -04:00
Toks
e380a23fc6 fix for #1669 2013-05-24 19:38:23 -04:00
r888888888
25673465d5 fixes #1597, create mod action for user deletions 2013-05-24 14:25:27 -07:00
r888888888
560aad8a2d fixes #1635 2013-05-24 13:24:45 -07:00
r888888888
ae84c5af3a fixes #1662 2013-05-24 13:19:29 -07:00
r888888888
360e945ed6 fixes #1656 2013-05-24 13:13:21 -07:00
r888888888
9335aa9502 fixes #1667 2013-05-24 13:01:43 -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
ab3a7d1adb Merge branch 'master' of https://github.com/r888888888/danbooru 2013-05-23 13:59:37 -04:00
Toks
861ade54cf fixes #1653 2013-05-23 13:59:22 -04:00
Toks
998ad51203 fixes #1661 2013-05-23 13:58:54 -04:00
Lightforger
c4106b4395 Fixes #1659 2013-05-23 20:22:01 +03:00
Lightforger
eeede4e5b2 Fixes #1655 2013-05-22 19:44:19 +02: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
03e7d08830 Merge branch 'master' of github.com:r888888888/danbooru 2013-05-21 17:52:13 -07:00
r888888888
eab2eb1d82 fixes #1651 2013-05-21 17:52:03 -07:00
Lightforger
d42e5c8bf5 Minor tweak to prevent scrollbars in chrome 2013-05-22 03:14:41 +03:00
r888888888
d1f2f1c09a remove delete link from user secondary links 2013-05-21 16:18:19 -07:00
Toks
ee63f112bb partial fix for #262 2013-05-20 22:23:37 -04:00
r888888888
11c3c6be20 Merge branch 'master' of github.com:r888888888/danbooru 2013-05-20 17:50:21 -07:00