634 Commits

Author SHA1 Message Date
shish
b57ba4d484 backport
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@813 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-11 06:27:28 +00:00
shish
ce8d6f71fd and 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@811 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-11 06:14:59 +00:00
shish
1fd2fe084b apply cleanups to 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@807 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-11 05:47:16 +00:00
shish
7e92bdbd8e backport
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@802 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-11 05:26:02 +00:00
shish
4c5f415da7 2.2 too
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@798 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-11 01:49:55 +00:00
shish
b7fc28e17f changed include file
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@795 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-09 01:10:29 +00:00
shish
b2f8165a59 remove user enable / disable in 2.2 too
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@794 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-09 00:34:08 +00:00
shish
57b50d8881 all those into 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@793 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-08 21:59:20 +00:00
shish
9f595e6273 backport
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@788 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-08 17:16:56 +00:00
shish
0c9fff3d11 backport
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@786 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-08 16:58:31 +00:00
shish
d3ceb8ef97 changes to 2.2, and remove broken text score
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@784 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-08 16:56:12 +00:00
shish
64db094721 2.2 too, as this is probably useful to a lot of people
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@780 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-08 16:03:30 +00:00
shish
d47fd5f25c regex thing in index in 2.2 too
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@778 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-08 15:42:05 +00:00
shish
f7d1df2727 both of those into 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@775 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-07 23:18:32 +00:00
shish
67455583e5 This feature freeze is more of a feature mild chill...
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@769 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-06 21:07:29 +00:00
shish
2e40bc73c8 I wonder if 2.2 should have branched this early <_<;;
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@767 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-06 18:42:52 +00:00
shish
c012717bce readme update
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@765 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-06 18:00:35 +00:00
shish
7b4dde4918 and, again, 2.2~
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@764 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-06 17:57:04 +00:00
shish
5ad77079a6 2.2.too
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@762 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-06 17:44:02 +00:00
shish
43028ebd67 both of them to 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@760 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-06 16:47:44 +00:00
shish
f821e752fc back to 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@757 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-06 16:38:32 +00:00
shish
73d5fe129a UploadingImageEvent -> DataUploadEvent
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@754 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-04 22:16:48 +00:00
shish
a226a17787 and in 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@751 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-04 10:38:41 +00:00
shish
03c9d6b298 better cache dir in 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@748 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-01 11:02:30 +00:00
shish
37a0aeb8ae ban by range in 2.2
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@747 7f39781d-f577-437e-ae19-be835c7a54ca
2008-04-01 11:00:19 +00:00
shish
47361369ff pull a couple of mostly cosmetic changes into stable
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@741 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-31 03:01:35 +00:00
shish
6c53088929 version number
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@736 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-30 06:06:00 +00:00
shish
a6d68c6f1b and commit it to 2.2...
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@735 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-29 04:13:54 +00:00
shish
57a6c39f2a stable too
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@733 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-29 04:00:09 +00:00
shish
a5f7b400f0 remove broken / non-gpl extensions
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@731 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-29 03:42:48 +00:00
shish
2a990735a0 branch for 2.2 stabilisation work
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.2@730 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-29 03:38:54 +00:00
shish
77e818c4aa revert this; seems to break mysql-4.1
git-svn-id: file:///home/shish/svn/shimmie2/trunk@729 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-29 03:37:16 +00:00
shish
975251ed42 enforced whitespace around metainfo editor
git-svn-id: file:///home/shish/svn/shimmie2/trunk@728 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-24 04:05:42 +00:00
shish
499d752ca9 make rating use the new image metainfo editor api
git-svn-id: file:///home/shish/svn/shimmie2/trunk@727 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-24 04:03:34 +00:00
shish
d0483bcc2a get the user to change their pass
git-svn-id: file:///home/shish/svn/shimmie2/trunk@726 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-15 21:53:17 +00:00
shish
c5349db306 check file size properly
git-svn-id: file:///home/shish/svn/shimmie2/trunk@725 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-02 16:31:35 +00:00
jjs
430163c29d [danbooru api] fixed for trunk, hopefully
git-svn-id: file:///home/shish/svn/shimmie2/trunk@724 7f39781d-f577-437e-ae19-be835c7a54ca
2008-03-02 01:11:52 +00:00
shish
7948202337 cache_execute was removed for lack of use
git-svn-id: file:///home/shish/svn/shimmie2/trunk@723 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-25 16:48:25 +00:00
shish
979ab9a013 don't load custom themes without base themes
git-svn-id: file:///home/shish/svn/shimmie2/trunk@722 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-17 09:25:49 +00:00
shish
c7c33a1a8d fix tag editing with danbooru theme, hopefully in a more permanant way
git-svn-id: file:///home/shish/svn/shimmie2/trunk@721 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-17 02:39:43 +00:00
shish
04fe9ad03a import aliases from file
git-svn-id: file:///home/shish/svn/shimmie2/trunk@720 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-16 03:58:05 +00:00
shish
c828ce5cfe move user search to user extension, and search by ID
git-svn-id: file:///home/shish/svn/shimmie2/trunk@719 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-16 03:14:38 +00:00
shish
86f805a088 blank folder for ATG
git-svn-id: file:///home/shish/svn/shimmie2/trunk@718 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-07 20:48:18 +00:00
shish
8b517a6a7c search for images with given ratings
git-svn-id: file:///home/shish/svn/shimmie2/trunk@717 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-07 20:28:07 +00:00
shish
5bae3dc733 graphical glitch
git-svn-id: file:///home/shish/svn/shimmie2/trunk@716 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-07 20:23:52 +00:00
shish
7f752180bf various minor bugs showed up in debug mode
git-svn-id: file:///home/shish/svn/shimmie2/trunk@715 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-06 17:33:08 +00:00
shish
fb62229634 move md5: to danbooru api
git-svn-id: file:///home/shish/svn/shimmie2/trunk@714 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-06 17:27:45 +00:00
shish
2948a4435e extensible search v1
git-svn-id: file:///home/shish/svn/shimmie2/trunk@713 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-06 17:24:08 +00:00
shish
0effe70b6f option to merge tags in the event of hash collision
git-svn-id: file:///home/shish/svn/shimmie2/trunk@712 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-06 16:20:43 +00:00
shish
5ebc559595 make res_limit work with the new upload system, and have a ratio limit
git-svn-id: file:///home/shish/svn/shimmie2/trunk@710 7f39781d-f577-437e-ae19-be835c7a54ca
2008-02-06 15:54:50 +00:00