67628816a4
Finally commit ext for purging varnish on-demand
2015-01-24 16:54:18 +00:00
b47e4aacb1
Merge branch 'develop' of https://github.com/shish/shimmie2 into develop
2015-01-24 16:44:33 +00:00
67fc50e6c3
Merge pull request #475 from Diftraku/ouroboros_api
...
Fix duplicate handling
2015-01-24 08:41:06 -08:00
8dc27c6b97
home page mobile tweaks
2015-01-08 23:31:24 +00:00
3af95b5ebe
Fix duplicate handling
...
Now with 17% less fat:
* Moved validation logic into OuroborosPost for sanity
* Added sanity checks for OuroborosPost values
* Changed defaults to be more sane (mainly tags)
* OuroborosPost now accepts an MD5 hash along the metadata (like it
should!)
* Fixed dupe handling logic
2015-01-05 13:47:53 +02:00
0fcfa49e75
Merge branch 'develop' of https://github.com/shish/shimmie2 into develop
2014-12-18 14:38:37 +00:00
be4ae9da32
fix missing global (how did this pass tests? o.o)
2014-12-18 14:38:22 +00:00
caa2691bb9
Merge pull request #468 from jgen/develop
...
Allow Shimmie to work with older versions of FFmpeg
2014-12-17 13:44:25 +00:00
7bcf2fc29e
Merge pull request #465 from shish/min_space_config
...
Turn MIN_FREE_SPACE into a userspace config option
2014-12-17 13:41:55 +00:00
c0279565f4
Merge pull request #462 from shish/bypass_comment_checks
...
Allow admins to bypass comment checks (rate limit etc)
2014-12-17 13:40:06 +00:00
d878526487
Button should say "Regenerate Thumbnail" for clarity.
2014-12-14 16:07:00 -08:00
95b94bd115
Some minor linting.
2014-12-14 16:06:31 -08:00
433d67453c
This fixes issue #466 . You can now optionally generate thumbnails for videos with the newer versions of FFmpeg that take into account the aspect ratio.
2014-12-14 15:22:44 -08:00
5012b15ce9
Comment as to why the default is to ignore the aspect ratio.
2014-12-14 15:20:47 -08:00
2ff036d250
Remove unused variables.
2014-12-14 15:19:59 -08:00
02efa180de
Add a default option to ignore aspect ratio when creating a thumbnail with FFmpeg.
2014-12-13 16:54:21 -08:00
e1a7986239
Merge remote-tracking branch 'origin/master' into develop
2014-12-13 01:52:34 +00:00
f2fc69cef4
Fixing "rating=safe" search bug
2014-12-13 03:23:44 +02:00
40734ef711
turn MIN_FREE_SPACE into a userspace config option
2014-12-07 13:54:47 +00:00
5d099c06f9
remove references to unused cache values
2014-12-06 23:51:58 +00:00
1bf3fba756
Merge branch 'develop'
2014-12-06 23:46:14 +00:00
8c1eb60367
Remove twitter_soc; any twitter ext will need to be different, fixes #395
2014-12-01 14:16:53 +00:00
a3880e2b49
Merge pull request #463 from shish/user_list_link
...
add a link to the user list, fixes #460
2014-12-01 14:04:04 +00:00
fcb7166b0c
Merge pull request #461 from shish/dbtime
...
Log time spent in database (and some other minor performance debugging tweaks)
2014-12-01 14:03:28 +00:00
7f22f99aaa
add a link to the user list, fixes #460
2014-11-30 15:42:43 +00:00
8511399076
bypass ban_words too
2014-11-30 13:52:29 +00:00
010b0620df
add a user flag for bypassing comment checks
2014-11-30 13:52:29 +00:00
c0dfd9adc0
a little extra consistency in cache variable names
2014-11-26 13:09:49 +00:00
4721d666cd
log time spent waiting for database queries
2014-11-26 13:09:22 +00:00
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
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
824d078ece
Show when a banned regex is invalid
2014-10-15 18:31:06 +01:00
63a619d295
Merge branch 'develop' of https://github.com/shish/shimmie2 into develop
2014-10-10 22:20:29 +01:00
ccfc22aa8b
make block placement more explicit
2014-10-10 22:19:54 +01:00
a066c5ac0e
regex for word filtering
2014-10-10 22:19:20 +01:00
693b18f50c
fix "Image Only" not working with nice_urls disabled
2014-09-02 17:06:39 +01:00
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
c651845401
make anchors visible in the page, not just in the markup
2014-08-30 13:18:14 +01:00
ab3366e518
Hide "Download All Images" if ZipArchive doesn't exist/not enabled
2014-08-26 16:16:15 +01:00
9719464c8b
Merge pull request #448 from shish/theme_breakdown
...
Make IndexTheme a little easier to customise
2014-08-26 15:51:41 +01:00
fc4bd27529
simplify user_can_edit_user -- many nested if/else's to one if
2014-08-24 20:43:12 +01:00
9c71f59061
[anchor] bbcode tag, to make linking to parts of a page easier
2014-08-24 16:55:00 +01:00
50d40c1c81
give IndexTheme:display_page some sub-functions to make them easier to customise
2014-08-24 16:29:32 +01:00
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
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
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
9069b0c1fb
Merge pull request #429 from DakuTree/patch-misc
...
Pool updates + other misc tweaks.
2014-06-09 21:05:19 +01:00
3468480864
Added check to initialize tags, when only categorized tags are available for image
2014-06-09 14:07:24 +00:00
5bd7369d7c
Merge pull request #427 from shish/bcrypt
...
Use bcrypt for password storage
2014-06-05 18:00:19 +01:00
24f2741a50
rating_to_name no longer exists
...
was removed in commit eadf1d9e87
2014-06-01 21:56:33 +01:00
