Evan Prodromou
35d9a065fb
Revert "initialize ActivityObject::$extra"
...
This reverts commit 3e82000d57
.
2010-12-22 12:07:13 -08:00
Evan Prodromou
e11ca1e052
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-12-22 12:05:40 -08:00
Evan Prodromou
a01742244e
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-12-22 12:03:14 -08:00
Brion Vibber
448dfb69d4
Initialize $extra member to empty array on ActivityObject
2010-12-22 12:03:05 -08:00
Evan Prodromou
3e82000d57
initialize ActivityObject::$extra
2010-12-22 12:02:50 -08:00
Brion Vibber
055630516c
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:28:34 -08:00
Evan Prodromou
5fe8301129
disable account deletion by default
2010-12-22 11:25:47 -08:00
Evan Prodromou
9a6ceb3303
Merge branch 'righttoleave' into 0.9.x
2010-12-22 11:22:51 -08:00
Brion Vibber
754bc1b616
Error handling cleanup on backup/restore:
...
* avoid PHP notice from using wrong variable
* show a visible error instead of blank screen if no file submitted with restore form
* avoid PHP strict warning from using calling "non-static" DOMDocument::loadXML statically
* suppress PHP warning from XML parse errors
2010-12-22 11:13:57 -08:00
Brion Vibber
5abd2b7d0c
fix notice error
2010-12-22 11:06:45 -08:00
Brion Vibber
a16131526b
Partial fix for ticket #2964 : bad .po file entries
...
http://translatewiki.net/wiki/StatusNet:Cb5746be52330331844dea750bf452c0618aecb3-All_Rights_Reserved/pt-br
2010-12-22 10:20:47 -08:00
Brion Vibber
c5ab7026dd
Partial fix for ticket #2964 : bad .po files
...
http://translatewiki.net/wiki/StatusNet:08b929b29496be84ff75d266b5e60b426cff449f-Hey,_1$s._Someone_just_entered/ca
2010-12-22 10:17:22 -08:00
Brion Vibber
b83e7005ed
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OStatus/classes/FeedSub.php
2010-12-20 14:23:15 -08:00
Brion Vibber
46123e3754
*cough* don't commit the code that breaks your code that you used to test the debug code :D
2010-12-20 13:06:58 -08:00
Brion Vibber
a4e2f38356
Slightly fancier debug code for PuSH hmac mismatches -- save the post to a temp file if feedsub/debug is on in config.
2010-12-20 13:05:17 -08:00
Brion Vibber
dd48bdb1c4
Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke
2010-12-20 10:48:02 -08:00
Brion Vibber
c71d701a3f
Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke
2010-12-20 10:46:23 -08:00
Evan Prodromou
24f9a991b6
Let activity objects write directly to activity's own outputter
2010-12-20 13:30:33 -05:00
Evan Prodromou
25d03c42e6
Add events for representing objects as activity:object
...
Add 6 new events to make it easier to override the type of an activity object.
2010-12-18 17:24:41 -05:00
Brion Vibber
fb8312ebf4
Ticket #2959 : implement api/users/profile_image endpoint in Twitter-compat API
2010-12-17 17:10:52 -08:00
Brion Vibber
3a831ff811
Merge branch 'sorting' into 0.9.x
2010-12-17 16:31:19 -08:00
Brion Vibber
5300d657cc
Sort indexing fix for profile sidebar: add group_member_profile_id_created_idx to group_member table, streamlines sorting of your group memberships in the sidebar
2010-12-17 16:22:26 -08:00
Brion Vibber
c0669969f2
fix typo in showstream
2010-12-17 16:21:33 -08:00
Brion Vibber
146d6b8b73
Sorting index fix for role lookups: adds profile_role_role_created_profile_id_idx index on profile_role
2010-12-17 16:12:44 -08:00
Brion Vibber
fb65d5901d
Update sorting for conversation views: adds notice_conversation_created_id_idx index on notice, replacing more limited notice_conversation_idx
2010-12-17 16:08:37 -08:00
Zach Copley
073f3e99cb
Update Twitter calls to use documented API endpoints
...
see: http://groups.google.com/group/twitter-api-announce/msg/34b013f4d092737f
2010-12-17 15:57:22 -08:00
Evan Prodromou
573bbeced1
action to restore a user's backup from the Web interface
2010-12-17 18:56:48 -05:00
Evan Prodromou
1d6091cad2
Two bug fixes in activityimporter
2010-12-17 18:56:17 -05:00
Evan Prodromou
120802b807
change code order to make shorter lines
2010-12-17 18:55:00 -05:00
Brion Vibber
71151b3bc0
Update sorting for User::repeatedByMe() -- currently unused. Likely not ideally indexed yet.
2010-12-17 15:28:55 -08:00
Brion Vibber
b80151275a
Update sorting on api/statuses/retweets_of_me; was and remains poorly indexed, but will use updated sorting method.
2010-12-17 15:25:19 -08:00
Brion Vibber
1b90ed564a
Update sorting on api/statuses/retweets: adds notice_repeat_of_created_id_idx index to replace notice_repeatof_idx
2010-12-17 15:13:09 -08:00
Brion Vibber
04aa8bd70f
work around borkage in statuses/repeats -- tries to check an offset var that's not there. use the limit var which is there instead
2010-12-17 15:05:45 -08:00
Brion Vibber
66474586af
Update sorting for group inbox timelines; adds group_inbox_group_id_created_notice_id_idx index to group_inbox table
2010-12-17 14:51:37 -08:00
Brion Vibber
3ddfa4de93
Update sorting on reply/mentions timeline: added reply_profile_id_modified_notice_id_idx index to reply table
2010-12-17 14:43:45 -08:00
Brion Vibber
00a5a5342a
Update sorting for tag-filtered public timeline: needs notice_tag_tag_created_notice_id_idx index added to notice_tag
2010-12-17 14:37:46 -08:00
Evan Prodromou
1a81356622
I'm still not sure when it's useful to reset a notice's author
2010-12-17 17:37:43 -05:00
Brion Vibber
33daace6cb
add fixme for since_id/max_id on fave streaming (?)
2010-12-17 14:32:06 -08:00
Craig Andrews
786250e3d9
In LdapCommon checkPassword/changePassword only get the 'dn' attribute as an optimization as no other attributes are necessary.
...
Thanks to drslump reported at http://status.net/open-source/issues/2955
2010-12-17 17:22:52 -05:00
Brion Vibber
4adf551f9f
Update sorting for user tagged timelines (indexing was bad before and remains bad -- we need some DB changes to make this one nice)
2010-12-17 13:45:40 -08:00
Evan Prodromou
4b41d05a13
Make restoreuser use new FeedImporter queue handler
2010-12-17 16:27:20 -05:00
Brion Vibber
4cd3a0756b
Update notice sorting for profile streams; extract more common code to Notice::addSinceId() and Notice::addMaxId()
2010-12-17 13:20:38 -08:00
Brion Vibber
9e8bbff8ac
Notice::whereSinceId() and Notice::whereMaxId() encapsulate logic for building where clauses for since_id/max_id parameters. Can override the field names from 'id' and 'created'.
2010-12-17 13:03:18 -08:00
Brion Vibber
53dd2583fc
Switch public timeline to new sorting; new index notice_created_id_is_local_idx
...
http://status.net/wiki/Sorting_changes
2010-12-17 12:49:02 -08:00
Brion Vibber
5de86f0ccc
Initial switch of public timeline stream to use timestamps for internal sorting
2010-12-17 12:38:38 -08:00
Brion Vibber
7c84c35587
Notice::getAsTimestamp() static function to look up the timestamp for a given notice, even if it's been deleted. To be used for converting since_id/max_id processing to use timestamp sorting internally.
2010-12-17 12:09:02 -08:00
Brion Vibber
0e7a283883
only run explain on selects
2010-12-17 12:08:46 -08:00
Brion Vibber
0535a3d15c
Event hook for SQLProfile
2010-12-17 11:46:11 -08:00
Brion Vibber
66b89de256
SQLProfile: quickie plugin to run DB queries through 'explain' and log ones that trigger filesort or temporary table
2010-12-17 11:41:40 -08:00
Evan Prodromou
044763cf06
move activity importing code to two different queuehandler classes
2010-12-17 13:12:17 -05:00