jgen
332c8538b7
Change the function syntax to quiet JSHint.
2014-04-24 04:46:23 -04:00
jgen
506e699f8a
Not sure if we really need the triple equals.
2014-04-24 01:15:30 -04:00
jgen
866d39a68e
The 'tags' box actually has a different ID.
2014-04-24 01:15:03 -04:00
jgen
51c145d5c9
Some more linting on the bookmarklet.js file.
2014-04-24 01:08:47 -04:00
jgen
4b90faf89d
Even more linting of JS files.
2014-04-24 00:55:14 -04:00
jgen
a105090039
Some more JS linting.
2014-04-23 23:39:09 -04:00
jgen
887f963e17
Add the jshint comment to alter how scrutinzer-ci deals with the js.
2014-04-23 23:38:53 -04:00
jgen
b775c007cd
Give these HTML headers some slight priority over the default value of 50.
2014-04-23 23:07:10 -04:00
jgen
a0ab3864c0
Push the headers for the chatbox even further down to make sure that jQuery is already loaded.
2014-04-23 23:01:51 -04:00
jgen
8cdf919827
More linting. This time of the JavaScript for the chat-box extension.
2014-04-23 22:43:42 -04:00
jgen
0bd031a269
Merge branch 'develop' of github.com:jgen/shimmie2 into linting
...
Manually resolved conflicts:
ext/chatbox/js/yshout.js
2014-04-23 22:42:30 -04:00
jgen
21e1359b86
Avoid short open tag for PHP.
2014-04-20 05:07:26 -04:00
jgen
60980c8839
One more jQuery reference.
2014-04-20 05:04:45 -04:00
jgen
a7ba0f887b
Again, the chatbox needs help from the jQuery migrate plugin.
2014-04-20 05:00:59 -04:00
jgen
2df54b911a
Don't use short open tags for PHP as they are not turned on by default in production environments.
2014-04-20 05:00:34 -04:00
jgen
e2516fa5cf
Chatbox should be fixed now.
...
The chatbox extension actually needs some functionality that was removed from jQuery versions 1.9 and up. When Shimmie's version of jQuery was bumped up to 1.11 this actually broke the chatbox.
2014-04-20 04:51:19 -04:00
jgen
880840623a
Need to ensure that this html header is added last.
2014-04-20 04:36:25 -04:00
jgen
717401ccab
Removing this as jQuery is already included in Shimmie now.
2014-04-20 04:35:33 -04:00
jgen
8b698e1b6f
Revert this commit.
2014-04-20 04:29:11 -04:00
jgen
54362a49c6
Fix the broken chatbox issue.
2014-04-20 04:25:08 -04:00
jgen
57a390eaab
Massive linting!
2014-04-19 23:38:42 -04:00
Shish
dc6653d3be
Merge pull request #407 from jgen/hotfix/downtime_theme_edits
...
Hotfix/downtime theme edits
2014-04-20 00:30:57 +01:00
Shish
75c3d8e453
Merge pull request #409 from jgen/linting
...
Linting
2014-04-20 00:29:53 +01:00
jgen
c527ae91d6
More linting and cleanup.
2014-04-19 04:17:28 -04:00
jgen
be385deaab
Clean up this js file as well.
2014-04-19 02:58:36 -04:00
jgen
28d83fda0d
Even more linting and cleaning.
2014-04-19 02:33:34 -04:00
jgen
2da8c19a07
More linting!
2014-04-19 01:36:18 -04:00
jgen
bdf49b33cb
Some more linting thanks to scrutinizer-ci
2014-04-19 01:18:49 -04:00
jgen
505a3e5233
Merge branch 'develop' of git://github.com/shish/shimmie2 into hotfix/downtime_theme_edits
2014-04-18 20:25:36 -04:00
jgen
71d7474476
Add <section> tags to the downtime page so that theme render correctly.
2014-04-18 20:21:50 -04:00
Justin Brewer
f243092634
count("") == 1
2014-04-11 23:55:30 -04:00
Jeff Genovy
3a0da5df5a
Merge pull request #399 from Diftraku/ouroboros_api
...
Special chars in tags barf filter_var
2014-04-09 22:33:05 -04:00
Diftraku
7ac61f4234
Special chars in tags barf filter_var
...
Due to how FILTER_SANITIZE_STRING works, if you had special chars in
your tags (eg. <3 or !) the string would be cut before the offending
character(s) and in worst case, result in no tags passing to the API
2014-04-10 04:11:43 +03:00
jgen
3c6b8b6fe6
Merge branch 'linting' of git://github.com/shish/shimmie2 into develop
...
Conflicts:
ext/resize/main.php
2014-04-09 15:04:18 -04:00
Shish
f72bfbb050
fix indentation
2014-04-06 20:47:01 +01:00
Daku
f88ba20319
Merge pull request #393 from shish/resize_tweak
...
pass already fetched image object into resize()
2014-04-04 17:38:08 +01:00
Daku
2d25d43ecf
Merge pull request #389 from HungryFeline/patch-1
...
Redirect to default page if referer isn't set
2014-04-04 17:30:19 +01:00
Shish
a0d1948a4f
pass already fetched image object into resize(), rather than passing the ID to be re-fetched
2014-04-02 08:49:13 +01:00
jgen
1e49cc9122
More comments and fix undefined variables.
2014-04-01 22:02:36 -04:00
jgen
9b1c3db400
Slight re-word of the exception error message.
2014-04-01 21:43:12 -04:00
jgen
18b8e7912f
Fix warning generated when an image doesn't have bits or channel info (and use sane defaults).
2014-04-01 21:42:40 -04:00
jgen
225d197790
Remove duplicate code.
2014-04-01 21:41:57 -04:00
jgen
749f846b79
Fix typo.
2014-04-01 20:33:36 -04:00
jgen
a442fbe409
Resizing images actually was broken, how nobody noticed I don't know.
2014-04-01 19:29:31 -04:00
Shish
c8aa3327a1
A bunch of small changes from scrutinizer-ci; some tidying, some actual bug fixes
2014-03-30 13:26:48 +01:00
Shish
db5aa56300
remove a bunch of dead code
2014-03-29 11:44:34 +00:00
HungryFeline
c215d6991a
Redirect to default page if referer isn't set
...
Instead of displaying `You should be redirected to <a href=""></a>`
2014-03-27 09:57:43 +01:00
Shish
7a95325a5f
Merge pull request #388 from DakuTree/patch
...
Fixes issues 233 & 234.
2014-03-26 10:41:31 +00:00
Daku
7837362711
make sure source is still used if provided
2014-03-26 08:26:21 +00:00
Daku
994652c3f7
make sure mass_tag_edit reads high > low id if default order is different
2014-03-26 08:05:05 +00:00
