james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,886 Commits 3 Branches 36 Tags
Commit Graph

1886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shish Moom
189b8192e0 Merge pull request #37 from Madoushi90/master 
Fix for Issue #35
 2011-09-17 01:29:14 -07:00
Justin Brewer
32a7ce2739 PDO Fix 2011-09-16 17:17:37 -05:00
Justin Brewer
cadb3f08ca If an image has no history, make one with the old tags so the new tags can be reverted. 2011-09-16 17:12:27 -05:00
Shish Moom
d37a2bfdd4 Merge pull request #34 from green-ponies/master 
CSS & JS caching and Fix for Issue 22
 2011-09-13 03:00:30 -07:00
green-ponies (jgen)
2e276a095e Fix for Issue 22 from HungryFeline. 2011-09-11 21:41:46 -04:00
green-ponies (jgen)
864e823447 Small change to headers for efficiency. 
These two headers are always sent and do not need
to be added to the header queue. (wastes time)
 2011-09-11 21:26:23 -04:00
green-ponies (jgen)
6e7789c40b Added feature to try and cache the CSS and Javascript files by default. 
This reduces the total number of HTTP requests (and hopefully
allows the site to load faster).
 2011-09-11 21:24:18 -04:00
Shish Moom
d61b7b7712 Merge pull request #33 from green-ponies/master 
Incoming Code!
 2011-09-09 13:56:37 -07:00
green-ponies (jgen)
808e477f34 Admins can configure the browser Image Expiration now. 
Also renamed the config option for jQuery image delete.
 2011-09-05 14:47:30 -04:00
green-ponies (jgen)
1c8ba8dc26 Wrong brackets. 2011-09-04 14:24:14 -04:00
green-ponies (jgen)
c2ef8736b8 Fixed a typo. 2011-09-04 14:19:06 -04:00
green-ponies (jgen)
c30c898c4e Changing files to use the $page->add_http_header() method instead. 2011-09-04 14:06:50 -04:00
green-ponies (jgen)
bd31bcd79a The page class now supports both HTML headers and HTTP headers. 
From the comment:
FIXME: should be $page->blah
 2011-09-04 14:06:44 -04:00
green-ponies (jgen)
19a3a5a6f9 Working on changed $page to support http headers as well as html headers. 2011-09-04 14:06:39 -04:00
green-ponies (jgen)
fca286913e Working on moving header() inside of the global $page data structure. 2011-09-04 14:06:34 -04:00
green-ponies (jgen)
bf035c247d Slight changes to how the Replace & Resize forms are displayed. 2011-09-04 13:46:12 -04:00
green-ponies (jgen)
8422e0050a Another small change to reduce PHP notices. 2011-09-04 11:52:34 -04:00
green-ponies (jgen)
be6e6e2933 Small change to reduce PHP notice. 2011-09-04 11:41:25 -04:00
green-ponies (jgen)
d05344d5e3 Image resize is working now! (uses the GD library only for now) 
Moved resize into contrib folder.
 2011-09-04 11:17:14 -04:00
green-ponies (jgen)
ad850ad0d6 Fixed a small typo. 2011-09-04 10:30:20 -04:00
green-ponies (jgen)
14bfa8b323 Working on Image Resize feature. 2011-09-03 23:13:41 -04:00
green-ponies (jgen)
100dd6438e Added more comments and changed others for better doxygen support. 2011-09-03 19:34:46 -04:00
green-ponies (jgen)
9c8da62ba0 This function needs the global $config. 2011-09-03 17:01:27 -04:00
green-ponies (jgen)
e6e9aced1c This function doesn't need the global $user now. 2011-09-03 16:48:33 -04:00
green-ponies (jgen)
3cfe182ad3 Typo, Renamed. 2011-09-03 16:45:56 -04:00
green-ponies (jgen)
7ee0407ba8 Oops, forgot to rename. 2011-09-03 16:42:12 -04:00
green-ponies (jgen)
8e68d650a1 Cleaned up how the Image Replace html is made. 2011-09-03 16:03:21 -04:00
green-ponies (jgen)
cc1545188c Merge branch 'master', remote-tracking branch 'origin/master' 2011-08-31 20:37:25 -04:00
Shish
309a2f497f only admins should replace images (possibly people should be allowed to replace their own too? I'm erring on the side of caution for now though) 2011-09-01 00:36:38 +01:00
Shish Moom
f5d08f1585 Merge pull request #32 from green-ponies/master 
Image Replace
 2011-08-31 16:34:29 -07:00
green-ponies (jgen)
c44ed439f8 Extra checking for the user being an admin before allowing image replacement. 
Also removed some duplicated code for efficiency.
 2011-08-30 13:57:14 -04:00
green-ponies (jgen)
17999cade8 Image Replace feature working, just needs more testing. 2011-08-25 21:35:59 -04:00
green-ponies (jgen)
b02c747ac1 Working on image replace. 
Getting unknown 404 errors.
 2011-08-24 23:55:44 -04:00
green-ponies (jgen)
0d863c898e These files are needed for the jQuery UI library. 
Modified the git ignore file accordingly.
 2011-08-24 21:57:32 -04:00
green-ponies (jgen)
62cc7e0e5e Working on Replace Image feature. 
Added link to page, fixed foreach loop.
 2011-08-24 21:23:18 -04:00
green-ponies (jgen)
f3b6fde7a5 Working on adding a "Replace Image" feature. 2011-08-24 20:53:53 -04:00
Shish
684193848a fix typo 2011-08-24 10:40:32 +01:00
Shish
2049754ef2 Merge branch 'master' of github.com:shish/shimmie2 2011-08-24 09:05:10 +01:00
Shish
db142a2be8 PDO pools 2011-08-24 09:01:43 +01:00
Shish Moom
e700673b66 Merge pull request #29 from green-ponies/master 
Patch for File Uploads
 2011-08-17 01:34:09 -07:00
green-ponies (jgen)
eb5ff191c6 Confirm image delete with jQuery UI modal dialog. 
Added config option for jQuery delete as well.
 2011-08-16 23:14:30 -04:00
green-ponies (jgen)
80ff538b73 Updated the jquery library and added ui library. 2011-08-16 21:14:01 -04:00
green-ponies (jgen)
73c887e30f The default theme actually does use this file. 2011-08-16 19:42:51 -04:00
green-ponies (jgen)
e9b862b560 Better error checking when uploading files. 
Also, displays PHPs limit on the setup page.
 2011-08-16 16:31:23 -04:00
Shish Moom
b201098ef9 Merge pull request #28 from green-ponies/master 
Issue #5 - Confim Delete
 2011-08-14 13:56:01 -07:00
green-ponies (jgen)
53c10ecddf Confirm image delete operation with javascript. 2011-08-12 22:02:41 -04:00
green-ponies (jgen)
3a4aea45d5 Small addition for giving forms unique IDs. Mainly so that javascript has 
something to hook onto.
 2011-08-12 21:56:48 -04:00
green-ponies (jgen)
6c3e91e01c changed script tags to include language 2011-08-12 21:40:51 -04:00
Shish
4f864c6a80 remove quotes from convert.exe in some cases 2011-08-08 13:01:35 +01:00
Shish
71e07bd13f pdo wikiness 2011-08-01 10:52:02 +01:00