Shish
|
0fcfa49e75
|
Merge branch 'develop' of https://github.com/shish/shimmie2 into develop
|
2014-12-18 14:38:37 +00:00 |
|
Shish
|
be4ae9da32
|
fix missing global (how did this pass tests? o.o)
|
2014-12-18 14:38:22 +00:00 |
|
Shish
|
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 |
|
Shish
|
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 |
|
Shish
|
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 |
|
jgen
|
d878526487
|
Button should say "Regenerate Thumbnail" for clarity.
|
2014-12-14 16:07:00 -08:00 |
|
jgen
|
95b94bd115
|
Some minor linting.
|
2014-12-14 16:06:31 -08:00 |
|
jgen
|
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 |
|
jgen
|
5012b15ce9
|
Comment as to why the default is to ignore the aspect ratio.
|
2014-12-14 15:20:47 -08:00 |
|
jgen
|
2ff036d250
|
Remove unused variables.
|
2014-12-14 15:19:59 -08:00 |
|
jgen
|
02efa180de
|
Add a default option to ignore aspect ratio when creating a thumbnail with FFmpeg.
|
2014-12-13 16:54:21 -08:00 |
|
Shish
|
e1a7986239
|
Merge remote-tracking branch 'origin/master' into develop
|
2014-12-13 01:52:34 +00:00 |
|
Shish
|
b71c96a130
|
Merge pull request #467 from terokorp/hotfix/ratingsearchfix
Fixing "rating=safe" search bug
|
2014-12-13 01:51:08 +00:00 |
|
Thasan
|
f2fc69cef4
|
Fixing "rating=safe" search bug
|
2014-12-13 03:23:44 +02:00 |
|
Shish
|
40734ef711
|
turn MIN_FREE_SPACE into a userspace config option
|
2014-12-07 13:54:47 +00:00 |
|
Shish
|
9abcadffb6
|
throw Ex() -> throw new Ex();
|
2014-12-07 13:20:36 +00:00 |
|
Shish
|
316f7ff858
|
Give a better error if User::class has been screwed up somehow
|
2014-12-07 03:44:17 +00:00 |
|
Shish
|
88f1df9ca6
|
HIPHOP is no longer supported (it's HHVM now, and HHVM supports PDO params anyway)
|
2014-12-07 01:10:12 +00:00 |
|
Shish
|
5d099c06f9
|
remove references to unused cache values
|
2014-12-06 23:51:58 +00:00 |
|
Shish
|
5ab8f9e5e2
|
log sets and deletes in CACHE_DEBUG mode
|
2014-12-06 23:50:56 +00:00 |
|
Shish
|
4d6e6ade1c
|
version bump
|
2014-12-06 23:48:03 +00:00 |
|
Shish
|
b3931dd403
|
version bump
v2.5.2
|
2014-12-06 23:47:17 +00:00 |
|
Shish
|
1bf3fba756
|
Merge branch 'develop'
|
2014-12-06 23:46:14 +00:00 |
|
Shish
|
8c1eb60367
|
Remove twitter_soc; any twitter ext will need to be different, fixes #395
|
2014-12-01 14:16:53 +00:00 |
|
Shish
|
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 |
|
Shish
|
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 |
|
Shish
|
7f22f99aaa
|
add a link to the user list, fixes #460
|
2014-11-30 15:42:43 +00:00 |
|
Shish
|
8511399076
|
bypass ban_words too
|
2014-11-30 13:52:29 +00:00 |
|
Shish
|
010b0620df
|
add a user flag for bypassing comment checks
|
2014-11-30 13:52:29 +00:00 |
|
Shish
|
e4be2c24c6
|
update lib/context.php
|
2014-11-30 12:49:08 +00:00 |
|
Shish
|
c0dfd9adc0
|
a little extra consistency in cache variable names
|
2014-11-26 13:09:49 +00:00 |
|
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 |
|