Commit graph

4249 commits

Author SHA1 Message Date
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
im-mi
d5fd6f6821 url_escape tag info link tag 2016-09-28 10:26:13 -04:00
Shish
3daa83223e Merge pull request #588 from im-mi/arrow-key-nav-ignore-modifiers
Ignore arrow key navigation when modifier keys held
2016-09-26 15:22:06 -05:00
Shish
af0aa98649 Merge pull request #586 from im-mi/image-info-tweaks
Image info tweaks
2016-09-26 15:21:46 -05:00
Shish
7e9cc0fb56 Merge pull request #590 from im-mi/fix-ico-size
Misc. Bugfixes
2016-09-26 15:20:07 -05:00
im-mi
8805f0dd18 Remove get_ico page
It's no longer needed because ICO now uses Image->get_image_link()
2016-09-26 11:18:06 -04:00
im-mi
e6dd1b492c Sanitize ratings 2016-09-25 15:26:36 -04:00
im-mi
d4fda00dd9 Check for existence of POST var tag_edit__owner before using it 2016-09-25 15:26:36 -04:00
im-mi
05da5d0b4f Use Image->get_image_link() on ICO files 2016-09-25 15:26:36 -04:00
im-mi
1dd0dfc591 Read ICO header with proper sign
Fixes width/height being read incorrectly when >= 128
2016-09-25 10:17:46 -04:00
Shish
9c062f3385 case-insensitive wiki pages 2016-09-24 16:17:14 +01:00
im-mi
f763fc1356 React appropriately when there are no random list search results 2016-09-23 12:31:02 -04:00
im-mi
3bebe77add Made the random list searchable 2016-09-23 12:21:40 -04:00
im-mi
891e52f4b9 Ignore arrow key navigation when modifier keys held 2016-09-23 12:09:40 -04:00
Shish
d9485bbb40 Merge pull request #587 from im-mi/fix-comment-delete-injection
Fix comment-delete injection
2016-09-14 17:12:01 -07:00
im-mi
a49c5745b0 Use html_escape instead of htmlspecialchars 2016-09-14 18:08:12 -04:00
im-mi
c1083bbea1 Fixed comment-delete code-injection vulnerability 2016-09-14 17:42:32 -04:00
im-mi
3e52e332de Only show image rater if user can rate 2016-09-13 02:10:48 -04:00
im-mi
4dcee0eede Removed trailing period from "Parent: None." for consistency 2016-09-11 23:42:34 -04:00
im-mi
001a1176cc Show image rating in image info box even when not logged in 2016-09-11 23:42:34 -04:00
im-mi
e110b558b8 Hide the rating editor outside of edit mode 2016-09-11 23:42:34 -04:00
Shish
7efff25dcc Merge pull request #585 from im-mi/pool-placeholder-text
Don't use javascript for pool search placeholder
2016-09-07 23:49:19 +01:00
im-mi
e8c6f655b0 Don't use javascript for pool search placeholder 2016-09-07 08:43:34 -04:00
Shish
d36338d4c4 Merge pull request #582 from im-mi/minor-html-fixes
Minor html fixes
2016-09-07 10:31:25 +01:00
Shish
0ef74bdd15 Merge pull request #584 from im-mi/remove-pool-index-link
Use generic NavBlock on pool pages (fixes a JS error)
2016-09-07 10:28:43 +01:00
im-mi
58096e10c8 Fix tag list clipboard spacing
This brings back the original behavior of having spaces between the columns when the tag list gets copied to the clipboard (tested in Chrome, Edge, and Firefox).

One caveat: Edge now adds multiple spaces.
2016-09-06 22:10:09 -04:00
im-mi
ab33652d70 Made tag list spacing more like it was before
It's still a few pixels off in some cases, but the difference is negligible now.
2016-09-06 22:05:34 -04:00
im-mi
73ff0e669d Use generic NavBlock instead of "Index" block on pool pages 2016-09-06 09:25:08 -04:00