badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3541 commits 1 branch 0 tags 17 MiB
Commit graph

1607 commits

Author SHA1 Message Date
Daku
24f2741a50 rating_to_name no longer exists 
was removed in commit eadf1d9e87
 2014-06-01 21:56:33 +01:00
Daku
90232b0a4c rename "index" to "pool index" to help differentiate between the two index links 2014-05-31 18:20:57 +01:00
Daku
183a2c7ae6 docs + added pool:lastcreated metatag which uses the ID of the last pool created by the user 2014-05-30 16:04:12 +01:00
Daku
df6b9245ec optional setting to set pool order with the pool metatag 
example: pool:10:3 (pool #10 with order 3)
 2014-05-30 15:21:42 +01:00
Daku
77769d2c17 allow setting of image_order via add_post() 2014-05-30 15:21:32 +01:00
Daku
bca4fdffa5 make sure pool nav & manage pool show when needed 2014-05-30 14:41:03 +01:00
Daku
6a14360e7a option to use autoincrementing pool order when post is added 
rather than having everything default to 0 order
 2014-05-30 13:12:34 +01:00
Daku
1dc668ca41 main.php shouldn't be generating HTML.. 2014-05-30 11:55:53 +01:00
Daku
f228a8eb4f pools css should be in it's own folder, not the themes 2014-05-30 00:23:12 +01:00
Daku
1dada97adc prev link for pools 2014-05-30 00:22:04 +01:00
Daku
77607e0c02 keep aspect ratio when created video thumbnail 2014-05-29 18:40:17 +01:00
Shish
a3f9e12ea0 octal for permissions 2014-05-24 10:18:44 +01:00
Shish
1b655704f3 Merge remote branch 'yaoifox/patch-1' into develop 2014-05-24 10:18:10 +01:00
Shish
d5c5cfd428 Merge pull request #426 from DakuTree/patch-notesfix 
Fix for #422 + Fix Note Positioning
 2014-05-24 10:12:58 +01:00
Shish
eb51a9b639 migrate to bcrypt for password storage 2014-05-24 09:47:42 +01:00
Daku
36713803e3 Merge pull request #418 from jgen/develop 
Even more linting and cleaning!
 2014-05-23 23:24:32 +01:00
Daku
ae0a4725a0 avoid loading imgnotes until image is fully loaded 2014-05-23 21:46:13 +01:00
Daku
3d11df44a9 fix various bugs with notes ext 2014-05-23 20:48:11 +01:00
Daku
64e2565236 check for lowercase header if camelcase header doesn't exist 
fixes #423
 2014-05-19 07:32:16 +01:00
YaoiFox
349d7bfa4d curl --silent now 
curl --silent now
 2014-05-07 07:10:23 +02:00
YaoiFox
f5f48d8a0b Update main.php 2014-05-07 05:38:12 +02:00
YaoiFox
5f0642f349 some bug fixes to cron uploader 2014-05-07 05:30:44 +02:00
jgen
a58bdbdc62 More PHP Doc comments. 2014-04-29 17:45:13 -04:00
jgen
317028a63b More PHP Doc comments. 2014-04-29 01:33:03 -04:00
jgen
b3f9925839 PHPDoc all the things! 2014-04-28 18:22:57 -04:00
jgen
2a9f76d2f0 More comments, removing dead code, fixing small bugs. 2014-04-28 17:36:52 -04:00
jgen
eadf1d9e87 Remove dead code. 2014-04-28 17:18:51 -04:00
jgen
9f838c0c11 Clean all the things. 2014-04-28 03:32:43 -04:00
jgen
b56e390676 Lots of linting again. 2014-04-28 03:26:35 -04:00
jgen
158819cb28 Linting: These actually were bugs. 2014-04-28 03:16:09 -04:00
jgen
d4ac6ca451 Such linting, such wow. Much clean. 2014-04-28 02:56:58 -04:00
jgen
8fd532e5a8 More linting and removing dead code. 2014-04-28 02:43:49 -04:00
jgen
3cd8c33ed1 Convert Spaces -> Tabs 2014-04-28 02:24:19 -04:00
jgen
e37c5cb9d0 More linting! 2014-04-28 02:23:45 -04:00
jgen
022c162f40 More linting and fixing of comments and PHP Doc, types, etc. 2014-04-28 01:26:22 -04:00
jgen
a0a39784d4 Make webm videos auto-loop by default. 2014-04-28 00:57:49 -04:00
jgen
76fd27f87c Fixing/Cleaning more PHP Doc related issues. 2014-04-28 00:56:19 -04:00
jgen
8a2eb4b121 Fixing more PHP Doc related issues. 2014-04-27 19:29:36 -04:00
jgen
4f51e942be Updating/Fixing/Adding more comments with the PHP Doc style. 2014-04-27 15:33:57 -04:00
jgen
b1d123c960 Add more escaping to the shell command for ffmpeg. 2014-04-26 17:09:18 -04:00
jgen
2e4b53c3f4 Merge branch 'code_removal' of github.com:jgen/shimmie2 into develop 2014-04-26 16:55:11 -04:00
jgen
1ecf33e39d Merge branch 'video_thumb' of git://github.com/shish/shimmie2 into develop 2014-04-26 16:54:28 -04:00
jgen
86b6d12819 Merge branch 'linting' of github.com:jgen/shimmie2 into code_removal 2014-04-26 16:50:14 -04:00
jgen
95ba85ee43 This js file relies on functions defined in 'shimmie.js' which is all globed together when rendering a page. Adding an ignore line to scrutinizer to prevent false-positives. 2014-04-26 05:32:15 -04:00
jgen
a8dd045586 Combine these if statements into one to reduce the cyclomatic complexity. 2014-04-26 03:56:06 -04:00
jgen
42407116a8 Removing this file. 2014-04-26 03:33:20 -04:00
jgen
013222e4ee Code Removal: PHP has had JSON support directly baked into the language since 5.2.0 - there is no need to rely on an external library from 2006 for json support. 2014-04-26 03:31:02 -04:00
jgen
298344048c Make these functions public to prevent scrutinizer from complaining. 2014-04-26 00:27:16 -04:00
jgen
1ca3865a1c Removing the closing PHP "?>" tag as per style guidelines. (Also see: https://stackoverflow.com/questions/4410704/why-would-one-omit-the-close-tag ) 2014-04-25 22:54:51 -04:00
jgen
3e899710d7 Stop scrutinizer from complaining here. 2014-04-25 17:40:42 -04:00
jgen
c85630198f These variables where never defined depending on the execution path. 2014-04-25 17:40:14 -04:00
jgen
6f685ca227 Use the method from core/util to parse the bool from the DB instead. 2014-04-25 17:39:46 -04:00
jgen
3a1197256a Need to pull in the global $page variable for this method. 2014-04-25 17:39:06 -04:00
jgen
1e15c5e47a Explicitly declare this class variable 2014-04-25 17:38:25 -04:00
jgen
bcd3f991de Removing the closing PHP "?>" tag as per style guidelines. 2014-04-25 17:34:20 -04:00
jgen
b4e6c0b743 Explicitly check if we can actually find the image by Id. 2014-04-25 16:08:00 -04:00
jgen
478eb3a4cc Linting: Check for null return value, and throw an exception if null. 2014-04-25 15:39:00 -04:00
jgen
7ef68b15f9 Fix indentation. 2014-04-25 15:38:15 -04:00
jgen
b241390fa4 Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 22:34:45 -04:00
jgen
50686ac61e More linting, fix PHPDoc style. 2014-04-24 22:29:29 -04:00
jgen
daee99c1bc Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 22:28:53 -04:00
jgen
860af25550 Need to pull in the global $user variable. 2014-04-24 22:22:45 -04:00
jgen
4ec5a7ce52 Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 22:22:16 -04:00
jgen
780d5f8709 More linting. Explicitly declare these class variables, as well as comment out dead code. 2014-04-24 22:13:00 -04:00
jgen
6e4ae229ef Explicitly declare this class variable 2014-04-24 19:13:41 -04:00
jgen
4cc31df737 Update the comments to PHPDoc style guidelines. 2014-04-24 19:02:43 -04:00
jgen
ab3f9850e4 Removing the closing PHP "?>" tag as per style guidelines. 2014-04-24 19:01:47 -04:00
jgen
709366b70c Explicitly declare these class variables. 2014-04-24 18:44:46 -04:00
jgen
7b90331f02 Add missing semi-colon. 2014-04-24 16:56:04 -04:00
jgen
e2f5c7a6ec Check for null, just in case. 2014-04-24 05:09:38 -04:00
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