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

889 commits

Author SHA1 Message Date
Shish
04bdbeb740 test that viewing the log doesn't crash horribly immediately 2012-03-10 02:06:25 +00:00
Shish
e5f4b5ffa1 test tweeter 2012-03-10 01:57:47 +00:00
Shish
a20245ff70 Merge branch 'master' of github.com:shish/shimmie2 2012-03-10 01:07:02 +00:00
Shish
2943750822 upgrade simpletest library, hopefully get rid of deprecation warnings... 2012-03-09 23:08:58 +00:00
Shish
91a97f2b00 no pages for one image 2012-03-09 22:49:26 +00:00
Shish
a7a50cb78f start at page 1 2012-03-09 22:48:17 +00:00
Shish
eb8c15b9a0 whitespace 2012-03-09 22:08:55 +00:00
Shish
90f27cf7fd argh 2012-03-09 22:05:16 +00:00
Shish
788f25a12d Merge pull request #168 from DakuTree/master 
Shimmie API
 2012-03-09 14:02:12 -08:00
Shish
591a6cdb76 GET doesn't work due to auth token check 2012-03-09 21:57:35 +00:00
Shish
9608feffa6 make PM reading work 2012-03-09 21:54:09 +00:00
Shish
15acbc08bd whitespace 2012-03-09 21:52:18 +00:00
Shish
f6bd6dc057 fixing tag reversion 2012-03-09 21:44:39 +00:00
Shish
b1a8a82bf2 there is another test image now 2012-03-09 21:34:03 +00:00
Shish
eaa46d7385 split out data 2012-03-09 21:10:26 +00:00
Daku
3c11feae1c changing back to api/shimmie & allow $_GET or args while using api 2012-03-09 21:09:15 +00:00
Shish
1f07a273f6 move copy & pasted transload code into a shared function 2012-03-09 21:07:21 +00:00
Daku
4a51c73435 some more api docs 2012-03-09 20:46:26 +00:00
Daku
2acd983570 get user info via json api 2012-03-09 20:46:25 +00:00
Shish
266a0d7c25 more test fixes 2012-03-09 19:53:55 +00:00
Shish
bbbc92418d add missing test data 2012-03-09 18:50:23 +00:00
Shish
dc6c85975b working navigation for tag history 2012-03-09 15:55:17 +00:00
Shish
8996c95a47 Merge branch 'master' of github.com:shish/shimmie2 2012-03-09 15:55:12 +00:00
Shish
461bd6bf61 IP ban from tag history page 2012-03-09 15:34:41 +00:00
Shish
e35c1dca74 Merge branch 'master' of github.com:shish/shimmie2 2012-03-09 14:44:15 +00:00
Shish
40bcfafc66 tag_history paging 2012-03-09 14:44:02 +00:00
Shish
f03af6cfcb tag histories should be deleted by foreign key now 2012-03-09 13:00:32 +00:00
Shish
c260f707fd only retroactively create history when the image has old tags and no log - if it is a new image (no old tags) then don't double-log it 2012-03-08 04:07:46 +00:00
Shish
f2c98bec4d a little nicer log format 2012-03-08 03:42:48 +00:00
Shish
5f6a454734 importance as a number is silly, and section is implied by the context of the description 2012-03-08 03:39:48 +00:00
Shish
569e93cd6b postgres requires a sequence name to be passed to get_last_insert_id 2012-03-08 02:55:04 +00:00
Shish
eb9b29b7b4 'blocked image' really means 'attempted to upload a blocked image', make the words reflect that 2012-03-08 01:37:42 +00:00
Shish
34a7a558b3 IP searching in postgres, hackishly (compare text(address) to username, rather than comparing address to inet(username)) 2012-03-08 01:30:08 +00:00
Shish
0487bbe1bd count the messages properly, and show them... 2012-03-02 18:03:34 +00:00
Shish
8bab5b1c0a Merge branch 'master' of github.com:shish/shimmie2 2012-03-02 17:42:11 +00:00
Shish
b6b4122952 PM count 2012-03-02 17:41:25 +00:00
Justin Brewer
9ac45f5363 Regex for PDO DSN 
Old regex matched ADOdb URI. Also, this regex allows the user, pass, host and database information
to appear in any order.
 2012-03-02 10:17:13 -06:00
green-ponies (jgen)
af33a36c89 Typo in SQL 2012-02-29 14:56:05 -05:00
Shish
409a3b9b23 network logging, for irccat 2012-02-26 15:24:37 +00:00
Shish
a4f2c417ec CSS3 powarr 2012-02-22 14:27:56 +00:00
Shish
af7704825b use HTTP status codes with error messages 2012-02-16 15:37:05 +00:00
Shish
5fc7d6e574 Merge branch 'master' of github.com:shish/shimmie2 2012-02-16 15:20:36 +00:00
Daku
bbb9d6bd4c update ext now grabs extra info via JSON 2012-02-16 07:50:28 +00:00
Daku
78a16885e5 this should be here to stop it using any ext >_< 2012-02-16 03:03:36 +00:00
Daku
d33853cee0 resize ext will now check if gif is animated 2012-02-15 23:46:42 +00:00
Daku
47785b8ac0 enabled png autoresizing as it seems to be fixed 2012-02-15 17:21:35 +00:00
Shish
c2bf42ef5a less passing of $page 2012-02-15 08:59:24 +00:00
Shish
8af44574fd 403 is more appropriate 2012-02-15 08:51:13 +00:00
Shish
662c5e8778 More ban explanations, and un-cacheable 2012-02-15 08:23:00 +00:00
green-ponies (jgen)
6a061c83d0 Changed how the resize extension calculates required memory usage. 2012-02-12 19:45:37 -05:00
Shish
b1c7c79b2c <green-ponies> I put an event in your event , so you can listen while you lis... okay that's terrible 2012-02-12 17:08:25 +00:00
Shish
f5ec708066 searching for negative scores 2012-02-12 14:38:37 +00:00
Shish
6691681a3d ypto >_< 2012-02-12 13:58:33 +00:00
Shish
1a737bcbb8 only show vote remover if the user can use it... 2012-02-12 12:18:12 +00:00
Shish
766cc9e959 this function was only referenced once 2012-02-12 11:45:18 +00:00
Shish
294d24ad4b html standard placeholder 2012-02-12 09:55:47 +00:00
Shish
c640b4ce71 Merge branch 'master' of github.com:shish/shimmie2 2012-02-12 07:47:49 +00:00
Shish
4d0b3e69bd give a count of reported images in the admin's userbox 2012-02-12 07:47:53 +00:00
Shish
f8a5828b80 lower case for comparisons 2012-02-12 07:36:43 +00:00
Shish
4133c72727 not-a-tag extension 2012-02-12 06:56:00 +00:00
Shish
fbce628e04 note who has already reported an image 2012-02-12 06:41:10 +00:00
Shish Moom
6f03ecfe2c Merge pull request #130 from green-ponies/tag_history_fixes 
Tag history fixes
 2012-02-11 01:26:25 -08:00
Shish Moom
6da4da8060 Merge pull request #129 from green-ponies/master 
Type hints
 2012-02-11 01:22:43 -08:00
Shish
9f3c347b6c wibble the ip ban layout, and make all tables with the 'sortable' class sortable 2012-02-11 01:48:07 +00:00
green-ponies (jgen)
551a0f0a76 Note for other people. 2012-02-10 00:37:52 -05:00
green-ponies (jgen)
c34656563c Fix for tag history not recording first set of tags. 
Issue #111
 2012-02-10 00:19:08 -05:00
green-ponies (jgen)
a95766c410 More type hints. 2012-02-10 00:08:03 -05:00
green-ponies (jgen)
30eb5ddd8b More type hints! 2012-02-09 23:04:37 -05:00
Shish
c627e564c4 Merge branch 'master' of github.com:shish/shimmie2 2012-02-10 01:29:49 +00:00
Shish
589b47868c allow IP-ban fields to be pre-filled, and addition form to be linked to 2012-02-09 22:18:31 +00:00
green-ponies (jgen)
01306712b7 Shish you broke this~ 2012-02-09 15:10:53 -05:00
Shish
1303a5aa7b move giant notes inline script into its own file 2012-02-09 15:00:33 +00:00
Shish
339f2b0497 more jquery magic, less inline scripting 2012-02-09 14:45:18 +00:00
Shish
82f2d10f75 with the good code in place, the bad code can go 2012-02-09 14:29:42 +00:00
Shish
3291e0c302 Merge branch 'master' of github.com:shish/shimmie2 2012-02-09 14:22:19 +00:00
Shish
c86786a69c missed another 'Event' 2012-02-09 14:22:08 +00:00
Shish Moom
937016d104 Merge pull request #124 from green-ponies/master 
Pools Fixes
 2012-02-09 04:24:46 -08:00
Shish
1c89632ab2 missed a word 2012-02-09 10:51:24 +00:00
green-ponies (jgen)
793b49a054 For HTML correctness. 2012-02-09 01:42:45 -05:00
green-ponies (jgen)
a43b407c41 Change to empty string. 2012-02-09 01:33:23 -05:00
green-ponies (jgen)
06e648d3e4 Fixing shared HTML ID for Random extension. 2012-02-09 01:01:36 -05:00
green-ponies (jgen)
969be8a228 Merge branch 'master' into pools_fixes 
Conflicts:
	contrib/rating/main.php
 2012-02-09 00:58:51 -05:00
green-ponies (jgen)
e227965802 Converting Ratings to new Extension (simple extension). 2012-02-09 00:40:01 -05:00
green-ponies (jgen)
562ba3585a Should this be a global? 2012-02-08 23:32:22 -05:00
green-ponies (jgen)
7bb971cef0 Merge remote-tracking branch 'remotes/shish/master' into pools_fixes 2012-02-08 23:25:52 -05:00
Shish
3584f40551 Merge branch 'master' of github.com:shish/shimmie2 2012-02-09 01:07:21 +00:00
green-ponies (jgen)
7cfad30bb3 Reduce redundant database queries, re-use the pool array. 2012-02-08 16:51:10 -05:00
green-ponies (jgen)
050a9a17df Added config option for Next image. 2012-02-08 16:42:29 -05:00
green-ponies (jgen)
98e7359c6e Show a link for the Next image in a pool. 2012-02-08 16:32:41 -05:00
green-ponies (jgen)
bbdce53a67 Cleaning up HTML code and such. 2012-02-08 15:06:58 -05:00
green-ponies (jgen)
7044a6074f Need to remove this. 2012-02-08 14:52:24 -05:00
green-ponies (jgen)
c30743d22d Cleaning up the code and adding type hints. 2012-02-08 14:49:52 -05:00
green-ponies (jgen)
d2be97d446 Fixed while loops. 
Also added some type hints and more comments.
 2012-02-08 14:39:01 -05:00
green-ponies (jgen)
44d7fe2689 Change to $pool_id 2012-02-08 14:14:11 -05:00
green-ponies (jgen)
2da3cb2812 Changing from GET to POST. 2012-02-08 14:10:33 -05:00
green-ponies (jgen)
795160f8eb Need to have $this, also changed is_null to empty. 2012-02-08 11:21:35 -05:00
green-ponies (jgen)
ca21d6e3f9 Fixed issue with rating module. 2012-02-08 11:12:33 -05:00
green-ponies (jgen)
755136dcd7 Small fix for duplicate ID with Random image. 2012-02-08 10:48:31 -05:00
Shish
0698b780f9 remove regular Extension, have SimpleExtension take its place, optimise the event system based on SimpleExtension methods 2012-02-08 12:07:01 +00:00
Shish
2b85e2d2fd all the extensions are simple now 2012-02-08 11:45:35 +00:00
Shish
4697e21fcd HINT ALL THE TYPES. SIMPLE ALL THE EXTENSIONS. 2012-02-08 11:24:25 +00:00
Shish
be1036e319 put Event in the function name again... 2012-02-08 07:05:58 +00:00
Shish Moom
3b99605521 Merge pull request #116 from green-ponies/speed_tweaks 
More Speed tweaks
 2012-02-07 21:53:00 -08:00
Shish Moom
1b5f1dcafb Merge pull request #107 from DakuTree/master 
Reset Image ids & Download all images
 2012-02-07 20:32:28 -08:00
green-ponies (jgen)
d69fa6ae9d Merge branch 'master' into speed_tweaks 2012-02-07 23:21:56 -05:00
green-ponies (jgen)
76c6031b04 Working on fixing the Pools extension. 2012-02-07 23:15:23 -05:00
green-ponies (jgen)
2d443f0be9 Mostly just adding the Link to comments. 2012-02-07 21:52:11 -05:00
Shish
9707c1f7ce we already have a global jquery install... 2012-02-08 00:29:01 +00:00
Shish
763c00ccdf clean PMs first 2012-02-07 19:30:51 +00:00
Shish
37bffe0689 actually, ext-specific DB changes should live in that ext... 2012-02-07 19:26:40 +00:00
Daku
cca3ce513a added confirm/warning to resetting image ids 2012-02-07 00:02:53 +00:00
Daku
07e786101d download all images function for admin 2012-02-07 00:02:52 +00:00
Daku
d3d395c347 reset image id function for admin 
this basically grabs all the image_id's > sets them all from 1-whatever (so it would be like you never deleted an image)
 2012-02-07 00:02:48 +00:00
Shish
9db912d996 now that the cache key has changed, the invalidation needs updating... 2012-02-05 06:59:55 +00:00
green-ponies (jgen)
3b028696a0 Rewind arrays before foreach loops over all the elements. 
(fixed a small typo as well)
 2012-02-04 15:35:21 -05:00
green-ponies (jgen)
1a8c2d31c7 Also collect the database engine shimmie is using. 2012-02-04 10:55:37 -05:00
Shish
aac7ce6e78 update sysinfo to handle the new event listener format 2012-02-02 16:49:02 +00:00
Shish
ec0fab54d8 these are magicked now 2012-02-02 07:53:27 +00:00
Shish
699087cd98 database_dsn is a constant now 2012-02-02 03:53:03 +00:00
Shish
1be336ad23 merge 2012-01-31 15:32:45 +00:00
Daku
450b4b4fc1 url_escape for mp3 filename 2012-01-31 15:00:06 +00:00
Daku
f76c0a4ff7 popular_by_day/month/year should now work better with other date formats 2012-01-31 14:58:53 +00:00
Daku
a590bf5e15 cleaned up update ext 2012-01-31 14:58:52 +00:00
Daku
bab893bbda really ugly update ext 
(although it works, the code is a mess :x)
 2012-01-31 14:58:52 +00:00
Daku
4780483d7b fixes the random_image block not keeping the image in the sidebar on certain themes 2012-01-31 14:58:51 +00:00
Daku
4312aeca8f ipban now logs when ip is banned 2012-01-31 14:58:50 +00:00
Daku
42bac78bf0 image_hash_ban should now logged when hash is banned 2012-01-31 14:58:49 +00:00
Daku
c05cef6ab3 added option to use custom home links, should now use default links instead 2012-01-31 14:58:49 +00:00
Daku
74478297f2 contact link only shows if set 2012-01-31 14:58:48 +00:00
Daku
2c1a94c734 xspf_player now uses filename as song title 2012-01-31 14:58:47 +00:00
Daku
56f3ca6c10 fixes the featured block not keeping the image in the sidebar on certain themes 2012-01-31 14:58:46 +00:00
Daku
c5468bd938 centering downtime text 2012-01-31 14:58:46 +00:00
Daku
a5de1fd9f0 fixes popular_by_month/year not working due to "number of bound variables does not match number of tokens" error 2012-01-31 14:58:45 +00:00
Shish
41ccdfb499 remove some blanks 2012-01-31 14:29:53 +00:00
Shish
853ea10fea merge mass tagger 2012-01-31 14:28:34 +00:00
Shish
6f22207603 merge pdo fixes 2012-01-31 13:55:12 +00:00
Shish
aed5e1a30e hand merge of speed tweaks 2012-01-31 13:20:43 +00:00
Shish
4da56c12db missed a var 2012-01-31 12:16:34 +00:00
Shish
f6567d17d5 Merge branch 'master' of github.com:shish/shimmie2 2012-01-30 03:49:52 +00:00
Shish
444fdb1f04 tag history -> simpleext 2012-01-30 03:46:38 +00:00
Shish
0ea3ff5af3 wordfilter -> simpleext 2012-01-30 03:39:00 +00:00
Shish
18d6fa317c adminpage -> simpleext 2012-01-30 03:22:41 +00:00
Shish
47bfbd7102 downtime -> simpleext 2012-01-30 02:24:22 +00:00
Shish
39e8e8b733 downtime -> simpleext 2012-01-30 02:24:17 +00:00
Shish
112fb0841d named placeholders for numeric score 2012-01-30 02:03:15 +00:00
Shish
ff9e4192ce Merge branch 'master' of github.com:shish/shimmie2 2012-01-27 18:21:09 +00:00
Shish
c664e8d872 missing a bit 2012-01-27 18:17:55 +00:00
Shish
6e64857936 wibble towards being totally SimpleExtension based, as that's easier to programatically optimise 2012-01-27 18:16:46 +00:00
Shish
c1aa6f4fbb how did this ever work o_O 2012-01-27 17:29:59 +00:00
Shish
eedfc5e6b4 sys info to simpleext 2012-01-27 16:52:12 +00:00