Commit graph

3695 commits

Author SHA1 Message Date
Shish
4721d666cd log time spent waiting for database queries 2014-11-26 13:09:22 +00:00
Shish
1c60942730 log hit/miss when DEBUG_CACHE is on 2014-11-26 13:07:30 +00:00
Shish
dfba656355 die more explicitly when memcache is missing (PHP is terrible) 2014-11-24 02:21:45 +00:00
Shish
a846c16bd7 Merge pull request #457 from shish/show_bad_word_bans
Show when a banned regex is invalid
2014-11-10 23:57:17 +00:00
Shish
565b466721 Merge pull request #450 from DakuTree/patch-zipcheck
Hide "Download All Images" if ZipArchive doesn't exist/not enabled - Fixes #441
2014-10-15 18:33:30 +01:00
Shish
824d078ece Show when a banned regex is invalid 2014-10-15 18:31:06 +01:00
Shish
63a619d295 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2014-10-10 22:20:29 +01:00
Shish
ccfc22aa8b make block placement more explicit 2014-10-10 22:19:54 +01:00
Shish
a066c5ac0e regex for word filtering 2014-10-10 22:19:20 +01:00
Shish
8c7257eb54 Merge pull request #452 from DakuTree/patch-fix451
Fix "Image Only" not working with nice_urls disabled - Fixes #451
2014-09-04 22:05:39 +01:00
Daku
693b18f50c fix "Image Only" not working with nice_urls disabled 2014-09-02 17:06:39 +01:00
Daku
1cb59572f9 Merge pull request #445 from shish/bbcode_anchor
[anchor] bbcode tag, to make linking to parts of a page easier
2014-08-30 13:37:01 +01:00
Shish
c651845401 make anchors visible in the page, not just in the markup 2014-08-30 13:18:14 +01:00
Daku
ab3366e518 Hide "Download All Images" if ZipArchive doesn't exist/not enabled 2014-08-26 16:16:15 +01:00
Daku
9719464c8b Merge pull request #448 from shish/theme_breakdown
Make IndexTheme a little easier to customise
2014-08-26 15:51:41 +01:00
Daku
0744b50a71 Merge pull request #446 from shish/simplify_uceu
simplify user_can_edit_user -- many nested if/else's to one if
2014-08-26 15:19:27 +01:00
Daku
5efe1ddb36 Merge pull request #444 from shish/check_handler_exists
Check handler exists
2014-08-26 13:47:32 +01:00
Shish
fc4bd27529 simplify user_can_edit_user -- many nested if/else's to one if 2014-08-24 20:43:12 +01:00
Shish
9c71f59061 [anchor] bbcode tag, to make linking to parts of a page easier 2014-08-24 16:55:00 +01:00
Shish
50d40c1c81 give IndexTheme:display_page some sub-functions to make them easier to customise 2014-08-24 16:29:32 +01:00
Shish
f873d2304d Check event handler exists before calling it, in case the cache is out of date. Fixes #442 2014-08-24 11:33:05 +01:00
Shish
d6eb3892e2 Merge pull request #435 from geosohh/master
Fixes for mass_tagger extension
2014-08-02 17:48:21 +01:00
Shish
b1d634a8de Merge pull request #434 from DakuTree/patch-tagfix
Fix for tags exceeding char limit returning error + Bumped tag char limit to 255.
2014-08-02 17:47:14 +01:00
Geosohh
3185af3280 Remove tags from images using mass_tagger
Using negative tags removes them from the selected images.
2014-07-29 19:11:29 -03:00
Geosohh
3d2c55a9d5 Fixed mass_tagger bug when selecting images with similar ids
The mass_tagger extension behaves incorrectly if the id of an image is
the same as the ending of the id of another image.

Example:
Select image 143: var string == "143:"
Select image 113: var string == "143:113:"
Select image 43: var string == "1113:"
So either the wrong image will be tagged, or it will cause an error if
that image doesn't exist.
2014-07-29 18:02:50 -03:00
Daku
14f682da75 avoid errors if tag exceeds limit + flash message showing the problem tag 2014-06-20 00:39:29 +01:00
Daku
b89dd52b47 bumped the tag char limit to 255
there wasn't really much reason to have this so low, and this puts it to the same limit as other booru software
2014-06-19 23:14:11 +01:00
Shish
9069b0c1fb Merge pull request #429 from DakuTree/patch-misc
Pool updates + other misc tweaks.
2014-06-09 21:05:19 +01:00
Shish
d067545969 Merge pull request #432 from DakuTree/patch-sqlfix
Fix for #431 - Fix negative tags not working if they don't exist.
2014-06-09 20:59:11 +01:00
Shish
196e4d5300 Merge pull request #433 from muhkuh2005/master
Added check to initialize tags, when only categorized tags are available...
2014-06-09 16:32:34 +01:00
Pascal 'muhkuh2005' Borkenhagen
3468480864 Added check to initialize tags, when only categorized tags are available for image 2014-06-09 14:07:24 +00:00
Daku
5bd7369d7c Merge pull request #427 from shish/bcrypt
Use bcrypt for password storage
2014-06-05 18:00:19 +01:00
Daku
72fbafc271 fixes negative tags not working if they don't exist
fixes #431
2014-06-04 00:52:01 +01:00
Daku
24f2741a50 rating_to_name no longer exists
was removed in commit eadf1d9e87
2014-06-01 21:56:33 +01:00
Daku
90232b0a4c rename "index" to "pool index" to help differentiate between the two index links 2014-05-31 18:20:57 +01:00
Daku
183a2c7ae6 docs + added pool:lastcreated metatag which uses the ID of the last pool created by the user 2014-05-30 16:04:12 +01:00
Daku
df6b9245ec optional setting to set pool order with the pool metatag
example: pool:10:3 (pool #10 with order 3)
2014-05-30 15:21:42 +01:00
Daku
77769d2c17 allow setting of image_order via add_post() 2014-05-30 15:21:32 +01:00
Daku
bca4fdffa5 make sure pool nav & manage pool show when needed 2014-05-30 14:41:03 +01:00
Daku
6a14360e7a option to use autoincrementing pool order when post is added
rather than having everything default to 0 order
2014-05-30 13:12:34 +01:00
Daku
1dc668ca41 main.php shouldn't be generating HTML.. 2014-05-30 11:55:53 +01:00
Daku
f228a8eb4f pools css should be in it's own folder, not the themes 2014-05-30 00:23:12 +01:00
Daku
1dada97adc prev link for pools 2014-05-30 00:22:04 +01:00
Daku
77607e0c02 keep aspect ratio when created video thumbnail 2014-05-29 18:40:17 +01:00
Daku
aa0cf27e7e add theme name to cached css/js filename to avoid loading cached files of old theme after theme change 2014-05-29 18:37:49 +01:00
Shish
e259b8cd5a bcrypt had bugs before 5.3.7 2014-05-24 10:51:09 +01:00
Shish
a3f9e12ea0 octal for permissions 2014-05-24 10:18:44 +01:00
Shish
1b655704f3 Merge remote branch 'yaoifox/patch-1' into develop 2014-05-24 10:18:10 +01:00
Shish
d5c5cfd428 Merge pull request #426 from DakuTree/patch-notesfix
Fix for #422 + Fix Note Positioning
2014-05-24 10:12:58 +01:00
Shish
eb51a9b639 migrate to bcrypt for password storage 2014-05-24 09:47:42 +01:00