398 Commits

Author SHA1 Message Date
shish
de6547cd4b and merge that into stable...
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@590 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-28 17:08:22 +00:00
shish
16f83a8f2b stricter tag sanitising
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@587 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-28 01:31:14 +00:00
shish
4e5d409d91 And move *that* one to stable...
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@585 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-28 00:08:16 +00:00
shish
53cf70a071 if source is empty, set it to null (branch_2.1)
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@583 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-27 23:55:53 +00:00
shish
50b9880d2d set default theme to 'default' (in branch_2.1)
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@581 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-27 23:42:18 +00:00
shish
65179cec29 pull [578] from trunk
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@579 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-27 23:33:43 +00:00
shish
15c8d588b6 pull neatness and magic quotes fix from trunk
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@573 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-27 19:39:12 +00:00
shish
6bea5d507f add a couple of search types to branch_2.1
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@565 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-24 18:12:33 +00:00
shish
c4b638091a brain fail
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@555 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-22 00:33:51 +00:00
shish
1b05dbe34a use default theme if selected theme doesn't exist
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@552 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-22 00:05:07 +00:00
shish
d7c0427868 remove IP bans by ID
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@549 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-21 23:33:08 +00:00
shish
749ed3b587 alias csv export fixed
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@531 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-18 02:35:49 +00:00
shish
a7c259839c merge new counters
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@526 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-18 00:53:24 +00:00
shish
9b08d4d062 allow people to add columns to the images table, then use them (merged into stable, as it's needed for a stable extension)
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@512 7f39781d-f577-437e-ae19-be835c7a54ca
2007-10-02 22:24:32 +00:00
shish
839b585aee set curl user-agent and referrer
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@503 7f39781d-f577-437e-ae19-be835c7a54ca
2007-09-29 22:49:56 +00:00
shish
460ac0d5b6 actually, that doesn't apply to stable...
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@501 7f39781d-f577-437e-ae19-be835c7a54ca
2007-09-29 00:15:50 +00:00
shish
869e01bbe0 pull fix for bulk add into stable
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@500 7f39781d-f577-437e-ae19-be835c7a54ca
2007-09-29 00:14:29 +00:00
shish
b071577cd1 pull et version fix
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@490 7f39781d-f577-437e-ae19-be835c7a54ca
2007-09-18 09:22:47 +00:00
shish
d51f2b3032 downtime reacts to PageRequestEvent
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@486 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-27 23:45:04 +00:00
shish
e7595260c1 danbooru theme more danbooruey
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@484 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-27 23:26:28 +00:00
shish
7846a94575 betterness
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@480 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-24 22:35:44 +00:00
shish
5bec0b6ba8 event log to stable before it becomes incompatible
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@479 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-24 22:34:17 +00:00
shish
09acf33f72 Theme engine 2.1 ported to branch_2.1
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@468 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-23 11:51:24 +00:00
shish
2d4294115c does this fix a weird bug o_O
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@463 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-21 23:46:51 +00:00
shish
cd2663326f put the licence in the readme <_<
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@462 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-15 12:16:07 +00:00
shish
cff14431c0 minor rss fixes
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@460 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-15 11:48:36 +00:00
shish
1588a598a0 version to 2.1
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@457 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-14 03:19:01 +00:00
shish
779466e85f fix for multi-tag search
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@455 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-08 06:25:35 +00:00
shish
4d708694a1 this should have been gone a while ago
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@443 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-06 21:29:27 +00:00
shish
9e4ec88876 title links to main page, not front page
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@439 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-06 19:35:43 +00:00
shish
1d44a3a21a out with the old
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@438 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-06 19:29:34 +00:00
shish
f101a1fc93 various fixes pulled from trunk
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@437 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-06 19:27:54 +00:00
shish
c607260c95 missed some spots
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@430 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-05 22:21:27 +00:00
shish
6de34ca5e5 remove unfinished contribs
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@429 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-05 22:21:11 +00:00
shish
5714cb6921 2.1-rc1
git-svn-id: file:///home/shish/svn/shimmie2/branches/branch_2.1@426 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-05 22:05:20 +00:00
shish
61d188753f 2.1-rc1
git-svn-id: file:///home/shish/svn/shimmie2/trunk@425 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-05 22:03:56 +00:00
shish
0e25e00d92 argh. 20 ways of finding the install folder, and none of them work -_-
git-svn-id: file:///home/shish/svn/shimmie2/trunk@424 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-05 22:03:43 +00:00
shish
1b80e80aa8 left aligned comments, again
git-svn-id: file:///home/shish/svn/shimmie2/trunk@423 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-03 17:15:52 +00:00
shish
064bd7fd01 Use the veto error message, not adding blocks from within main.php
git-svn-id: file:///home/shish/svn/shimmie2/trunk@422 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-02 20:49:25 +00:00
shish
15ee93bf9b make sure source is something sensible
git-svn-id: file:///home/shish/svn/shimmie2/trunk@421 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-02 20:38:46 +00:00
shish
25b1ebad8b search user rather than poster; everything else refers to 'user'
git-svn-id: file:///home/shish/svn/shimmie2/trunk@420 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-02 19:57:40 +00:00
shish
4fdecf9677 unix line endings
git-svn-id: file:///home/shish/svn/shimmie2/trunk@419 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-02 17:10:17 +00:00
shish
61bfd795b3 php also fails at various other things
git-svn-id: file:///home/shish/svn/shimmie2/trunk@418 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-02 17:08:48 +00:00
shish
5d1541efe0 php4 fails at heredoc
git-svn-id: file:///home/shish/svn/shimmie2/trunk@417 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-02 17:07:26 +00:00
shish
1c8619d9e9 Image and comment counts not shown for user #0
git-svn-id: file:///home/shish/svn/shimmie2/trunk@416 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-02 15:10:09 +00:00
shish
87722ff98a proper link
git-svn-id: file:///home/shish/svn/shimmie2/trunk@415 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-01 17:31:30 +00:00
shish
e171fc98de danbooru theme tweaks
git-svn-id: file:///home/shish/svn/shimmie2/trunk@414 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-01 17:24:34 +00:00
shish
ff5f41c91e optional user links on user page
git-svn-id: file:///home/shish/svn/shimmie2/trunk@413 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-01 17:11:46 +00:00
shish
f36c783868 source url editor
git-svn-id: file:///home/shish/svn/shimmie2/trunk@412 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-01 16:58:50 +00:00
shish
19ef368480 hide 404 error, we'll deal with it elsewhere
git-svn-id: file:///home/shish/svn/shimmie2/trunk@411 7f39781d-f577-437e-ae19-be835c7a54ca
2007-08-01 16:26:56 +00:00