jgen
f9c8a1720e
Comment out dead variables.
2014-04-24 04:41:13 -04:00
jgen
f67220f64b
From stack-overflow: The 'var' keyword is for declaring class variables in PHP4. It works in PHP5 but can raise an E_STRICT warning in from version 5.0.0 up to version 5.1.2, as it has been deprecated.
...
Changing to public as that is really what these variables are anyways.
2014-04-24 04:36:05 -04:00
jgen
67c087c30f
From stack-overflow: The 'var' keyword is for declaring class variables in PHP4. It works in PHP5 but can raise an E_STRICT warning in from version 5.0.0 up to version 5.1.2, as it has been deprecated.
...
Changing to public as that is really what these variables are anyways.
2014-04-24 04:30:58 -04:00
jgen
dbe30ad37d
Rename variable to make it more clear.
2014-04-24 01:36:30 -04:00
jgen
afc01fda5f
Prevent scrutinizer-ci from complaining about these fall-thoughs.
2014-04-24 01:36:04 -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
31501e48fe
More JS linting.
2014-04-23 23:31:20 -04:00
jgen
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
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
5eaa637bbb
Merge branch 'develop' of git://github.com/shish/shimmie2 into develop
2014-04-23 22:23:53 -04:00
Shish
44d0e56c97
Merge pull request #406 from jgen/video_thumb
...
Video thumbnails
2014-04-20 11:25:24 +01:00
Shish
ef3daaf388
Merge pull request #411 from jgen/develop
...
Chatbox is broken on develop branch
2014-04-20 11:21:43 +01: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
jgen
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
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
e838fc2a03
Comment this in case someone else wonders why its there.
2014-04-19 04:17:58 -04: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
jgen
7fd655fc4e
Added conditional message for IE users to download plugin from Google for webm.
2014-04-18 18:47:14 -04:00
jgen
b5d005710c
Fix indentation (spaces -> tabs)
2014-04-18 02:10:10 -04:00
jgen
2f380f5d59
Video thumbs are working for webm files now.
2014-04-18 02:06:12 -04:00
jgen
273d386d22
Working on thumbnail support for video files.
2014-04-18 01:37:27 -04:00
Shish
b360914db7
Merge pull request #402 from justinbrewer/cloud-patch
...
Tag Edit Cloud patch
2014-04-12 11:08:00 +01:00
Shish
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
jgen
4deb7e1775
Update the gitignore file to exclude operating system detritus and such.
2014-04-12 03:25:18 -04:00
Justin Brewer
f243092634
count("") == 1
2014-04-11 23:55:30 -04:00
Shish
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
