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 |
|
Shish
|
8d75968ab0
|
Merge pull request #425 from DakuTree/patch-headerfix
Fix for #423 - Check for lowercase header if camelcase header doesn't exist
|
2014-05-20 07:48:12 +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
|
2bf4c667a7
|
Some more comments.
|
2014-04-29 01:51:13 -04:00 |
|
jgen
|
317028a63b
|
More PHP Doc comments.
|
2014-04-29 01:33:03 -04:00 |
|
jgen
|
3b1513f791
|
Adding some more PHP Doc comments.
|
2014-04-28 20:37:31 -04:00 |
|
jgen
|
c682ccef69
|
Adding more PHP Doc comments to the config classes.
|
2014-04-28 20:12:31 -04:00 |
|
jgen
|
eb18790dc9
|
More comments.
|
2014-04-28 19:50:01 -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
|
86612bb1ff
|
Adding more PHP Doc comments.
|
2014-04-28 17:36:11 -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
|
03b3cdcbd2
|
Updating/Fixing/Adding more comments with the PHP Doc style.
|
2014-04-27 18:59:01 -04:00 |
|
Jeff Genovy
|
07cd38d34c
|
Merge pull request #415 from jgen/master
Bump the version number.
v2.5.1
|
2014-04-27 15:46:35 -04:00 |
|
jgen
|
a703bb9854
|
Bump the version number.
|
2014-04-27 15:45:22 -04:00 |
|
jgen
|
4f51e942be
|
Updating/Fixing/Adding more comments with the PHP Doc style.
|
2014-04-27 15:33:57 -04:00 |
|
jgen
|
024e7eac8d
|
Fix underling.
|
2014-04-26 17:52:31 -04:00 |
|
jgen
|
b707081b33
|
Cleaning up the README.
|
2014-04-26 17:47:14 -04:00 |
|
jgen
|
c37ba07de0
|
Convert the README.txt file into Markdown format.
|
2014-04-26 17:43:13 -04:00 |
|
jgen
|
b1d123c960
|
Add more escaping to the shell command for ffmpeg.
|
2014-04-26 17:09:18 -04:00 |
|
jgen
|
26e8db1fdc
|
Add the Travis-CI build status icon image to the Readme. ;)
|
2014-04-26 17:01:01 -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 |
|
Shish
|
e9d8ae7f5b
|
Merge pull request #413 from jgen/linting
Lots o' Linting
v2.5.0
|
2014-04-26 12:00:35 +01: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
|
4e9e5ca2be
|
Fixing/adding/cleaning up the PHP Doc comments.
|
2014-04-26 05:01:49 -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 |
|