Commit graph

783 commits

Author SHA1 Message Date
Shish
75b9bc2650 typo in merged code 2012-01-31 14:46:19 +00:00
Shish
fe85b2b5ee Merge remote branch 'zshall/master' 2012-01-31 14:00:41 +00:00
Shish
6f22207603 merge pdo fixes 2012-01-31 13:55:12 +00:00
Shish
aed5e1a30e hand merge of speed tweaks 2012-01-31 13:20:43 +00:00
Shish
1cd4f867b5 don't die if [/code] comes before [code] 2012-01-31 12:24:29 +00:00
Shish
8192f278d5 different sql for different databases :( 2012-01-31 12:15:25 +00:00
Shish
7af442855d this isn't so necessary with latest upstream changes 2012-01-30 02:18:16 +00:00
Shish
21904794ea Upload to simpleext 2012-01-27 17:12:08 +00:00
Shish
7aeb0ec097 tag list needs no manual adding 2012-01-27 17:06:29 +00:00
Shish
cb1b45e4ad code formatting consistency 2012-01-27 17:05:02 +00:00
Shish
2d49d9b103 use the right inheritance 2012-01-27 17:02:36 +00:00
Shish
f5eadb9011 Tag List to simpleext 2012-01-27 17:02:08 +00:00
Shish
5c2140a028 Tag Editor to simpleext 2012-01-27 16:58:48 +00:00
Shish
ee40a9aad3 merge 2012-01-27 16:49:35 +00:00
Shish
7a5f87572c an image already knows what its own details are, it doesn't need to be passed them... 2012-01-27 16:27:02 +00:00
Shish
f3014e4e1e less regex 2012-01-27 12:24:38 +00:00
Shish
93c2aa2084 only show IP list to admin and self-user, and don't show anon's list 2012-01-27 10:17:44 +00:00
Shish
ad9dcfe926 make sure s is set 2012-01-26 18:03:04 +00:00
Shish
85af28c0b5 return after error, don't handle the bad data 2012-01-26 17:16:57 +00:00
Shish
52bbb36af4 shm_user breaks varnish cache 2012-01-26 16:51:24 +00:00
Shish Moom
38aa55dafd Merge pull request #99 from DakuTree/master
Auto resize on upload + Popular by Day/Month/Year
2012-01-26 08:01:37 -08:00
Shish
1877aa9973 Merge branch 'master' of github.com:shish/shimmie2 2012-01-26 15:26:08 +00:00
Shish
98f09695b6 sometimes tags are set with no images id... 2012-01-26 15:16:52 +00:00
Daku
0565568e5c source should log now when uploading 2012-01-26 09:56:29 +00:00
Shish
f38b45e2a9 there are some odd cases where anonymous is not user #1, so use the anon_id variable 2012-01-24 16:40:36 +00:00
NaGeL
ddd3f99835 deleting the user withouth images delete resulted in image deletion too: the DB entriy gets removed but the image stays on the Hard drive.
this is fixed.
also the Foreign key needs to be manually updated in images table.
named the foreign keys in install.php for easier altering in the future.
2012-01-22 20:14:35 +01:00
NaGeL
023384149f User deletion (Deletes the user with comments, favorites and private messages)
User deletion with uploaded images ( all above plus the images the user uploaded)
Also the Database fix that is all needed for this in DBupdate.php
2012-01-22 18:55:52 +01:00
NaGeL
1ccc26ebd4 Merge branch 'master' of git://github.com/shish/shimmie2 2012-01-22 16:30:12 +01:00
Shish
03204859c1 merge~ 2012-01-22 15:11:39 +00:00
Shish
ddf61714f6 argh sql syntaxes 2012-01-22 14:54:03 +00:00
Daku
3338ff0420 tags/source/rating/locked should only update/log if different than current 2012-01-21 00:17:07 +00:00
Daku
eeaa27133a fixed rating with bookmarklet 2012-01-20 12:45:43 +00:00
Daku
471e3d057a fixed bookmarklet on danbooru flash pages again.. 2012-01-20 12:45:42 +00:00
Daku
9a35401666 image replace form now uses jquery 2012-01-20 12:45:40 +00:00
Daku
79b4adf1d1 renamed style.css for the upload ext to avoid autoloading 2012-01-20 12:45:38 +00:00
Shish
f5edb4fb4e the 24 hour limit can apply to the page count too, making that also 70x faster 2012-01-20 05:24:29 +00:00
Shish
4c2adce744 limiting by date at the database level is ~70x faster than limiting by page at the PHP level 2012-01-20 04:34:06 +00:00
Shish
f100e6a9d4 5 may have been a little extreme 2012-01-20 04:05:54 +00:00
Shish
49e7bfa1b2 tidy up some ancient base_href / data_href messes; base_href as a config variable is no longer used 2012-01-20 03:29:29 +00:00
Shish
36e443e07d the algorithm for listing old comments pages is *really* inefficient; the first few pages are quick, page 100 can take a few seconds to generate... rule34 has over 100,000 pages of comments. Limit to the first few pages for now, as I don't know anyone who even goes past the front page. 2012-01-20 03:12:48 +00:00
NaGeL
8eaaa6a7ca Added user deletion.
User is deleted from database
the Comments are deleted too, unknown reason for me
Noting else is deleted so far.
2012-01-19 18:23:43 +01:00
NaGeL
557a82e7be Fixed linking bug in admin_user/list page. 2012-01-19 16:43:20 +01:00
Shish
8ba22d8fbc same for user-agent 2012-01-19 15:28:55 +00:00
Shish
b8bdbd3533 after detecting an error, don't carry on processing the bad data... 2012-01-19 15:23:44 +00:00
Shish
7608107232 lib/askismet expects the referrer to either be set manually, or exist; if it doesn't exist we need to set it manually 2012-01-19 15:20:32 +00:00
Shish
a75d8744c9 Merge branch 'master' of github.com:shish/shimmie2 2012-01-18 18:00:10 +00:00
NaGeL
b52651c558 added [align=(left|center|right)] BBcode which aligns text naturally. 2012-01-18 17:49:29 +00:00
Shish
bdf274074c some people like heading to the image after an image that isn't there (mostly robots with old URLs) 2012-01-18 03:13:27 +00:00
NaGeL
3c6217fa4c added [align=(left|center|right)] BBcode which aligns text naturally. 2012-01-17 22:45:24 +01:00
Daku
a336944b11 uploader fixes 2012-01-17 10:56:52 +00:00