Shish Moom
|
17b5268452
|
Merge pull request #91 from green-ponies/master
Additional fix for notes.
|
2012-01-16 14:37:23 -08:00 |
|
green-ponies (jgen)
|
211e191b50
|
Removing unnecessary and incorrect mysql_real_escape_string() calls.
|
2012-01-16 17:30:06 -05:00 |
|
Shish
|
9a4ea2bc77
|
merge green-ponies/master
|
2012-01-16 21:19:10 +00:00 |
|
green-ponies (jgen)
|
ce303d4fe3
|
Needs to have the get_base_href() first.
|
2012-01-16 16:11:53 -05:00 |
|
Shish
|
7045b21b44
|
uploader javascript fixes from jgen (copy & paste is easier than fixing merge conflicts >.>;;)
|
2012-01-16 21:10:51 +00:00 |
|
green-ponies (jgen)
|
46960eed48
|
Fix for Notes missing js files.
|
2012-01-16 16:06:05 -05:00 |
|
Shish
|
6ca81cb636
|
Merge branch 'master' of github.com:shish/shimmie2
|
2012-01-16 20:59:00 +00:00 |
|
Shish
|
cc3bda38f0
|
attempt to hand-merge jgen's revert by IP vits
|
2012-01-16 20:58:55 +00:00 |
|
green-ponies (jgen)
|
d46244f926
|
Display message if no comments.
|
2012-01-16 20:54:34 +00:00 |
|
green-ponies (jgen)
|
fdca5e4662
|
Patch for displaying error message when disk full.
|
2012-01-16 20:52:26 +00:00 |
|
Shish Moom
|
40c3861bc9
|
Merge pull request #76 from tkorpe/master
Bulk add faster
|
2012-01-16 12:41:56 -08:00 |
|
Shish
|
8f56b9ae2c
|
argh php, syntax that used to be required is now deprecated...
|
2012-01-16 19:58:03 +00:00 |
|
Shish
|
9bde42d452
|
consistent hashing for multiple data mirrors
|
2012-01-16 02:53:38 +00:00 |
|
green-ponies (jgen)
|
5ab776d1ef
|
Merge remote-tracking branch 'remotes/shish/master'
|
2012-01-15 21:33:14 -05:00 |
|
Shish
|
5b9c8b736d
|
remove debug
|
2012-01-16 01:50:44 +00:00 |
|
Shish
|
f0105125d1
|
Merge branch 'master' of github.com:shish/shimmie2
|
2012-01-16 01:35:44 +00:00 |
|
Shish
|
6d88e3f4d8
|
twitter feed ext
|
2012-01-16 01:35:36 +00:00 |
|
green-ponies (jgen)
|
342600cb40
|
This code is not used in the master branch.
Moved into separate branch 'revert_by_ip'.
|
2012-01-15 12:02:54 -05:00 |
|
Thasan
|
aa452bf8eb
|
Added $force to vars
|
2012-01-14 11:15:13 +02:00 |
|
Shish
|
0a4e8e05f0
|
quieten notices of overwritten things
|
2012-01-14 01:51:44 +00:00 |
|
Thasan
|
cd34879cf1
|
oops, forgot debug code
|
2012-01-12 03:59:58 +02:00 |
|
Thasan
|
9f8a49483f
|
check if thumbnail already exists before regenerating it, way to force regen.
|
2012-01-12 03:54:27 +02:00 |
|
green-ponies (jgen)
|
0b03f91f1c
|
Fixed the new upload form.
Changed it over to use jQuery since shimmie has that already.
Works with FF, Chrome, and IE 7 now.
|
2012-01-09 20:45:30 -05:00 |
|
green-ponies (jgen)
|
f7fc253075
|
Display message if no comments.
|
2012-01-08 22:18:17 -05:00 |
|
green-ponies (jgen)
|
dcf96456f1
|
Fixed issue with Cancelling Transloads.
Also added some features to the Bookmarklet.
|
2012-01-08 16:50:35 -05:00 |
|
green-ponies (jgen)
|
57da47c93a
|
using the new uploader
|
2012-01-08 13:36:39 -05:00 |
|
green-ponies (jgen)
|
f93b86261e
|
Small feature for uploading using a bookmark.
|
2012-01-08 13:23:39 -05:00 |
|
green-ponies (jgen)
|
db59cb14af
|
Working on Reverting Changes by specific IP.
|
2012-01-08 13:23:03 -05:00 |
|
Shish
|
8cfa72d7cf
|
copyright bumps
|
2012-01-01 20:36:51 +00:00 |
|
Shish
|
5b717870d1
|
case sensitivity blargh
|
2012-01-01 17:13:50 +00:00 |
|
Shish
|
0c96603861
|
Merge branch 'master' of git@github.com:shish/shimmie2
|
2012-01-01 16:58:01 +00:00 |
|
Shish
|
beff330a37
|
Merge branch 'master' of github.com:shish/shimmie2
|
2012-01-01 16:54:58 +00:00 |
|
Shish
|
56a780bfd3
|
in per-letter mode, don't separate a and A
|
2012-01-01 16:54:44 +00:00 |
|
Shish Moom
|
6e66c10d4b
|
Merge pull request #67 from DakuTree/0d93f29bce
More Stuff!
|
2011-12-31 07:59:15 -08:00 |
|
Shish
|
c39697a40f
|
stub for comment time-ago
|
2011-12-31 14:21:02 +00:00 |
|
Daku
|
0d93f29bce
|
Delete by Query now requires you to enable the form, aswell as confirm the deletion.
|
2011-12-31 14:18:56 +00:00 |
|
Daku
|
dff1eef51a
|
make_form now has a onsubmit option
|
2011-12-31 14:18:55 +00:00 |
|
Daku
|
dc4d156e1a
|
contact link should now properly link to email
|
2011-12-31 14:18:54 +00:00 |
|
Daku
|
b9bd4db41e
|
Tag list should now show under the search block, instead of under every other block
|
2011-12-31 14:18:53 +00:00 |
|
Daku
|
12d4fcf813
|
related block should now change title depending on what tag list is set to
|
2011-12-31 14:18:52 +00:00 |
|
Daku
|
d9e1b935b0
|
+/- buttons should now work in FF, instead of directing you to blank page
|
2011-12-31 14:18:51 +00:00 |
|
Daku
|
c2ad8322ef
|
fixed downloading flash with bookmarklet + added comments
|
2011-12-31 14:18:50 +00:00 |
|
Daku
|
3b73013d1d
|
This should fix the "Undefined variable" error.
|
2011-12-31 14:18:48 +00:00 |
|
Shish
|
ad2bb8b8b6
|
switch timeago to a javascript implementation
|
2011-12-31 14:12:34 +00:00 |
|
Shish
|
e8791d0759
|
Merge branch 'master' of git@github.com:shish/shimmie2
|
2011-12-31 13:57:56 +00:00 |
|
Shish
|
1857075bd9
|
show comments made by user
|
2011-12-31 13:54:32 +00:00 |
|
Shish
|
636b5fc119
|
debugging off by default
|
2011-12-27 20:00:56 +00:00 |
|
Shish
|
77b4bd8d46
|
Merge branch 'master' of git@github.com:shish/shimmie2
|
2011-12-27 19:27:05 +00:00 |
|
Shish
|
cfbeddde9f
|
HTTP level caching, so we can stick varnish in front of the web pages
|
2011-12-27 19:23:37 +00:00 |
|
Shish
|
9b93df4e22
|
make apache cache-control/expires settings only apply to static files; shimmie will take care of the web pages
|
2011-12-27 18:12:56 +00:00 |
|