Commit Graph

2503 Commits

Author SHA1 Message Date
c260f707fd only retroactively create history when the image has old tags and no log - if it is a new image (no old tags) then don't double-log it 2012-03-08 04:07:46 +00:00
f2c98bec4d a little nicer log format 2012-03-08 03:42:48 +00:00
5f6a454734 importance as a number is silly, and section is implied by the context of the description 2012-03-08 03:39:48 +00:00
9ebe425520 Merge branch 'master' of github.com:shish/shimmie2 2012-03-08 03:35:17 +00:00
285b78c185 image specific tags on mass upload form 2012-03-08 03:34:57 +00:00
569e93cd6b postgres requires a sequence name to be passed to get_last_insert_id 2012-03-08 02:55:04 +00:00
58d533ceb9 put a snippet of each comment in the event log 2012-03-08 02:36:21 +00:00
eb9b29b7b4 'blocked image' really means 'attempted to upload a blocked image', make the words reflect that 2012-03-08 01:37:42 +00:00
f928d178f4 Merge branch 'master' of github.com:shish/shimmie2 2012-03-08 01:30:38 +00:00
34a7a558b3 IP searching in postgres, hackishly (compare text(address) to username, rather than comparing address to inet(username)) 2012-03-08 01:30:08 +00:00
f1eaa4f751 about an hour ago -> an hour ago; the 'about' takes up too much space... 2012-03-08 01:28:43 +00:00
0ce9aa02a2 'false' == true. Convert the first param from DB value to real bool, and also use triple equals 2012-03-08 01:27:59 +00:00
1db23314b8 only toggler for hidable element 2012-03-06 21:25:45 +00:00
90347a08dd extent rather than crop and repage 2012-03-06 20:30:41 +00:00
21ddbb90d9 Merge branch 'master' of github.com:shish/shimmie2 2012-03-06 19:29:44 +00:00
6991e6e4a0 Merge branch 'master' of github.com:shish/shimmie2 2012-03-06 15:39:15 +00:00
232991979c upload page wibbling 2012-03-06 15:38:53 +00:00
e4c97ee80e witchcraft 2012-03-06 15:38:42 +00:00
24c64b50b4 make bookmarlet code more readable 2012-03-06 12:22:08 +00:00
5a6f146444 more detailed docs 2012-03-05 18:42:05 +00:00
88ee6ea148 get_theme_object is only used once, move it closer to where it's used 2012-03-05 14:21:41 +00:00
171a4b7c85 php syntax 2012-03-05 13:58:04 +00:00
383dd0088e documentation updates 2012-03-05 13:56:36 +00:00
ba0dd8e9f2 doxygen config updates 2012-03-05 13:56:29 +00:00
cba1e76b1f only force-wrap comments 2012-03-05 10:24:01 +00:00
4245cd268c if user has no js, default to showing info editor 2012-03-05 10:22:55 +00:00
03cfb5bc24 html5 boilerplate header 2012-03-05 10:14:58 +00:00
530d545a2d javascript/css updates and compression, and add modernizr 2012-03-05 10:10:04 +00:00
8448a4cee1 don't overwrite global $user... 2012-03-05 09:55:11 +00:00
b17fe7e7bd make bookmarklet.js easier to read 2012-03-05 09:52:48 +00:00
8b62ad281a if upload_collision_handler is set to 'don't merge tags', then don't merge tags 2012-03-05 09:32:08 +00:00
e56bd7b276 Merge pull request #157 from DakuTree/master
Fixes/Features
2012-03-05 01:28:22 -08:00
0dd7d086f2 option to sort taglists alphabetically rather than by tag count 2012-03-04 22:18:03 +00:00
e5e27a7804 bookmarklet should now play nice with tags that contain + 2012-03-04 22:18:03 +00:00
74e307b55f update tags if image already exists 2012-03-04 22:18:02 +00:00
8e4ae87c65 fix for image pages not loading for danbooru/lite themes 2012-03-04 22:18:02 +00:00
a0d8f20dbc Merge pull request #154 from dgz/fix-wordwrap
Fix issue #62: wordwrap in CSS rather than PHP
2012-03-03 12:31:29 -08:00
4f37b48070 Apply word-wrap: break-word; to all body contents to force reallylongunbreakablestrings to be broken per the theme's dimensions rather than the arbitrary 80 characters set by the bbcode extension 2012-03-03 12:43:04 -05:00
fa77d999eb Wordwrapping BEFORE applying bbcode breaks long links
Wordwrapping AFTER breaks the HTML generated by bbcode when using PHP's wordwrap(), better not to hard wordwrap at all and just do it with CSS
2012-03-03 12:39:24 -05:00
a789cb5708 Merge branch 'master' of github.com:shish/shimmie2 2012-03-02 23:57:46 +00:00
15fdd2e0b7 replace lots of javascript with a little jquery 2012-03-02 23:57:27 +00:00
74f0d38c04 comment snippets should link to the specific comment 2012-03-02 21:15:04 +00:00
0487bbe1bd count the messages properly, and show them... 2012-03-02 18:03:34 +00:00
8bab5b1c0a Merge branch 'master' of github.com:shish/shimmie2 2012-03-02 17:42:11 +00:00
b6b4122952 PM count 2012-03-02 17:41:25 +00:00
42af88ded9 Merge pull request #152 from Madoushi90/master
Regex for PDO DSN
2012-03-02 09:05:29 -08:00
9ac45f5363 Regex for PDO DSN
Old regex matched ADOdb URI. Also, this regex allows the user, pass, host and database information
to appear in any order.
2012-03-02 10:17:13 -06:00
3fc4060ef6 Merge pull request #149 from green-ponies/master
Typo
2012-03-01 03:52:28 -08:00
a3323e9047 Merge pull request #150 from Madoushi90/master
Fixed Popular Tags List
2012-03-01 03:52:07 -08:00
af33a36c89 Typo in SQL 2012-02-29 14:56:05 -05:00