james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 5efe1ddb36 Merge pull request #444 from shish/check_handler_exists Daku 2014-08-26 13:47:32 +01:00
  • fc4bd27529 simplify user_can_edit_user -- many nested if/else's to one if Shish 2014-08-24 20:43:12 +01:00
  • 9c71f59061 [anchor] bbcode tag, to make linking to parts of a page easier Shish 2014-08-24 16:55:00 +01:00
  • 50d40c1c81 give IndexTheme:display_page some sub-functions to make them easier to customise Shish 2014-08-24 16:29:32 +01:00
  • f873d2304d Check event handler exists before calling it, in case the cache is out of date. Fixes #442 Shish 2014-08-24 11:33:05 +01:00
  • d6eb3892e2 Merge pull request #435 from geosohh/master Shish 2014-08-02 17:48:21 +01:00
  • b1d634a8de Merge pull request #434 from DakuTree/patch-tagfix Shish 2014-08-02 17:47:14 +01:00
  • 3185af3280 Remove tags from images using mass_tagger Geosohh 2014-07-29 19:11:29 -03:00
  • 3d2c55a9d5 Fixed mass_tagger bug when selecting images with similar ids Geosohh 2014-07-29 18:02:50 -03:00
  • 14f682da75 avoid errors if tag exceeds limit + flash message showing the problem tag Daku 2014-06-20 00:39:29 +01:00
  • b89dd52b47 bumped the tag char limit to 255 there wasn't really much reason to have this so low, and this puts it to the same limit as other booru software Daku 2014-06-19 23:14:11 +01:00
  • 9069b0c1fb Merge pull request #429 from DakuTree/patch-misc Shish 2014-06-09 21:05:19 +01:00
  • d067545969 Merge pull request #432 from DakuTree/patch-sqlfix Shish 2014-06-09 20:59:11 +01:00
  • d9d4137735 Merge pull request #2 from DakuTree/patch-sqlfix Matthew Barbour 2014-06-09 12:55:15 -05:00
  • 92f3ba480a Merge pull request #1 from shish/develop Matthew Barbour 2014-06-09 12:52:50 -05:00
  • 196e4d5300 Merge pull request #433 from muhkuh2005/master Shish 2014-06-09 16:32:34 +01:00
  • 3468480864 Added check to initialize tags, when only categorized tags are available for image Pascal 'muhkuh2005' Borkenhagen 2014-06-09 14:07:24 +00:00
  • 5bd7369d7c Merge pull request #427 from shish/bcrypt Daku 2014-06-05 18:00:19 +01:00
  • 72fbafc271 fixes negative tags not working if they don't exist fixes #431 Daku 2014-06-04 00:52:01 +01:00
  • 24f2741a50 rating_to_name no longer exists was removed in commit eadf1d9e87419a3f570cc9e7e77082358a9af0db Daku 2014-06-01 21:56:33 +01:00
  • 90232b0a4c rename "index" to "pool index" to help differentiate between the two index links Daku 2014-05-31 18:20:57 +01:00
  • 183a2c7ae6 docs + added pool:lastcreated metatag which uses the ID of the last pool created by the user Daku 2014-05-30 16:04:12 +01:00
  • df6b9245ec optional setting to set pool order with the pool metatag example: pool:10:3 (pool #10 with order 3) Daku 2014-05-08 20:32:02 +01:00
  • 77769d2c17 allow setting of image_order via add_post() Daku 2014-05-30 15:21:32 +01:00
  • bca4fdffa5 make sure pool nav & manage pool show when needed Daku 2014-05-30 14:41:03 +01:00
  • 6a14360e7a option to use autoincrementing pool order when post is added rather than having everything default to 0 order Daku 2014-05-30 13:12:34 +01:00
  • 1dc668ca41 main.php shouldn't be generating HTML.. Daku 2014-05-30 11:55:53 +01:00
  • f228a8eb4f pools css should be in it's own folder, not the themes Daku 2014-05-30 00:23:12 +01:00
  • 1dada97adc prev link for pools Daku 2014-05-30 00:22:04 +01:00
  • 77607e0c02 keep aspect ratio when created video thumbnail Daku 2014-05-23 23:28:56 +01:00
  • aa0cf27e7e add theme name to cached css/js filename to avoid loading cached files of old theme after theme change Daku 2014-04-05 11:10:24 +01:00
  • e259b8cd5a bcrypt had bugs before 5.3.7 Shish 2014-05-24 10:51:09 +01:00
  • a3f9e12ea0 octal for permissions Shish 2014-05-24 10:18:44 +01:00
  • 1b655704f3 Merge remote branch 'yaoifox/patch-1' into develop Shish 2014-05-24 10:18:10 +01:00
  • d5c5cfd428 Merge pull request #426 from DakuTree/patch-notesfix Shish 2014-05-24 10:12:58 +01:00
  • eb51a9b639 migrate to bcrypt for password storage Shish 2014-05-24 00:28:57 +01:00
  • 36713803e3 Merge pull request #418 from jgen/develop Daku 2014-05-23 23:24:32 +01:00
  • ae0a4725a0 avoid loading imgnotes until image is fully loaded Daku 2014-05-23 21:46:13 +01:00
  • 3d11df44a9 fix various bugs with notes ext Daku 2014-04-12 00:26:34 +01:00
  • 8d75968ab0 Merge pull request #425 from DakuTree/patch-headerfix Shish 2014-05-20 07:48:12 +01:00
  • 64e2565236 check for lowercase header if camelcase header doesn't exist fixes #423 Daku 2014-05-19 07:32:16 +01:00
  • 349d7bfa4d curl --silent now YaoiFox 2014-05-07 07:10:23 +02:00
  • f5f48d8a0b Update main.php YaoiFox 2014-05-07 05:38:12 +02:00
  • 5f0642f349 some bug fixes to cron uploader YaoiFox 2014-05-07 05:30:44 +02:00
  • a58bdbdc62 More PHP Doc comments. jgen 2014-04-29 17:45:13 -04:00
  • 2bf4c667a7 Some more comments. jgen 2014-04-29 01:51:13 -04:00
  • 317028a63b More PHP Doc comments. jgen 2014-04-29 01:33:03 -04:00
  • 3b1513f791 Adding some more PHP Doc comments. jgen 2014-04-28 20:37:31 -04:00
  • c682ccef69 Adding more PHP Doc comments to the config classes. jgen 2014-04-28 20:12:31 -04:00
  • eb18790dc9 More comments. jgen 2014-04-28 19:50:01 -04:00
  • b3f9925839 PHPDoc all the things! jgen 2014-04-28 18:22:57 -04:00
  • 2a9f76d2f0 More comments, removing dead code, fixing small bugs. jgen 2014-04-28 17:36:52 -04:00
  • 86612bb1ff Adding more PHP Doc comments. jgen 2014-04-28 17:36:11 -04:00
  • eadf1d9e87 Remove dead code. jgen 2014-04-28 17:18:51 -04:00
  • 9f838c0c11 Clean all the things. jgen 2014-04-28 03:32:43 -04:00
  • b56e390676 Lots of linting again. jgen 2014-04-28 03:26:35 -04:00
  • 158819cb28 Linting: These actually were bugs. jgen 2014-04-28 03:16:09 -04:00
  • d4ac6ca451 Such linting, such wow. Much clean. jgen 2014-04-28 02:56:58 -04:00
  • 8fd532e5a8 More linting and removing dead code. jgen 2014-04-28 02:43:49 -04:00
  • 3cd8c33ed1 Convert Spaces -> Tabs jgen 2014-04-28 02:24:19 -04:00
  • e37c5cb9d0 More linting! jgen 2014-04-28 02:23:45 -04:00
  • 022c162f40 More linting and fixing of comments and PHP Doc, types, etc. jgen 2014-04-28 01:26:22 -04:00
  • a0a39784d4 Make webm videos auto-loop by default. jgen 2014-04-28 00:57:49 -04:00
  • 76fd27f87c Fixing/Cleaning more PHP Doc related issues. jgen 2014-04-28 00:56:19 -04:00
  • 8a2eb4b121 Fixing more PHP Doc related issues. jgen 2014-04-27 19:29:36 -04:00
  • 03b3cdcbd2 Updating/Fixing/Adding more comments with the PHP Doc style. jgen 2014-04-27 18:59:01 -04:00
  • 07cd38d34c Merge pull request #415 from jgen/master v2.5.1 Jeff Genovy 2014-04-27 15:46:35 -04:00
  • a703bb9854 Bump the version number. jgen 2014-04-27 15:45:22 -04:00
  • 4f51e942be Updating/Fixing/Adding more comments with the PHP Doc style. jgen 2014-04-27 15:33:57 -04:00
  • 024e7eac8d Fix underling. jgen 2014-04-26 17:52:31 -04:00
  • b707081b33 Cleaning up the README. jgen 2014-04-26 17:47:14 -04:00
  • c37ba07de0 Convert the README.txt file into Markdown format. jgen 2014-04-26 17:43:13 -04:00
  • b1d123c960 Add more escaping to the shell command for ffmpeg. jgen 2014-04-26 17:09:18 -04:00
  • 26e8db1fdc Add the Travis-CI build status icon image to the Readme. ;) jgen 2014-04-26 17:01:01 -04:00
  • 2e4b53c3f4 Merge branch 'code_removal' of github.com:jgen/shimmie2 into develop jgen 2014-04-26 16:55:11 -04:00
  • 1ecf33e39d Merge branch 'video_thumb' of git://github.com/shish/shimmie2 into develop jgen 2014-04-26 16:54:28 -04:00
  • 86b6d12819 Merge branch 'linting' of github.com:jgen/shimmie2 into code_removal jgen 2014-04-26 16:50:14 -04:00
  • e9d8ae7f5b Merge pull request #413 from jgen/linting v2.5.0 Shish 2014-04-26 12:00:35 +01:00
  • 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. jgen 2014-04-26 05:32:15 -04:00
  • 4e9e5ca2be Fixing/adding/cleaning up the PHP Doc comments. jgen 2014-04-26 05:01:49 -04:00
  • a8dd045586 Combine these if statements into one to reduce the cyclomatic complexity. jgen 2014-04-26 03:56:06 -04:00
  • 42407116a8 Removing this file. jgen 2014-04-26 03:33:20 -04:00
  • 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. jgen 2014-04-26 03:31:02 -04:00
  • efb5038b20 This file no longer exists. jgen 2014-04-26 03:15:44 -04:00
  • 298344048c Make these functions public to prevent scrutinizer from complaining. jgen 2014-04-26 00:27:16 -04:00
  • e6b1d514d1 Some more type hinting via the comments. jgen 2014-04-25 23:22:34 -04:00
  • 24371d8c34 Fix the PHP Doc comments. jgen 2014-04-25 23:19:18 -04:00
  • 1ca3865a1c Removing the closing PHP "?>" tag as per style guidelines. (Also see: https://stackoverflow.com/questions/4410704/why-would-one-omit-the-close-tag ) jgen 2014-04-25 22:54:51 -04:00
  • 8f60467848 This code doesn't seem to actually be used by anything at all. jgen 2014-04-25 22:33:57 -04:00
  • 5f2be45f68 Fix the PHPDoc comments on these. jgen 2014-04-25 21:42:52 -04:00
  • 3e899710d7 Stop scrutinizer from complaining here. jgen 2014-04-25 17:40:42 -04:00
  • c85630198f These variables where never defined depending on the execution path. jgen 2014-04-25 17:40:14 -04:00
  • 6f685ca227 Use the method from core/util to parse the bool from the DB instead. jgen 2014-04-25 17:39:46 -04:00
  • 3a1197256a Need to pull in the global $page variable for this method. jgen 2014-04-25 17:39:06 -04:00
  • 1e15c5e47a Explicitly declare this class variable jgen 2014-04-25 17:38:25 -04:00
  • bcd3f991de Removing the closing PHP "?>" tag as per style guidelines. jgen 2014-04-25 17:34:20 -04:00
  • b4e6c0b743 Explicitly check if we can actually find the image by Id. jgen 2014-04-25 16:08:00 -04:00
  • 5b5fd955b7 New exception type. jgen 2014-04-25 16:07:30 -04:00
  • 9acf6c7f19 Rename these class functions to prevent warnings from scrutinizer. jgen 2014-04-25 15:57:23 -04:00
  • 141ec53236 Rename these class functions to prevent warnings from scrutinizer. jgen 2014-04-25 15:55:31 -04:00