Commit graph

4089 commits

Author SHA1 Message Date
Shish
1566ff7eaa un-confuse phpunit 2017-09-17 19:37:30 +01:00
Shish
186ea55348 safety 2017-09-17 19:11:51 +01:00
Shish
5763b77e2b strnorm 2017-09-17 19:10:10 +01:00
Shish
2c0e49507e limit / offset 2017-09-17 19:06:10 +01:00
Shish
47ff7f185e Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2017-09-17 19:00:40 +01:00
Shish
860e828c3e Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2017-09-17 18:59:59 +01:00
Shish
a32bc6448c make user list slightly more useful 2017-09-17 18:59:48 +01:00
Shish
e1d6ff0f4e composer update 2017-09-17 18:16:07 +01:00
Shish
cdbb4e8c7b add resize/script.js 2017-09-17 15:09:25 +01:00
Shish
408b45e4cc Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2017-08-24 10:17:47 +01:00
Shish
abe473ffd6 count blank header as null 2017-08-24 10:17:39 +01:00
Shish
473c0f0bcb explicitly mark some block types as ignored when calculating 404ness 2017-08-24 10:17:24 +01:00
Shish
35bd51e513 use 'count()' + result->get_one() to count images, rather than 'select *' + result->rowcount()... 2017-08-23 00:42:19 +01:00
Shish
d875ab66a1 60 second post-list cache 2017-08-22 01:05:18 +01:00
Shish
5a6728209a improve cache logging 2017-08-22 01:04:33 +01:00
Shish
3c3529a4cc don't respond to autocomplete requests for blank string 2017-07-20 23:29:17 +01:00
Shish
8fcf721045 use image link for video 2017-07-20 23:28:55 +01:00
Shish
2f083f7608 more useful memcached error messages 2017-06-08 09:37:38 +01:00
Shish
94ec37029a stub more mb_ functions 2017-06-08 09:37:21 +01:00
Shish
d105644d1b use php sorting for alphabetic tag list, as utf8 sort ignores punctuation 2017-06-08 09:36:59 +01:00
Shish
9f4caaddea remove some unused variables 2017-06-01 20:44:26 +01:00
Shish
53c6f6df30 bulk thumb regen 2017-06-01 20:44:17 +01:00
Shish
2666d83579 fix URL for video fallback flash player 2017-06-01 20:44:02 +01:00
Shish
2f557326df die if caching modules are missing, don't silently fall back to NoCache 2017-05-30 02:13:11 +01:00
Shish
4e5af70093 re-stub mb_strlen (see #615) 2017-05-29 11:09:28 +01:00
Shish
843d7fae24 merge 2017-05-29 10:19:55 +01:00
Shish
8828fdfd05 log SQL query times in DEBUG_SQL mode 2017-05-29 10:19:11 +01:00
Shish
51e165aecf Add separate memcached cache 2017-05-29 10:18:11 +01:00
Shish
684efedcfd Log what URL query caused invalid search queries 2017-05-29 10:16:32 +01:00
Shish
8440826f50 Merge pull request #616 from jgen/develop
Another location where $tags should be an array instead of a string.
2017-05-15 13:02:36 +01:00
jgen
fc7d96b530 Another location where $tags should be an array instead of a string. 2017-05-14 22:18:44 -07:00
Shish
511216f4e8 Merge pull request #614 from jgen/develop
Ensure that metadata['tags'] is always an array
2017-05-14 23:12:49 +01:00
jgen
cf5aacaddf Use empty array instead of array with empty string. (Thanks Shish!) 2017-05-14 14:00:20 -07:00
jgen
3ffb2da91c More checking to ensure tags is an array. 2017-05-13 23:18:47 -07:00
jgen
7ebe301ffd Check if already an array before exploding. 2017-05-13 18:01:31 -07:00
Jeff
dfc536807c Merge pull request #613 from jgen/develop
Fix issue with archive handler if there is no add_status() method for the theme.
2017-05-13 17:49:17 -07:00
jgen
f492c6c2c3 Ensure that the Image object tag_array and the metadata array tags are always arrays. 2017-05-12 00:57:50 -07:00
jgen
c0e87ae2ae Fix issue with archive handler if no add_status method. 2017-05-11 23:43:10 -07:00
Jeff
3183ef59b3 Merge pull request #611 from thomas-hori/develop
Fix error upon bulk add.
2017-05-11 23:23:17 -07:00
Thomas Hori
d1306cfb2d Move Tag::explode call into add_image call so that $result is unaffected. 2017-04-26 14:08:06 +01:00
Thomas Hori
1625bd68e3 Fix error upon bulk add.
Fixes "PHP Fatal error:  Uncaught TypeError: Argument 2 passed to
TagSetEvent::__construct() must be of the type array, string given"
upon bulk add.
2017-04-25 17:48:34 +01:00
Shish
d608b68387 Merge pull request #610 from Zimmedon/develop
bulk_add_csv: Run Tag::explode() on the tags
2017-04-23 10:33:12 -07:00
John Brooks
f934baa207 bulk_add_csv: Run Tag::explode() on the tags before passing them to handlers
Fixes #575
2017-04-23 02:21:39 +00:00
Jeff
dc3508560a Merge pull request #609 from jgen/develop
Develop
2017-03-29 21:42:54 -07:00
Shish
8ef13db69c bump develop 2017-03-27 18:15:16 +01:00
Shish
807d44d644 Version bump 2017-03-27 18:14:11 +01:00
Shish
6345db174b Merge pull request #608 from shish/develop
Merge from develop into master
2017-03-27 18:13:13 +01:00
Jeff
827cae6221 Merge branch 'develop' of https://github.com/shish/shimmie2 into develop 2017-03-25 01:08:23 -07:00
Jeff
015c7d6728 Merge pull request #607 from im-mi/gelbooru-bookmarklet-fix
Fixed bookmarklet when logged in on imageboards running gelbooru
2017-03-25 01:07:10 -07:00
Jeff
8ff24eb1c6 Revert "Bump the version number"
This reverts commit 277d80c4df.
2017-03-24 23:21:48 -07:00