Commit Graph

3040 Commits

Author SHA1 Message Date
Friendika a51a1007a3 email check failed, translate wall_item template 2011-01-03 13:26:43 -08:00
Friendika 36b241c02b change activitystreams unfollow to stop-follow but also send out OStatus unfollow 2011-01-03 05:58:27 -08:00
fabrixxm 11a44a107d add plugin hook to home page content 2011-01-03 10:08:53 +01:00
Friendika d92659560b site config to force publish in site directory 2011-01-02 22:09:54 -08:00
Friendika de5495f90b don't process empty or non-existent group array 2011-01-02 21:53:00 -08:00
Friendika 527ff13f77 validate the openid url as well. We won't change it if it's bogus, but we won't use it either. 2011-01-02 21:25:38 -08:00
Friendika 03e15bd22f don't update openidserver if openid is empty 2011-01-02 21:20:17 -08:00
Friendika 0a485e6664 don't use openid CURL wrapper if open_basedir is set (even if safe_mode isn't) 2011-01-02 21:01:07 -08:00
Friendika b381dfa6c6 typo slipped through 2011-01-02 14:36:30 -08:00
Friendika c907c22eda missing thumbnail in new profiles 2011-01-02 14:26:23 -08:00
Friendika 4f796c68d2 declare key size/algorithm to ensure key gets generated 2011-01-02 14:12:22 -08:00
Friendika be3cfe8b65 add plugin hooks to personal XRD 2011-01-01 15:03:49 -08:00
Friendika d8985b3a54 try to auto-fill the profile address if we actually do know it. 2011-01-01 13:12:31 -08:00
Friendika 7b6385df94 freeform text area for private contact info - notes or things you just want to remember (addresses, phone numbers, birthdays, whatever) 2010-12-28 01:06:34 -08:00
Friendika caf93fffac move facebook post to addon - and under the AGPL 2010-12-27 23:28:34 -08:00
Friendika b211adfb12 more hooks 2010-12-25 17:46:25 -08:00
Friendika f6556e0a72 more plugin hooks 2010-12-25 15:01:02 -08:00
Friendika d6a75a0391 secure profile redirect failed with duplex relationship 2010-12-25 13:51:39 -08:00
Friendika c0aa8f9312 new string wasn't configured for translation. 2010-12-25 01:24:51 -08:00
Friendika d045fd04d4 provide separate plugin settings page, update demo plugin, fix hook_register 2010-12-24 23:44:17 -08:00
Friendika ded2812799 show creative commons coverage on registration page 2010-12-24 20:23:49 -08:00
Friendika 3ba322889f undo one of the hooks from last checkin - passing objects led to error 2010-12-24 19:04:40 -08:00
Friendika cd073f94f8 slight change on last commit - server discovery for legacy openid 2010-12-23 14:54:34 -08:00
Friendika c55cb45855 revised openid patch, added fix for Windows servers, make "is now friends with" commentable, fix settings form hook to be inside form 2010-12-23 14:40:32 -08:00
fabrixxm 68868fd74b OpenID delegation degrade gracefully if database table is not updated. 2010-12-23 21:52:51 +01:00
fabrixxm dd83923057 Translatable "Welcome to" in home 2010-12-23 21:33:45 +01:00
fabrixxm fa756ffcb9 OpenID delegation in profile page 2010-12-23 21:32:13 +01:00
Friendika d8969bb84b add more plugin hooks, etc. 2010-12-22 20:23:41 -08:00
Friendika 294dc27e17 double profile image on friend requests 2010-12-22 17:27:14 -08:00
Friendika b302012581 send new friend activity when appropriate 2010-12-22 17:25:04 -08:00
Friendika 6808d53d0f plugin/addon API landing - still things left to do before it's useful 2010-12-22 14:16:22 -08:00
Friendika eb6cefaea3 more notes on Windows install 2010-12-22 14:07:27 -08:00
Friendika ad86a5193e some Windows (and other) installation issues 2010-12-22 13:55:44 -08:00
Friendika ddec422de6 begin plugin api 2010-12-20 19:38:34 -08:00
Friendika 878067101f block connection/friend request spam 2010-12-20 00:27:00 -08:00
Friendika b9ca44678d match the documentation 2010-12-19 19:55:03 -08:00
Friendika 2d9718fee9 do a slightly better job at finding relevant content from scraping submitted links 2010-12-19 19:04:37 -08:00
Friendika 24a9a41f96 added "secret" profile search keywords 2010-12-19 17:46:26 -08:00
Friendika 4a2d83fcff don't send any private messages over the facebook channel 2010-12-19 13:41:55 -08:00
Friendika d3987416c5 facebook connector - initial checkin (untested) 2010-12-17 22:36:35 -08:00
Friendika 70f4f172dc pull strings from connection request templates 2010-12-16 19:38:52 -08:00
Friendika f60f82727f register/login timestamps 2010-12-16 16:35:45 -08:00
Friendika 83939f1541 clean up comments 2010-12-14 16:34:49 -08:00
Friendika 57eb0576b0 make both content and people search POSTable 2010-12-12 18:43:32 -08:00
Friendika 1cffecd1be footer is serving no useful purpose. 2010-12-12 17:40:23 -08:00
Friendika 0e39f60c04 replace quick fix with correct fix 2010-12-12 14:33:04 -08:00
Friendika 004193e849 display request issue 2010-12-12 13:59:16 -08:00
Friendika a50343830f preparing for the future 2010-12-11 04:41:51 -08:00
Friendika 6b5a83b9b8 profile load optimisation 2010-12-11 04:16:58 -08:00
Friendika e70551eeec set encryption vars to empty when contact not found 2010-12-10 14:21:33 -08:00
Friendika f027e7e920 add link to album photo when status photo upload 2010-12-10 05:19:04 -08:00
Friendika d5355da368 never enough comments 2010-12-10 04:04:35 -08:00
Friendika 9fb0bd5114 Raise network timeout during friend acceptance, because
encryption/decryption might slow things down.
2010-12-09 14:29:38 -08:00
Friendika eb13833d2a smiley filter 2010-12-08 17:05:51 -08:00
Friendika 4d0f0f9a94 more instrumentation on dfrn_confirm to help track down why it quietly gives up on occasion with no helpful log messages. 2010-12-08 15:30:26 -08:00
Friendika a42b9ea3de display the fact that a conversation is private without disclosing the details of who can/cannot see it. 2010-12-07 20:47:53 -08:00
Friendika e241c401cf significantly enhanced profile security 2010-12-07 19:40:12 -08:00
Friendika 8b086a76e5 stray debugging statement 2010-12-07 17:16:05 -08:00
Friendika e59377d96b highlight any messages on page newer than 12 hours 2010-12-07 16:27:30 -08:00
Friendika 32881234d0 bring back full name check but without utf-8 regex's 2010-12-07 14:11:26 -08:00
Friendika dd185daf90 remove first (space) last registration restriction due to confusion
this will increase spammers and bogus registrations dramatically(!)
2010-12-07 04:44:34 -08:00
Friendika 0afc71a95a trim trailing LF in imported link 2010-12-06 16:26:32 -08:00
Friendika 184f8e143e use local photo in email, email photo upload point to new url 2010-12-05 19:28:47 -08:00
Friendika 75306b6294 allow community page members to upload photos and assorted other stuff which was previously restricted to the page owner 2010-12-05 18:08:36 -08:00
Friendika 4507a571d3 profile page not showing remote profile avatars when their site is down 2010-12-04 22:09:16 -08:00
Friendika 4be5e57afd relationship targets (linked if applicable) 2010-12-03 22:46:42 -08:00
Friendika 20f96c2c53 revise the last checkin a wee bit to ensure notifications are still sent out 2010-12-03 12:37:57 -08:00
Friendika 4d5d93a902 found the elusive comment box bug 2010-12-03 12:27:54 -08:00
Friendika 4d84a87ce4 cache result of (expensive) security check for visitor rights
begin tightening x-profile security
2010-12-02 21:09:55 -08:00
Friendika 2ef6ad80a4 fix installation into subdir of domain 2010-12-02 17:31:48 -08:00
Friendika 1adf69a049 more string extraction 2010-12-01 20:37:42 -08:00
Friendika f9f018ef08 potential for privacy leakage, plus photo not showing occasionally 2010-12-01 14:01:04 -08:00
Friendika 9513f1f166 rino recipient patch 2010-12-01 13:39:00 -08:00
Friendika 99bbc29747 rino landing 2010-11-30 18:32:34 -08:00
Friendika 62bb471ba0 localise login template, allow openid to be disabled 2010-11-28 20:58:23 -08:00
Friendika d6caf59f35 verify all the display links in emails 2010-11-26 03:47:04 -08:00
Friendika 846fa8d5f7 notify link again 2010-11-26 03:19:41 -08:00
Friendika bdabc89026 fix links in notification emails 2010-11-26 03:12:30 -08:00
Friendika cce7380756 more optimising when confronted with dead servers 2010-11-25 18:50:28 -08:00
Friendika a1458f899a change remote welcome message 2010-11-25 18:22:54 -08:00
Friendika 9fb967ae34 more pre-install checks to sort out broken environments 2010-11-25 15:33:32 -08:00
Friendika 0a03a710b3 ensuring all non-deliveries get in the queue 2010-11-25 15:03:59 -08:00
Friendika ca706ccbed added more notifier logging 2010-11-25 02:53:19 -08:00
Friendika 9d7130e403 tag search boolean mode 2010-11-24 19:25:47 -08:00
Friendika d855371fa5 no pagination on search page 2010-11-24 18:37:10 -08:00
Friendika d98a695689 use local_user() 2010-11-24 16:35:35 -08:00
Friendika 3757c9cae5 use sha1 keys for friends as well 2010-11-24 16:07:42 -08:00
Friendika 4bd7667a48 whirlpool not universally supported for key generation, use sha1 2010-11-24 15:53:26 -08:00
Friendika 85a6e9634a report failure to generate keys 2010-11-24 14:49:35 -08:00
Friendika dd52aec243 use optional openid photo for registration - if supplied 2010-11-23 20:56:20 -08:00
Friendika f9f08b4355 send unfollow before removing ostatus contact 2010-11-23 19:29:38 -08:00
Friendika 9be4b3482e drop mail delivered flag now that queue is implemented 2010-11-23 16:08:48 -08:00
Friendika 15f011b34c more logging in dfrn_notify 2010-11-23 15:55:11 -08:00
Friendika 1278305de9 salmon error handling issue 2010-11-22 19:58:35 -08:00
Friendika de6c777d3f infrastructure for queueing, redelivery 2010-11-21 23:00:01 -08:00
Friendika 09117b1dc7 she'll be right 2010-11-21 17:44:59 -08:00
Friendika 83e3cc34d2 something wrong - undo last checkin until fixed 2010-11-21 17:38:27 -08:00
Friendika 72fd6eec4b make sure to use local avatar if we have one 2010-11-21 17:36:01 -08:00
Friendika 6a3815e751 don't invoke slap if there's no endpoint configured 2010-11-21 15:44:26 -08:00
Friendika f1630780e9 add google buzz 2010-11-21 15:25:10 -08:00
Friendika f7760a9f5b search items do not get indented 2010-11-20 22:50:52 -08:00
Friendika ef39bd080f more dfrn_confirm logging 2010-11-18 21:14:16 -08:00
Friendika e0b392b06e add a bit more logging to friend accept 2010-11-18 20:58:46 -08:00
Friendika 3b7dc43d3b network was not yet set before testing type 2010-11-18 20:28:41 -08:00
Friendika 75248512cc more pre-install checking 2010-11-18 15:57:09 -08:00
Friendika 0c7ae3aeee smooth a few rough edges of openid 2010-11-18 15:06:33 -08:00
Friendika abc6199c17 more pre-install checks, try and create db if doesn't exist 2010-11-18 02:59:59 -08:00
Friendika b4c277da22 provide config option to not use gravatar during registration 2010-11-17 23:24:43 -08:00
Friendika 90b601c3dd openid registration 2010-11-17 20:35:50 -08:00
Friendika 38eff190ea missing advanced profile from yesterday i18n re-org 2010-11-17 17:28:29 -08:00
Friendika 875b31fb8e openid logins working 2010-11-17 17:03:27 -08:00
Friendika 1d420e473f add openid settings 2010-11-17 15:41:18 -08:00
Friendika 56ccf0920a add linked hashtags to item tag 2010-11-17 14:56:41 -08:00
Friendika 5e6e92a10b quote the quote 2010-11-16 23:27:53 -08:00
Friendika c2086ec50e pull some template strings 2010-11-16 23:26:14 -08:00
Friendika 22f7ffc2d7 enumerate required php modules 2010-11-16 15:38:56 -08:00
Friendika 4240a23a8a i18n re-arrange 2010-11-15 23:27:12 -08:00
Friendika 5d47417711 more view cleanup 2010-11-15 21:06:44 -08:00
Friendika 8c395f96de view directory cleanup 2010-11-15 21:02:59 -08:00
Friendika 3374c698a2 i18n update 2010-11-15 20:33:01 -08:00
Friendika 949842a88d validate email addresses to see if the hostnames actually resolve before committing a new user 2010-11-15 20:22:40 -08:00
Friendika f9497bcb95 refactor rego in preparation for openid import 2010-11-15 20:10:19 -08:00
Friendika 93c33f0eb3 html escape the raw message 2010-11-15 19:27:15 -08:00
Friendika b4e5b133a1 redirect to registration (rather than login) upon install complete 2010-11-15 18:16:57 -08:00
Friendika 9be5a7c750 use gravatar for default avatars 2010-11-15 16:49:27 -08:00
Friendika 0851669b39 clean up some regex's for i18n, and eliminate old ereg patterns. 2010-11-14 00:32:31 -08:00
Friendika 7db4a0dd2e give orphans a second chance, linkify naked links 2010-11-11 20:32:20 -08:00
Friendika 4c5f3fbf79 auth manager update, increased verbosity on salmon logs 2010-11-11 14:53:39 -08:00
Friendika 7be66b1d91 ff account manager 2010-11-11 02:49:28 -08:00
Friendika 0abaa6724d set autocomplete=false to prevent browser prefilling passwd change, set return_url on all contact forms 2010-11-10 17:30:14 -08:00
Friendika f4fd679928 couple of issues w/ profile photo update propogation 2010-11-09 18:24:35 -08:00
Friendika 70bcf000e3 if pre-existing relationship, don't set duplex 2010-11-09 17:53:20 -08:00
Friendika f7c0480f1b use raw db queries wherever query items could contain '%' 2010-11-09 15:11:47 -08:00
Friendika 098478e3a5 linkify hash tags 2010-11-08 22:39:03 -08:00
Friendika 9f606be540 loosen search restrictions 2010-11-08 21:10:53 -08:00
Friendika 188b1d2d6f participate in public conversations 2010-11-08 20:15:42 -08:00
Friendika 57fe19da72 minor positioning adjustment on search items 2010-11-08 18:36:08 -08:00
Friendika 4514927128 added search 2010-11-08 17:30:00 -08:00
Friendika 01f171bce7 ability to remove individual photo tags 2010-11-08 14:37:58 -08:00
Friendika a8d6d72b7b use date ordering on public feeds 2010-11-08 01:11:50 -08:00
Friendika fbb0166690 lint 2010-11-07 21:07:47 -08:00
Friendika 9e35fb26f7 lint 2010-11-07 17:29:30 -08:00
Friendika d825db3649 lint 2010-11-07 15:46:49 -08:00
Friendika 67707c89f6 full name tags => items 2010-11-07 14:04:37 -08:00
Friendika fbcb74099a show larger images for profile photos on summary photos page 2010-11-07 03:41:28 -08:00
Friendika 944c14b9e6 could not delete photos 2010-11-07 03:36:03 -08:00
Friendika a3ddbb5d7c issues with friendship again 2010-11-06 22:56:39 -07:00
Friendika 36d286d062 more fixes to introduction discards 2010-11-06 17:01:57 -07:00
Friendika 8c9aa975fa unable to discard notify 2010-11-06 16:54:21 -07:00
Friendika 05236adf0f notification email on follow activities 2010-11-06 14:40:19 -07:00
Friendika 964ca0e079 install messages persist, some colour coordination 2010-11-06 05:07:10 -07:00
Friendika 3cc662aa63 friend/contact sidebar block 2010-11-05 05:01:54 -07:00
Friendika b94cb8d234 add micro profile photo 2010-11-04 23:50:32 -07:00
Friendika 71ae08d506 add display link to notify emails 2010-11-04 20:58:08 -07:00
Friendika 4cba826a2f hub anomolies & swat0 compliance 2010-11-04 20:47:44 -07:00
Friendika 9718fffd71 make a photo visible if it is liked 2010-11-04 03:57:49 -07:00
Friendika 4f8445760c cleanup photo page a bit more, some work on branding 2010-11-04 00:19:10 -07:00
Friendika b3856a797b show like/dislike when no comments yet, bit of lint 2010-11-03 19:47:07 -07:00
Friendika a90e5f438b clean up photo edit layout 2010-11-03 17:20:46 -07:00
Friendika a985ad4a54 add activity target to items, allow multiple link relations 2010-11-03 16:48:21 -07:00
Friendika 98a508532f fix like/dislike refresh on photos/display items 2010-11-02 22:21:49 -07:00
Mike Macgirvin 2a23a7e840 project rename 2010-11-02 20:17:46 -07:00
Mike Macgirvin 26f97b8284 like,dislike for photos (still needs a bit of tweaking) 2010-11-02 16:24:23 -07:00
Mike Macgirvin d8630dbdd8 infrastructure for swat0 (#fsw) 2010-11-01 23:42:26 -07:00
Mike Macgirvin 36a77c6db2 build feeds rather than template them 2010-11-01 17:56:36 -07:00
Mike Macgirvin 4f4d6bace6 add rel=mentioned links for tagged persons 2010-10-31 21:57:30 -07:00
Mike Macgirvin b376f21533 notify folks who have been tagged in a post 2010-10-31 20:36:59 -07:00
Mike Macgirvin b919a1e35a more lint 2010-10-31 16:40:09 -07:00
Mike Macgirvin f0b6400584 more lint 2010-10-31 16:38:22 -07:00
Mike Macgirvin fab63ca751 -Wall cleanup 2010-10-30 13:25:37 -07:00
Mike Macgirvin 768acb0a3f -Wall cleanup 2010-10-30 04:59:10 -07:00
Mike Macgirvin cbaf0f2dc9 another typo 2010-10-30 01:16:51 -07:00
Mike Macgirvin 2fc4677173 messages need subjects to link to 2010-10-29 23:00:10 -07:00
Mike Macgirvin 30fe8e39d6 security issue 2010-10-29 22:18:05 -07:00
Mike Macgirvin f34c1ce66a provide the means to tag link a person by full_name 2010-10-29 00:02:26 -07:00
Mike Macgirvin 6301de1032 catch a couple of edge cases with the tag linkifier 2010-10-28 20:11:50 -07:00
Mike Macgirvin 051fb7107e linkify @person and @person@domain.com tags 2010-10-28 18:18:20 -07:00
Mike Macgirvin f7e1e907bc typo 2010-10-28 16:06:34 -07:00
Mike Macgirvin a0f6f8ad53 preserve utf-8 on notification emails 2010-10-28 16:05:09 -07:00
Mike Macgirvin 42e6b6cfe4 accepted but ignored - should probably be a 202 http code 2010-10-27 17:29:30 -07:00
Mike Macgirvin 2028e1695c rework the logging interface 2010-10-26 22:09:13 -07:00
Mike Macgirvin eb5e6aae72 a few more fsw tweaks 2010-10-26 19:01:16 -07:00
Mike Macgirvin d2e20d029a de-duplicate photo importation logic 2010-10-26 14:50:38 -07:00
Mike Macgirvin c16f314ec3 two-way subscriptions working with federated social accounts 2010-10-25 21:52:30 -07:00
Mike Macgirvin 1335ef7595 no sparkle on federated network 2010-10-24 21:10:52 -07:00
Mike Macgirvin b41218ca30 workflow for federated/non-dfrn followers 2010-10-24 20:39:24 -07:00
Mike Macgirvin b8b227b328 add nicknames to contact records (going forward and retroactive) 2010-10-23 01:20:26 -07:00
Mike Macgirvin a8a88d2532 clean up the salmon consumer bits 2010-10-21 15:32:09 -07:00
Mike Macgirvin 81be82ddab put lrdd link into html headers for completeness 2010-10-21 14:32:29 -07:00
Mike Macgirvin 5edee3c4d1 magic-envelope verification, status.net appears to do it wrong.
Ultimately we need to do it right (or why bother having a spec?),
and fallback to doing it wrong if we're talking to a broken system - which
ironically seems to include most of the federated social web projects.
2010-10-21 04:53:43 -07:00
Mike Macgirvin a8e4ec7801 use browser geolocation when desired 2010-10-19 20:52:05 -07:00
Mike Macgirvin d58ff1a8df duplex wasn't getting set correctly on group pages 2010-10-19 16:23:05 -07:00
Mike Macgirvin 0b2d85891e lrdd link on profile page (for salmon m/e), remove dfrn-template, qualify some contact lookups, some cleanup of app/boot 2010-10-19 15:51:56 -07:00
Mike Macgirvin 3876cab8ea sorting out the last(?) quirks in group pages. 2010-10-18 16:38:48 -07:00
Mike Macgirvin ac824fe83e eradicate redundant get_uid function 2010-10-18 14:34:59 -07:00
Mike Macgirvin 511c761fec group/community/celebrity pages 2010-10-18 00:43:49 -07:00
Mike Macgirvin 0f47ac282c celebrity/group/community pages about 75% implemented 2010-10-17 20:04:17 -07:00
Mike Macgirvin 36e1afa6ae allow login by username and multiple unique email addresses on system - this will provide support for group/celebrity pages (coming soon). 2010-10-16 20:38:27 -07:00
Mike Macgirvin 6d646e9df5 don't allow ignored contacts to post through the hub, change default poll
for hub subscribers to once a day now that we can utilise multiple hubs.
2010-10-15 04:58:13 -07:00
Mike Macgirvin a1d37b6cc4 add recipient url to pubsub instrumentation 2010-10-15 04:36:39 -07:00
Mike Macgirvin 35a9b49ed0 allow for multiple pubsub hubs so everything can still work when/if one goes flaky
(Google's hub has been particularly unreliable recently and the symptoms are that
you just stop receiving updates, and/or updates you send are silently dropped and
never delivered). Also add more instrumentation to help debug pubsub issues.
2010-10-15 04:20:42 -07:00
Mike Macgirvin d96ae0f9f5 can no longer avoid recording the curl response code 2010-10-13 22:01:23 -07:00
Mike Macgirvin bf77043b51 set correct content-type on feeds, status.net is fussy and ignores the one declared in the xrd 2010-10-13 19:06:52 -07:00
Mike Macgirvin c1fb819d34 mostly cosmetic 2010-10-13 02:47:32 -07:00
Mike Macgirvin 033935c194 cleanup to ensure protocol version is passed properly. We will need it if/when any incompatible protocol changes are introduced. 2010-10-12 20:29:04 -07:00
Mike Macgirvin 3c440f70c6 Provide the ability to subscribe to our user from other federated sites.
This is a read-only relationship until the rest of the salmon
magic-envelope stuff lands
2010-10-12 19:32:15 -07:00
Mike Macgirvin 744edcf2ab modularise webfinger and make it service agnostic 2010-10-12 16:50:12 -07:00
Mike Macgirvin dba866c689 more comprehensive XRD linkages 2010-10-12 04:39:32 -07:00
Mike Macgirvin 013d2604f8 inline salmon magic keys 2010-10-12 04:07:03 -07:00
Mike Macgirvin b9d768972e added 's' keys - salmon keys, small keys, stupid keys, whatever... 2010-10-11 23:22:38 -07:00
Mike Macgirvin 6b67d00fce if pubkey is encrypted, it will also be packaged for safe transport 2010-10-11 04:01:24 -07:00
Mike Macgirvin eafd225bdd protocol revision, send dfrn_confirm binary items as hex 2010-10-11 03:16:25 -07:00
Mike Macgirvin 524f73e306 A bit more telemetry of friend confirms and lots of extra doco
to understand what is happening and why.
2010-10-10 18:25:34 -07:00
Mike Macgirvin 3531f466e5 further enhance the friend confirm reporting 2010-10-10 16:33:28 -07:00
Mike Macgirvin 0ddfdce6a4 make it much easier to debug friend acceptance issues
by reporting specific error conditions across the wire.
2010-10-10 16:16:29 -07:00
Mike Macgirvin dcaadada35 allow leading/trailing whitespace in passwords 2010-10-09 16:19:52 -07:00
Mike Macgirvin 006ca54f92 ensure regmod redirects to itself after login 2010-10-09 06:00:07 -07:00
Mike Macgirvin 9c10ada906 salmon-magic-public-freaking-nasty-keys 2010-10-06 21:13:15 -07:00
Mike Macgirvin a0ecdd025e infrastructure for salmon 2010-10-06 19:46:44 -07:00
Mike Macgirvin 66a6fd8df0 more instrumentation 2010-10-06 18:14:11 -07:00
Mike Macgirvin 9f0cedad8e remove debugging statement 2010-10-06 16:00:19 -07:00
Mike Macgirvin 09606dbac2 more doco 2010-10-06 00:33:11 -07:00
Mike Macgirvin 036964de4d friend acceptance sets up lots of important stuff, so we
need to be absolutely bulletproof when (not if) things go wrong.
2010-10-05 19:56:09 -07:00
Mike Macgirvin 8424f31aad a bit more robust about loading external pics
also friend confirm was getting wrong email
2010-10-04 16:04:52 -07:00
Mike Macgirvin 941b2331f1 xrd cannot be called before db is open to get language 2010-10-04 04:22:34 -07:00
Mike Macgirvin b8a9581acb force lowercase nickname 2010-10-02 17:55:41 -07:00
Mike Macgirvin 7658acbe0a automatically subscribe to hub if conditions are right 2010-10-01 04:41:53 -07:00
Mike Macgirvin f5615068ca trialing pubsubhubbub - operational tweaks 2010-10-01 02:28:06 -07:00
Mike Macgirvin 0d2650b29b the rest of pubsubhubbub except for the UI that actually turns it on 2010-09-30 21:38:45 -07:00
Mike Macgirvin 632c557008 pubsubhubbub db refinements 2010-09-30 21:00:06 -07:00
Mike Macgirvin 465ba71b58 pubsubhubbub - discovery and notifier 2010-09-30 20:24:03 -07:00
Mike Macgirvin abe6a3286e pubsubhubbub endpoint 2010-09-30 19:41:22 -07:00
Mike Macgirvin 7ad27f5737 implement rel alternate, some corresponding last minute touchups on display module 2010-09-30 16:06:53 -07:00
Mike Macgirvin a0a7c3be8b add linebreak to invisibility notice 2010-09-30 05:13:13 -07:00
Mike Macgirvin 948061e241 notify people when they are invisible 2010-09-30 05:10:25 -07:00
Mike Macgirvin dda5195418 show members of locked conversations 2010-09-29 22:11:26 -07:00
Mike Macgirvin e25e40f1ef i18n string extraction util 2010-09-29 18:11:23 -07:00
Mike Macgirvin 18287a3656 show lockstate on messages, sparkle failure on profile page,
comments on typo checker
2010-09-28 22:12:27 -07:00
Mike Macgirvin dd3f754e23 found yet another typo, so created a typo finder 2010-09-28 16:10:44 -07:00
Mike Macgirvin 27946c102d animate the sparkler, author was getting sparkled on own page 2010-09-27 22:43:30 -07:00
Mike Macgirvin 55351114fa you and me babe 2010-09-27 19:58:37 -07:00
Mike Macgirvin 01d36785b0 fixed photo comments, msg typo, and changed cursor when hovering
over "special friends" where SSO is allowed
2010-09-27 19:48:45 -07:00
Mike Macgirvin 84d2ad8ebf cleaned up ACL expansion to remove unwanted '0' elements 2010-09-26 19:44:03 -07:00
Mike Macgirvin 34eedb503a stronger type checking on comparisons 2010-09-26 17:24:20 -07:00
Mike Macgirvin b91494d22e preliminary network abstraction, configurable debugging. 2010-09-26 16:30:21 -07:00
Mike Macgirvin 0ebd4aa783 per design spec, hide global directory if update url not present 2010-09-23 18:33:07 -07:00
Mike Macgirvin 4c2fbc81a0 for corp and edu sites, allow registration only to certain email addrs 2010-09-23 15:36:21 -07:00
Mike Macgirvin aedae07af6 oops - slipped on last commit, profile tab broke 2010-09-22 21:32:44 -07:00
Mike Macgirvin d5a13b1e4c localisation path for all view templates 2010-09-22 18:00:19 -07:00
Mike Macgirvin 124129e2a0 greatly simplify sorting by relation type, though it still isn't fully implemented. 2010-09-21 20:52:13 -07:00
Mike Macgirvin 188dc1fcf8 relationship direction was too confusing to work with. instead of "in,out,both" it's now declared by role e.g. "vip,fan,bud". 2010-09-21 19:51:08 -07:00
Mike Macgirvin db89a1eb44 prepare for open source server release 2010-09-21 16:01:19 -07:00
Mike Macgirvin a428695f8e pass vars via javascript, not html. Also fix broken pause img on IE 2010-09-20 22:27:33 -07:00
Mike Macgirvin b9247f1dcc fix layout issues, deletable items and wall-wall 2010-09-20 21:26:18 -07:00
Mike Macgirvin cd61b46009 polling horked on certain relationships 2010-09-20 20:26:55 -07:00
Mike Macgirvin 3ad52463f6 more robust feed error handling, at the expense of performance.
Pass profile owner through HTML (yuk) to the ajax updater - as
browser  pre-fetch totally buggers passing it via the server session.
2010-09-20 19:34:44 -07:00
Mike Macgirvin e583ba0bff improved "friendship accepted" emails enumerating what has
changed in the relationship and what you can do now.
2010-09-19 22:00:31 -07:00
Mike Macgirvin 971b7d7519 don't set tab to selected if visiting 2010-09-18 21:29:22 -07:00
Mike Macgirvin 65a420b227 theme cleanup 2010-09-18 21:11:18 -07:00
Mike Macgirvin 2bae548b35 no profile after returning from visitor mode with a selected profile
put bottom margin on non-profile pages as well
2010-09-17 18:26:20 -07:00
Mike Macgirvin 9cda87c327 cleanup home page 2010-09-17 05:19:56 -07:00
Mike Macgirvin 4eb1c1eb1a our implementation of "aspects" functionally complete 2010-09-17 03:43:03 -07:00
Mike Macgirvin a50947a4bc like, dislike, activity streams, etc. 2010-09-17 03:10:19 -07:00
Mike Macgirvin c5031139eb abstractify items, check photos for birthday paradox 2010-09-13 22:57:31 -07:00
Mike Macgirvin 38fde6672e provide allow list of friend sites for education/corporate environments,
pattern matchable
2010-09-13 17:12:54 -07:00
Mike Macgirvin 2c96ad7739 tag each side of the duplex 2010-09-12 21:25:37 -07:00
Mike Macgirvin 7d5ace644e item wall flag => photos 2010-09-10 01:27:56 -07:00
Mike Macgirvin 3a69413f86 more preparation for activities 2010-09-09 22:02:28 -07:00
Mike Macgirvin 2e6041d1b6 activity verbs 2010-09-09 21:16:40 -07:00
Mike Macgirvin 49c9860e61 fix item 2010-09-09 19:20:35 -07:00
Mike Macgirvin 887a8add2d populate wall element 2010-09-09 19:14:42 -07:00
Mike Macgirvin 82986cc993 fixes 2010-09-09 18:49:19 -07:00
Mike Macgirvin a587d550b9 doco 2010-09-09 17:25:08 -07:00
Mike Macgirvin 440a3fea3f redirection to wrong profile in multi-user mode 2010-09-09 17:09:38 -07:00
Mike Macgirvin 62fdf346ff cleanup 2010-09-09 16:48:33 -07:00
Mike Macgirvin e8c39ff49f found the missing comment box bug 2010-09-09 05:25:01 -07:00
Mike Macgirvin f8160ed076 missing paren 2010-09-08 20:52:43 -07:00
Mike Macgirvin 8a87ad9b88 update global directory on change of profile photo 2010-09-08 20:46:10 -07:00
Mike Macgirvin ffb1997902 mistpark 2.0 infrasturcture lands 2010-09-08 20:14:17 -07:00
Mike Macgirvin b49858b038 start on 2way comms, 2.0 dev 2010-09-02 00:31:11 -07:00
Mike Macgirvin 19a28434c4 potential xss exploit 2010-09-01 17:26:02 -07:00
Mike Macgirvin 2c1a27b2ae webfinger client 2010-08-30 21:08:45 -07:00
Mike Macgirvin e71672a409 acct uri may have double slashes after scheme, may be url encoded 2010-08-30 20:59:56 -07:00
Mike Macgirvin 2d76a5c76b fix last-child in face of deletions 2010-08-29 21:55:57 -07:00
Mike Macgirvin 99a903ed66 better intro text 2010-08-27 15:35:41 -07:00
Mike Macgirvin b02e30f1cf sort out notify x-domain 2010-08-22 20:57:20 -07:00
Mike Macgirvin 024f2019e6 store default location 2010-08-21 16:31:46 -07:00
Mike Macgirvin 709c86b2da added location tagging 2010-08-20 14:33:15 -07:00
Mike Macgirvin f7c56106e7 rename new password field so form filling browsers don't always populate it 2010-08-19 22:18:06 -07:00
Mike Macgirvin cac8aa7a69 increase visibility of visibility settings 2010-08-19 22:04:18 -07:00
Mike Macgirvin 0ea5e7fc95 fat fringers 2010-08-19 19:07:19 -07:00
Mike Macgirvin 43adabcd20 multi-user fixes 2010-08-19 17:23:13 -07:00
Mike Macgirvin b16be9e76a marital "heart" status no longer an array 2010-08-19 05:29:43 -07:00
Mike Macgirvin e0045a43e2 mongo checkin, global directory, redir rework, location basics 2010-08-19 04:59:31 -07:00
Mike Macgirvin 6ed5b642a4 item delete -> nuke contents 2010-08-17 18:56:33 -07:00
Mike Macgirvin 1a1f9b296c contact search + sync to personal edition, installer db check + curl proxy 2010-08-17 18:44:13 -07:00
Mike Macgirvin 478f84d9f2 sql typo 2010-08-17 04:08:35 -07:00
Mike Macgirvin 4d34ec85cf misc little fixes 2010-08-16 22:05:04 -07:00
Mike Macgirvin facca43e2d no more url in cmdline 2010-08-16 20:47:40 -07:00
Mike Macgirvin ce515ac2e8 prepare for federation 2010-08-16 19:38:07 -07:00
Mike Macgirvin 30e3a65c0f full theming support 2010-08-16 05:23:26 -07:00
Mike Macgirvin 4bcf380296 fix notification msgs 2010-08-15 22:43:42 -07:00
Mike Macgirvin 35e29e10e6 installer changes, pe sync 2010-08-15 21:49:29 -07:00
Mike Macgirvin 2370a3f89b code cleanup for server release 2010-08-14 19:39:28 -07:00
Mike Macgirvin 47e9613acd mongo notification checkin, wall, comments, settings 2010-08-14 07:55:18 -07:00
Mike Macgirvin 2ee1b00c9c missed escape on email receive 2010-08-13 05:59:59 -07:00
Mike Macgirvin e9a0d07f3a cleanup 2010-08-13 05:52:28 -07:00
Mike Macgirvin 485708bd9a tweaking sql for netwrk page 2010-08-13 05:47:16 -07:00
Mike Macgirvin e79cb38217 fix regression in profile query 2010-08-13 00:43:44 -07:00
Mike Macgirvin 2a47f5ab46 make it harder for the Russian spammers to register 2010-08-12 15:44:13 -07:00
Mike Macgirvin 1f2f483531 bare naked linefeed \n crept into SQL 2010-08-11 21:45:27 -07:00
Mike Macgirvin 3d7bb9c37c network groups now filtered by parent in group 2010-08-11 15:40:18 -07:00
Mike Macgirvin d2c6fa3fa1 group removal 2010-08-11 04:14:47 -07:00
Mike Macgirvin f4e634ad52 group drop 2010-08-11 01:48:43 -07:00
Mike Macgirvin eb6b2677cb tracking mail notifications 2010-08-10 22:14:17 -07:00
Mike Macgirvin 9662c44a17 even more fixes 2010-08-10 21:22:36 -07:00
Mike Macgirvin 06bdf8a4cf atom auto-discover, fix image preloading in ajax 2010-08-10 16:54:36 -07:00
Mike Macgirvin 04e65823d7 more post branch bug fixes 2010-08-10 05:58:22 -07:00
Mike Macgirvin 0a4c5a694d fix item type 2010-08-10 01:21:38 -07:00
Mike Macgirvin 6fa5557994 post branch fixes 2010-08-09 22:58:58 -07:00
Mike Macgirvin d11c1c63c0 lots of fixes - most recent photo updates for contacts 2010-08-08 21:03:08 -07:00
Mike Macgirvin 0bcd552231 photo album finish, general cleanup begins 2010-08-08 17:08:39 -07:00
Mike Macgirvin c9d8211ae7 photo editing 2010-08-08 01:58:26 -07:00
Mike Macgirvin 5933f13ab7 default acl's 2010-08-07 23:54:22 -07:00
Mike Macgirvin adce88e564 photo editing 2010-08-07 06:20:27 -07:00
Mike Macgirvin 4a7643b3ec allow 640 image to display directly, add album name to photo 2010-08-06 17:16:52 -07:00
Mike Macgirvin 69fe1efa98 added hearts 2010-08-06 17:02:05 -07:00
Mike Macgirvin a48efe0bc0 photo comments 2010-08-06 06:30:25 -07:00
Mike Macgirvin 72b20a6eb1 progress on photos 2010-08-05 21:15:24 -07:00
Mike Macgirvin 40a06771ff reciprocal verification on notify, poll 2010-08-05 02:57:03 -07:00
Mike Macgirvin b294ff6302 fixed zero uid in imported contact photo 2010-08-04 20:11:14 -07:00
Mike Macgirvin d090033a0a more photo progress 2010-08-04 20:03:38 -07:00
Mike Macgirvin b38f875732 i18n 2010-08-03 19:14:57 -07:00
Mike Macgirvin 6af2a79e90 fix rego page 2010-08-03 19:05:07 -07:00
Mike Macgirvin 8f7e81a8b3 front page 2010-08-03 18:17:42 -07:00
Mike Macgirvin 4b39cc5f9b add default album names to photos 2010-08-02 20:21:21 -07:00
Mike Macgirvin 93d0ef4042 fixup image on wall 2010-08-02 19:06:36 -07:00
Mike Macgirvin 3fd4b4264e set frequency of poll per contact, other misc fixes (photo now has contact-id) 2010-08-01 05:46:51 -07:00
Mike Macgirvin eaea2a6370 lighter colours 2010-07-31 02:18:37 -07:00
Mike Macgirvin aea121ea2a message fixes 2010-07-30 22:27:41 -07:00
Mike Macgirvin 56fc81f57e mail more or less working 2010-07-30 21:22:52 -07:00
Mike Macgirvin b399b20dee mail, i18n, etc. 2010-07-30 06:09:20 -07:00
Mike Macgirvin 864e7e690f verified registrations working 2010-07-28 23:15:10 -07:00
Mike Macgirvin d8d6f9adbd profile editor cleanups 2010-07-28 21:02:36 -07:00
Mike Macgirvin 8aeb1976b8 contact-edit cleanup 2010-07-28 20:16:45 -07:00
Mike Macgirvin 050be99034 added friend viewer 2010-07-28 18:24:07 -07:00
Mike Macgirvin 7feed93a56 added invitation module 2010-07-28 16:28:39 -07:00
Mike Macgirvin eaf713bd15 wrong profile in update_profile when local_user() looks at different profile on same site 2010-07-28 05:01:52 -07:00
Mike Macgirvin da766f1159 starting on email 2010-07-28 04:45:07 -07:00
Mike Macgirvin fa154248dc working on readonly contact attribute 2010-07-27 22:32:21 -07:00
Mike Macgirvin 2e5fb9c37e lots of formatting, bug fixes on profile updates, i18n 2010-07-27 19:27:14 -07:00
Mike Macgirvin 6d7b018237 minor edit to last commit 2010-07-26 20:45:54 -07:00
Mike Macgirvin 8c1adbefe3 redirect to contact editor after introduction approval 2010-07-26 20:30:52 -07:00
Mike Macgirvin 7a6665b5cf item deletion and hover images 2010-07-26 17:01:37 -07:00
Mike Macgirvin 17808daf5e item delete 2010-07-26 04:22:19 -07:00
Mike Macgirvin 557ebe4700 working on delete 2010-07-26 03:33:56 -07:00
Mike Macgirvin 9f81c3345b fixup of some nits with live update and remote comment display on profile page 2010-07-25 22:51:45 -07:00
Mike Macgirvin 52a2c7eb46 group select on network page 2010-07-25 16:27:22 -07:00
Mike Macgirvin fc8379b108 live updates sort of working 2010-07-24 23:20:20 -07:00
Mike Macgirvin 6368bd1656 more live update 2010-07-24 15:21:33 -07:00
Mike Macgirvin a93f5627c1 live update 2010-07-24 06:56:02 -07:00
Mike Macgirvin 1db8ab907b css change to allow live inserts 2010-07-24 05:52:29 -07:00
Mike Macgirvin 89c15cc092 added webfinger support 2010-07-23 16:33:34 -07:00
Mike Macgirvin 7a07a2cf31 enhance url parse 2010-07-22 23:17:41 -07:00
Mike Macgirvin 36b66dccb6 ajaxify the wall poster 2010-07-22 22:41:45 -07:00
Mike Macgirvin 88bfe21bea first cut at ajax photo upload 2010-07-22 20:22:03 -07:00
Mike Macgirvin 11f2eaa16d introduction cleanup - email notification flags 2010-07-22 02:13:39 -07:00
Mike Macgirvin a9befec59e add mail module 2010-07-22 02:12:56 -07:00
Mike Macgirvin 023dd993f6 more intro fix 2010-07-20 21:00:49 -07:00
Mike Macgirvin db99f3abda fixes 2010-07-20 20:48:08 -07:00
Mike Macgirvin b4d5af63af yuck 2010-07-20 20:43:46 -07:00
Mike Macgirvin 21ab8356b0 try this 2010-07-20 20:41:31 -07:00
Mike Macgirvin 91fd835754 fix intro bug 2010-07-20 20:38:08 -07:00
Mike Macgirvin 466267fbb5 lotsoflittlestuff 2010-07-20 05:21:19 -07:00
Mike Macgirvin ba8da761e6 more cleanup - start on ajax 2010-07-19 22:52:31 -07:00
Mike Macgirvin c3fd5ed732 one true profile photo, force nicknames 2010-07-19 19:09:58 -07:00
Mike Macgirvin 6695b4a203 more bugs 2010-07-19 06:58:03 -07:00
Mike Macgirvin bbe53699f2 bug fixes 2010-07-19 05:24:22 -07:00
Mike Macgirvin 9b0584e593 revamp of item structure 2010-07-18 23:23:18 -07:00
Mike Macgirvin 21f0cd206d more poll stuff ahead of item revamp 2010-07-18 20:49:10 -07:00
Mike Macgirvin 5bdff4d44c more dfrn_poll 2010-07-18 06:02:19 -07:00
Mike Macgirvin 95d0a9e2bf dfrn_poll underway 2010-07-18 02:49:38 -07:00
Mike Macgirvin 83ee7909cd password reset 2010-07-18 01:24:51 -07:00
Mike Macgirvin aff4f63ff8 remote comments working now 2010-07-17 19:26:00 -07:00
Mike Macgirvin 2a17c20fb8 remote comments - though still needs a bit more work 2010-07-17 07:03:06 -07:00
Mike Macgirvin f937de932d fixing stuff that broke with the last big code push 2010-07-16 23:14:37 -07:00
Mike Macgirvin 5e4df4b3f7 added network page 2010-07-16 17:16:50 -07:00
Mike Macgirvin 059e090b53 sorting out visitor sessions 2010-07-16 06:24:41 -07:00
Mike Macgirvin 56a37deb73 mostly done with dfrn-notify 2010-07-16 01:26:42 -07:00
Mike Macgirvin d20e1a6f93 feed related 2010-07-14 23:04:10 -07:00
Mike Macgirvin 4631a3c282 fix inheritance 2010-07-13 16:18:14 -07:00
Mike Macgirvin c4f31ec65a child conversations inherit ACL's from parent 2010-07-13 16:09:53 -07:00
Mike Macgirvin e4325bc565 . 2010-07-13 04:18:57 -07:00
Mike Macgirvin c3273dfcdc group editor cleanup 2010-07-13 04:05:23 -07:00
Mike Macgirvin 323697d9dc more group editor 2010-07-13 02:26:28 -07:00
Mike Macgirvin c6267a2cd2 turn groups back into numbers 2010-07-13 02:00:53 -07:00
Mike Macgirvin 7e16f8cdae groups and acls 2010-07-12 23:08:07 -07:00
Mike Macgirvin 58fd9647a2 misc fixes 2010-07-12 20:16:27 -07:00
Mike Macgirvin baad288430 acl stuff 2010-07-12 18:00:58 -07:00
Mike Macgirvin e0e2a032cf mongo commit 2010-07-12 16:43:59 -07:00
Mike Macgirvin b0f8cd5fe6 facebook style comments 2010-07-12 00:49:06 -07:00
Mike Macgirvin 4e40156607 sort out some permissions, comments, fetch 2010-07-11 23:10:52 -07:00
Mike Macgirvin 8e22178b8a tweaks 2010-07-11 06:24:10 -07:00
Mike Macgirvin 83dc89d859 group creation 2010-07-11 06:06:30 -07:00
Mike Macgirvin cf1b5c47dc tabs 2010-07-11 04:09:43 -07:00
Mike Macgirvin a6cde63fd8 fix register loophole 2010-07-11 03:35:33 -07:00
Mike Macgirvin 7a21a000a2 lots of little stuff 2010-07-11 02:52:47 -07:00
Mike Macgirvin a42c9616f9 contact editor 2010-07-10 23:03:54 -07:00
Mike Macgirvin b9bbe0cec2 advanced profile 2010-07-10 19:43:55 -07:00
Mike Macgirvin 79725b28cf profile extra fields, profile deletion 2010-07-10 16:47:10 -07:00
Mike Macgirvin e3b86cc583 adding profile fields 2010-07-10 08:18:58 -07:00
Mike Macgirvin 44b1984136 profile additions 2010-07-10 07:09:57 -07:00
Mike Macgirvin 970a2d4f1e ... 2010-07-10 03:26:21 -07:00
Mike Macgirvin a4850cb3d7 added pager 2010-07-10 00:45:18 -07:00
Mike Macgirvin cb54cda174 more directory work 2010-07-09 22:47:32 -07:00
Mike Macgirvin 51b51bd039 removed testing cruft 2010-07-09 22:46:54 -07:00
Mike Macgirvin 4a92de7563 directory enhancements 2010-07-09 17:39:55 -07:00
Mike Macgirvin 03689fa6b0 dbesc the profile clone 2010-07-09 16:45:43 -07:00
Mike Macgirvin db31c293a8 new profile tables, profile clone 2010-07-09 16:28:50 -07:00
Mike Macgirvin d24038d558 country/state selector more or less working (arghhh) 2010-07-09 07:02:22 -07:00
Mike Macgirvin d733b39b2d direcotry cleanups 2010-07-09 03:10:28 -07:00
Mike Macgirvin 64bbf395f0 directory stuff 2010-07-09 01:17:20 -07:00
Mike Macgirvin deaff556ff more to resolve photo inconsitency 2010-07-09 01:12:53 -07:00
Mike Macgirvin 1eb68ca6f9 start directory view 2010-07-09 00:05:21 -07:00
Mike Macgirvin a26f4eeff6 new nickname policy 2010-07-08 20:25:05 -07:00
Mike Macgirvin 9cd9ce9c17 update to new function defs 2010-07-08 18:12:52 -07:00
Mike Macgirvin 5ca174ae34 fix register policy 2010-07-08 17:59:19 -07:00
Mike Macgirvin bec3d15c52 more work 2010-07-08 17:49:41 -07:00
Mike Macgirvin 9a6a60a9c1 mucho progress on notifier, email style dfrn url's 2010-07-08 07:03:25 -07:00
Mike Macgirvin 4b4d680dc4 sort out anon profile display and write permissions 2010-07-07 22:44:22 -07:00
Mike Macgirvin dea552b74f some fixes after cloning to a new site 2010-07-07 06:29:32 -07:00
Mike Macgirvin 9cc49f27e6 minor stuff, getting ready for notify 2010-07-06 23:08:38 -07:00
Mike Macgirvin 1ea69ae275 bizzy 2010-07-06 05:07:28 -07:00
Mike Macgirvin 6817c5d59a lots of work, 2way friends, comments... 2010-07-05 21:39:55 -07:00
Mike Macgirvin f5826105bf group work, dfrn_poll 2010-07-05 03:33:02 -07:00
Mike Macgirvin 766b317070 some changes 2010-07-04 20:45:56 -07:00
Mike Macgirvin 25567fa04b use notice function 2010-07-03 01:45:23 -07:00
Mike Macgirvin 1270243d80 start on contact page sort order 2010-07-02 18:55:43 -07:00
Mike Macgirvin 9bd8ee1aae more work on contact page and added new site directory 2010-07-02 18:37:43 -07:00
Mike Macgirvin 6348e70daa Initial checkin 2010-07-01 16:48:07 -07:00