Commit Graph

798 Commits

Author SHA1 Message Date
aa2696ca07 only add ellipsis if the comment actually is too long 2012-02-06 14:42:07 +00:00
e38f9e720f CSS has odd/even built-in now 2012-02-06 12:24:13 +00:00
d2d03396af info box 2012-02-06 12:23:56 +00:00
7a25fad4b0 link to specific comments 2012-02-05 07:37:20 +00:00
4e1300631b Merge branch 'master' of github.com:shish/shimmie2 2012-02-05 04:25:58 +00:00
0b13db8ed7 hide anonymous's user page - having made a million comments, it was taking upwards of 60 seconds to process that one page, triggering the DOS defences... 2012-02-05 04:25:50 +00:00
5843aae4f2 random unused global o_O 2012-02-05 04:20:42 +00:00
dab85e5f26 merge type hints 2012-02-02 14:16:14 +00:00
cc8f1f35a5 more type hints 2012-02-02 14:14:33 +00:00
bbb51b60f8 typos~ 2012-02-02 08:09:48 +00:00
dc6c173efd type hints for hiphop 2012-02-02 08:07:57 +00:00
ec0fab54d8 these are magicked now 2012-02-02 07:53:27 +00:00
465011a68c hiphop chokes on this 2012-02-02 05:27:40 +00:00
b3d5878ce8 use the param 2012-02-02 05:24:06 +00:00
d5527d6dc8 missed a global 2012-02-02 05:23:55 +00:00
75b9bc2650 typo in merged code 2012-01-31 14:46:19 +00:00
fe85b2b5ee Merge remote branch 'zshall/master' 2012-01-31 14:00:41 +00:00
6f22207603 merge pdo fixes 2012-01-31 13:55:12 +00:00
aed5e1a30e hand merge of speed tweaks 2012-01-31 13:20:43 +00:00
1cd4f867b5 don't die if [/code] comes before [code] 2012-01-31 12:24:29 +00:00
8192f278d5 different sql for different databases :( 2012-01-31 12:15:25 +00:00
7af442855d this isn't so necessary with latest upstream changes 2012-01-30 02:18:16 +00:00
21904794ea Upload to simpleext 2012-01-27 17:12:08 +00:00
7aeb0ec097 tag list needs no manual adding 2012-01-27 17:06:29 +00:00
cb1b45e4ad code formatting consistency 2012-01-27 17:05:02 +00:00
2d49d9b103 use the right inheritance 2012-01-27 17:02:36 +00:00
f5eadb9011 Tag List to simpleext 2012-01-27 17:02:08 +00:00
5c2140a028 Tag Editor to simpleext 2012-01-27 16:58:48 +00:00
ee40a9aad3 merge 2012-01-27 16:49:35 +00:00
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
f3014e4e1e less regex 2012-01-27 12:24:38 +00:00
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
ad9dcfe926 make sure s is set 2012-01-26 18:03:04 +00:00
85af28c0b5 return after error, don't handle the bad data 2012-01-26 17:16:57 +00:00
52bbb36af4 shm_user breaks varnish cache 2012-01-26 16:51:24 +00:00
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
1877aa9973 Merge branch 'master' of github.com:shish/shimmie2 2012-01-26 15:26:08 +00:00
98f09695b6 sometimes tags are set with no images id... 2012-01-26 15:16:52 +00:00
0565568e5c source should log now when uploading 2012-01-26 09:56:29 +00:00
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
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
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
1ccc26ebd4 Merge branch 'master' of git://github.com/shish/shimmie2 2012-01-22 16:30:12 +01:00
03204859c1 merge~ 2012-01-22 15:11:39 +00:00
ddf61714f6 argh sql syntaxes 2012-01-22 14:54:03 +00:00
3338ff0420 tags/source/rating/locked should only update/log if different than current 2012-01-21 00:17:07 +00:00
eeaa27133a fixed rating with bookmarklet 2012-01-20 12:45:43 +00:00
471e3d057a fixed bookmarklet on danbooru flash pages again.. 2012-01-20 12:45:42 +00:00
9a35401666 image replace form now uses jquery 2012-01-20 12:45:40 +00:00
79b4adf1d1 renamed style.css for the upload ext to avoid autoloading 2012-01-20 12:45:38 +00:00