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 |
|
im-mi
|
495776cac1
|
Fixed bookmarklet when logged in on imageboards running gelbooru
|
2017-03-23 20:46:30 -04:00 |
|
jgen
|
277d80c4df
|
Bump the version number
|
2017-03-23 00:35:18 -07:00 |
|
Jeff
|
997f321741
|
Merge pull request #605 from DakuTree/develop
Fix SVG XSS
|
2017-03-22 23:54:10 -07:00 |
|
Daku
|
acba60e7aa
|
remove extra newline
|
2017-03-18 00:49:08 +00:00 |
|
Daku
|
2b62cc8171
|
loading SVG via <img> instead of <object> to stop inline JS execution
|
2017-03-18 00:13:16 +00:00 |
|
Daku
|
e2272e7786
|
linting
|
2017-03-17 23:56:26 +00:00 |
|
Daku
|
cd7352ad9b
|
only need to disable these on PHP5.3 and lower
|
2017-03-17 23:12:54 +00:00 |
|
Shish
|
ce5bb30113
|
Merge pull request #604 from jgen/scrutinizer-fixes
Some more linting
|
2017-03-15 09:42:15 +00:00 |
|
jgen
|
204ea1d239
|
And more linting.
|
2017-03-12 17:13:32 -07:00 |
|
Jeff
|
9a68d7ac98
|
Merge pull request #2 from jgen/scrutinizer-patch-1
Scrutinizer Auto-Fixes
|
2017-03-12 16:47:42 -07:00 |
|
Scrutinizer Auto-Fixer
|
1caef6d633
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2017-03-12 23:45:38 +00:00 |
|
jgen
|
b053be5d88
|
More linting.
|
2017-03-12 14:53:49 -07:00 |
|
jgen
|
a5a89dc08d
|
mb_strlen and mb_internal_encoding have been in core PHP since version 4.0.6
mb_strtolower has been in core PHP since version 4.3.0
|
2017-03-12 14:43:19 -07:00 |
|
jgen
|
7bd581b530
|
Scrutinizer commets.
|
2017-03-12 14:29:35 -07:00 |
|
Shish
|
44bead8b92
|
Merge pull request #603 from jgen/develop
PHP Version check in the code should use a configurable value.
|
2017-03-12 16:13:02 +00:00 |
|
Shish
|
7968f336fd
|
Merge pull request #601 from DakuTree/develop
Updated/removed various libs + tweaks
|
2017-03-12 16:12:01 +00:00 |
|
Shish
|
df6a91540c
|
Merge pull request #602 from jgen/merge-from-master
Merge fixes from master into develop
|
2017-03-12 16:09:35 +00:00 |
|
jgen
|
ec4111430d
|
More linting.
|
2017-03-12 00:29:10 -08:00 |
|
jgen
|
8de816d7dd
|
Some more linting via PHPDoc comments.
|
2017-03-12 00:18:26 -08:00 |
|
jgen
|
fb3cc1832f
|
Use triple equals, because PHP.
|
2017-03-11 23:19:37 -08:00 |
|
jgen
|
2691a6bbdc
|
Change PHP version check to use a configuration constant, rather than a hardcoded version in the code.
(As it seems this hardcoded version number is easy to forget about, and then it doesn't actually get updated..)
|
2017-03-11 18:34:36 -08:00 |
|
jgen
|
ebab9eddeb
|
Merge branch 'master' into merge-from-master
Conflicts:
ext/tag_list/theme.php
|
2017-03-11 00:52:16 -08:00 |
|
Daku
|
f9d0c83d5b
|
.audio > .audio_image (.audio is used for modernizr)
|
2017-03-10 19:18:35 +00:00 |
|
Daku
|
6fc3d51014
|
use HTML5 audio player, jsmediatags lib, default volume for audio/video
|
2017-03-10 19:16:54 +00:00 |
|
Daku
|
e07556c62d
|
make sure video isn't bigger than container + linting
|
2017-03-10 18:26:07 +00:00 |
|
Daku
|
12d73c28a8
|
remove getID3 lib
|
2017-03-10 18:16:56 +00:00 |
|
Daku
|
84e86c4930
|
use mime_content_type instead of getID3 + use proper MP4 mimetype
|
2017-03-10 18:03:59 +00:00 |
|
Daku
|
256d09a3ec
|
use multiline statements rather than multiple if statements
|
2017-03-10 16:39:12 +00:00 |
|
Daku
|
68d9ec50c3
|
specify composer phpunit
|
2017-03-10 16:21:07 +00:00 |
|
Shish
|
10863d4c4b
|
import imageboard to avoid warnings
|
2017-03-10 16:15:31 +00:00 |
|
Shish
|
c208a3715c
|
mark static functions as static
|
2017-03-10 16:14:56 +00:00 |
|
Daku
|
07d57f20e8
|
this is no longer needed
|
2017-03-10 16:10:48 +00:00 |
|
Daku
|
6006530b3d
|
password_compat is not required on PHP 5.5+
|
2017-03-10 16:10:28 +00:00 |
|
Daku
|
915acda6c7
|
update PHP-Akismet to PHP7 Compatable version
|
2017-03-10 15:56:09 +00:00 |
|
Daku
|
810ad041b7
|
update composer.lock
|
2017-03-10 15:55:09 +00:00 |
|