506e699f8a
Not sure if we really need the triple equals.
2014-04-24 01:15:30 -04:00
866d39a68e
The 'tags' box actually has a different ID.
2014-04-24 01:15:03 -04:00
51c145d5c9
Some more linting on the bookmarklet.js file.
2014-04-24 01:08:47 -04:00
4b90faf89d
Even more linting of JS files.
2014-04-24 00:55:14 -04:00
a105090039
Some more JS linting.
2014-04-23 23:39:09 -04:00
887f963e17
Add the jshint comment to alter how scrutinzer-ci deals with the js.
2014-04-23 23:38:53 -04:00
31501e48fe
More JS linting.
2014-04-23 23:31:20 -04:00
2dc6e054c8
These sorts are necessary on the header arrays, otherwise the relative priority of certain headers is not respected.
2014-04-23 23:28:05 -04:00
b775c007cd
Give these HTML headers some slight priority over the default value of 50.
2014-04-23 23:07:10 -04:00
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
8cdf919827
More linting. This time of the JavaScript for the chat-box extension.
2014-04-23 22:43:42 -04:00
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
5eaa637bbb
Merge branch 'develop' of git://github.com/shish/shimmie2 into develop
2014-04-23 22:23:53 -04:00
44d0e56c97
Merge pull request #406 from jgen/video_thumb
...
Video thumbnails
2014-04-20 11:25:24 +01:00
ef3daaf388
Merge pull request #411 from jgen/develop
...
Chatbox is broken on develop branch
2014-04-20 11:21:43 +01:00
21e1359b86
Avoid short open tag for PHP.
2014-04-20 05:07:26 -04:00
60980c8839
One more jQuery reference.
2014-04-20 05:04:45 -04:00
a7ba0f887b
Again, the chatbox needs help from the jQuery migrate plugin.
2014-04-20 05:00:59 -04:00
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
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
880840623a
Need to ensure that this html header is added last.
2014-04-20 04:36:25 -04:00
717401ccab
Removing this as jQuery is already included in Shimmie now.
2014-04-20 04:35:33 -04:00
8b698e1b6f
Revert this commit.
2014-04-20 04:29:11 -04:00
54362a49c6
Fix the broken chatbox issue.
2014-04-20 04:25:08 -04:00
57a390eaab
Massive linting!
2014-04-19 23:38:42 -04:00
ff722906b7
Holy shit, this is really really nasty old JS code. I would love to dump this if possible.
2014-04-19 23:06:48 -04:00
dc6653d3be
Merge pull request #407 from jgen/hotfix/downtime_theme_edits
...
Hotfix/downtime theme edits
2014-04-20 00:30:57 +01:00
75c3d8e453
Merge pull request #409 from jgen/linting
...
Linting
2014-04-20 00:29:53 +01:00
e838fc2a03
Comment this in case someone else wonders why its there.
2014-04-19 04:17:58 -04:00
c527ae91d6
More linting and cleanup.
2014-04-19 04:17:28 -04:00
be385deaab
Clean up this js file as well.
2014-04-19 02:58:36 -04:00
28d83fda0d
Even more linting and cleaning.
2014-04-19 02:33:34 -04:00
2da8c19a07
More linting!
2014-04-19 01:36:18 -04:00
bdf49b33cb
Some more linting thanks to scrutinizer-ci
2014-04-19 01:18:49 -04:00
505a3e5233
Merge branch 'develop' of git://github.com/shish/shimmie2 into hotfix/downtime_theme_edits
2014-04-18 20:25:36 -04:00
71d7474476
Add <section> tags to the downtime page so that theme render correctly.
2014-04-18 20:21:50 -04:00
7fd655fc4e
Added conditional message for IE users to download plugin from Google for webm.
2014-04-18 18:47:14 -04:00
b5d005710c
Fix indentation (spaces -> tabs)
2014-04-18 02:10:10 -04:00
2f380f5d59
Video thumbs are working for webm files now.
2014-04-18 02:06:12 -04:00
273d386d22
Working on thumbnail support for video files.
2014-04-18 01:37:27 -04:00
b360914db7
Merge pull request #402 from justinbrewer/cloud-patch
...
Tag Edit Cloud patch
2014-04-12 11:08:00 +01:00
98b6d0a6ff
Merge pull request #403 from jgen/gitignore
...
Update the gitignore file to exclude operating system detritus and such.
2014-04-12 10:50:27 +01:00
4deb7e1775
Update the gitignore file to exclude operating system detritus and such.
2014-04-12 03:25:18 -04:00
f243092634
count("") == 1
2014-04-11 23:55:30 -04:00
6c9a4a3b86
A start on video thumbnailing; see #400
...
Almost certainly not working yet; not tested, just committing so that
other people have something to work with and we aren't duplicating
effort
2014-04-10 08:15:00 +01:00
3a0da5df5a
Merge pull request #399 from Diftraku/ouroboros_api
...
Special chars in tags barf filter_var
2014-04-09 22:33:05 -04:00
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
d247713311
Merge pull request #397 from jgen/develop
...
Manual Merge of More Linting #391
2014-04-10 00:15:02 +01:00
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
f72bfbb050
fix indentation
2014-04-06 20:47:01 +01:00
