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
Daku
df38c7978c
remove composer dependency on composer-asset-plugin & use asset-packagist instead
...
This works the exact same, but without the requirement of a globally installed plugin
This _may_ require a "composer global remove composer-asset-plugin remove" to work correctly.
2017-03-10 15:54:49 +00:00
Shish
55ee93fd27
Merge pull request #600 from jgen/develop
...
Bump PHP version up to 5.6 & Linting/fixes
2017-03-10 11:11:38 +00:00
jgen
ab9dc0c511
Move phpunit to require-dev in composer.json
2017-03-10 00:28:47 -08:00
jgen
9e7787de0c
From Scrutinizer: The case 'r' would never be reached due to the default appearing before it.
2017-03-09 22:55:32 -08:00
jgen
d62304cf70
more linting
2017-03-09 22:28:48 -08:00
jgen
d0b0c7f93d
More linting with PHPDoc comments
2017-03-09 21:58:14 -08:00
jgen
bd0310a699
Merge branch 'develop' of https://github.com/jgen/shimmie2 into develop
2017-03-09 21:23:05 -08:00
Jeff
8e7c6ee44e
Merge pull request #1 from jgen/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes for comments.
2017-03-09 20:43:19 -08:00
jgen
fef219c853
Add explicit phpunit dependency back
2017-03-09 10:32:00 -08:00
jgen
9cf325d195
Try global namespace
2017-03-09 01:31:41 -08:00
Scrutinizer Auto-Fixer
9a906d4ecf
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-03-09 09:27:52 +00:00
jgen
c1e115e075
Test removing explict phpunit dependency from composer
2017-03-09 01:22:45 -08:00
jgen
ab27e2d2a5
Bump PHP version up to 5.6
2017-03-09 01:12:27 -08:00
jgen
9b7627dede
PHP versions 5.5 is EOL now.
2017-03-09 01:09:34 -08:00
jgen
f21648b46d
Add phpunit to composer dependencies & update composer
2017-03-09 00:54:48 -08:00
jgen
20455aa2fb
Test using PHP 7.1 on Travis as well
2017-03-09 00:13:11 -08:00
jgen
ede2fcf4eb
More linting and fixing
2017-03-08 23:52:31 -08:00
jgen
fc0945354d
Merge remote-tracking branch 'shish/develop' into develop
2017-03-08 23:05:52 -08:00
jgen
17307820e8
Add some PHPdoc comments as suggested by Scrutinizier
2017-03-08 23:02:26 -08:00
Shish
72de620b42
Merge pull request #598 from jgen/develop
...
#597 : Fix for XSS issue in chatbox extension.
2017-03-08 10:30:54 +00:00
jgen
c379420a1f
#597 : Fix for XSS issue in chatbox extension.
2017-03-08 01:14:11 -08:00
Shish
fefc922070
Create LICENSE.txt
2016-11-27 20:28:16 +00:00
Shish
4ed28e2db7
Merge branch 'im-mi-tag-tables' into develop
2016-10-10 14:20:10 +01:00
Shish
e43b1b3aed
Merge branch 'tag-tables' of git://github.com/im-mi/shimmie2 into im-mi-tag-tables
2016-10-10 14:19:57 +01:00
Shish
4b9278d09b
Merge branch 'develop' of https://github.com/shish/shimmie2 into develop
2016-10-09 22:33:25 +01:00
Shish
623d34f20b
Merge pull request #589 from im-mi/searchable-random-list
...
Searchable random list
2016-10-09 22:26:28 +01:00
Shish
7548c66a0b
Merge pull request #578 from im-mi/enhance-zoom
...
Enhance zoom
2016-10-09 22:21:39 +01:00
Shish
579cbf3467
Merge pull request #591 from im-mi/url-escape-tag-info-link-tag
...
url_escape tag info link tag
2016-10-09 14:45:00 +01:00
