friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-16 14:17:55 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity
4136 commits 3 branches 63 tags 247 MiB
Commit graph

1435 commits

Author SHA1 Message Date
Friendika d2863d1859 first recently uploaded photo (in 3 hours) to an older existing album, post made visible 2011-06-07 16:23:37 -07:00
Friendika c1b2e90e37 basic saving of events 2011-06-06 22:27:38 -07:00
Friendika fcb4316c29 tinymce for event fields 2011-06-06 21:49:07 -07:00
Friendika bbc65f9832 prev/next links in calendar 2011-06-06 21:28:11 -07:00
Friendika 9f51233451 event listings 2011-06-06 20:17:36 -07:00
Friendika 452245d988 more events framework 2011-06-06 19:59:20 -07:00
Friendika c0094aa4f8 strict privacy mode (Friendika-Z) - refuse to talk to networks with privacy issues 2011-06-06 16:26:11 -07:00
fabrixxm 76f4d85d9a Small fix to theme selector 2011-06-06 14:55:54 +02:00
Friendika 4c629e274b begin event module 2011-06-05 23:10:07 -07:00
Friendika 18f4c6094a bug #88, Thanks Chris! Added a couple of minor tweaks for identity checking and consistency with other profile viewing links 2011-06-05 21:05:55 -07:00
Friendika edbad772ba add flag for experimental themes 2011-06-05 18:05:25 -07:00
Friendika 6f34f89ddb mb_string is now required. 2011-06-04 22:48:43 -07:00
Friendika e591ed6b30 minor edits 2011-06-03 07:04:43 -07:00
Friendika 86df81352f show new_member page only on our own profile 2011-06-03 06:22:39 -07:00
Friendika 32bebdfa7e new_member not new_user 2011-06-03 06:17:43 -07:00
Friendika 00c548cc8f new member page 2011-06-03 06:12:34 -07:00
Friendika 20d1de4ced got it wrong - apparently no need to fix json slashes 2011-06-02 20:42:09 -07:00
Friendika 55e727de64 make 'visible to everybody' warning toggle correctly in photos and settings 2011-06-01 22:06:53 -07:00
Friendika 969a25eab2 add titles to shared items if available 2011-06-01 06:41:12 -07:00
Friendika b8c4d73377 show group affiliations in contact editor 2011-05-31 19:24:26 -07:00
Friendika e25ded6d96 don't count wall posts in unseen network total 2011-05-31 17:35:24 -07:00
Friendika f95ea14478 show linked url on user's contact page 2011-05-30 22:17:04 -07:00
Friendika 9f52e311df sort wall items by date order instead of id. bug #61 2011-05-30 19:59:54 -07:00
Friendika 7fb9aa24fb bug #87 alert if email settings don't open mailbox, also display last email connect time 2011-05-29 21:20:50 -07:00
Friendika 547fd1e0e5 small fixes to item post to try and sort out segfault issues on php 5.3 (?) 2011-05-29 15:47:26 -07:00
Friendika 69f014d02b bug #38 ability to restrict profile, wall, photos from non-friends 2011-05-28 00:49:03 -07:00
Friendika 4e8a97f30a bug #38 posts and photos only visible to friends if so configured 2011-05-28 00:42:01 -07:00
Friendika 94af6fb064 correct nickname for display link on comment emails 2011-05-27 18:54:43 -07:00
Friendika 763ff827d5 don't reset photo permissions unless photo has owner-only permissions 2011-05-27 02:37:12 -07:00
Friendika 341f853b04 search from network page 2011-05-26 17:47:33 -07:00
Friendika 7acb8fa6e7 add webfinger diagnostic module 2011-05-26 16:41:36 -07:00
Friendika 3710a6fd07 sort out a couple of email notify issues 2011-05-25 18:15:49 -07:00
Friendika cd536731c3 minor string update 2011-05-25 17:20:41 -07:00
Friendika b6b2997b43 remove debug line 2011-05-25 16:02:02 -07:00
Fabio Comuni ad2aded259 Small tweak to a copule of translatable strings 2011-05-25 12:23:45 +02:00
Friendika 2a679b1164 file attachments 2011-05-25 02:08:15 -07:00
Friendika 73b4faca5c basic file upload/attach 2011-05-24 22:40:52 -07:00
Friendika e3d1ef8ef7 ability to hide profile and wall from unknown people 2011-05-24 16:30:52 -07:00
Friendika 040fc247a0 bug #85 2011-05-23 20:30:37 -07:00
Friendika 19ccd658eb Merge branch 'pull' 2011-05-23 18:18:01 -07:00
Friendika 78b2db3a98 Merge branch 'fabrixxm-master' 
Conflicts:
	boot.php
 2011-05-23 18:17:02 -07:00
Friendika 9a3f5eaf7d Merge pull request #107 from fabrixxm/oembed 
Oembed plugin
 2011-05-23 18:12:14 -07:00
Friendika 3e6180183b improved browser language detect, set user language on login 2011-05-23 17:18:36 -07:00
Fabio Comuni e1107b55c6 add info() function. Works like notice() but show messages in a div with class info-message. 
update code to use info() instead of notice() when appropriate (non-error message)
add info-message class style in themes
 2011-05-23 11:39:57 +02:00
Fabio Comuni 7c5a7a94d4 Add oembed user option for use oembed instead of standard yotube embedding. 
Remove global option and parse_url use of oembed.
 2011-05-23 10:37:09 +02:00
fabrixxm ef64c5187d add config [system][embed_all] to use oembed with links and youtube. Url parse fallback to default if url has not an oembed rappresentation. 2011-05-23 09:14:57 +02:00
Friendika 5996e2cd4c if no FB image and fb link is on our site, use Friendika logo for fb image. Otherwise it's going to end up being a random friend. 2011-05-22 21:20:28 -07:00
Friendika 576f8eda08 more buggy debugging code removed. 2011-05-22 20:18:39 -07:00
Friendika 44a22c2915 more improvements in twitter handling, reduce duplicates from FB when double friended 2011-05-22 18:40:00 -07:00
Friendika ea0a28ebfb removed buggy debug code ;) 2011-05-22 14:20:31 -07:00
Friendika 8510748b19 friendika page hook for German impressum 2011-05-22 01:15:04 -07:00
Chris Case f4cb6b9b08 fixed a couple of bugs 2011-05-21 23:19:50 -07:00
Chris Case 4cff911939 merged multipart email changes 2011-05-21 21:40:16 -07:00
Chris Case 2cf696d0b5 image updates 2011-05-21 19:27:56 -07:00
Friendika 1ccda19f7a hooks can't contain direct values, must be variables 2011-05-21 17:17:27 -07:00
Friendika 0dfcbe9c44 better handling of twitter follows, remove ajax anchor /#!/ 2011-05-21 17:13:51 -07:00
Friendika bc2297d933 don't insert link summaries containing javascript bug #75 2011-05-21 05:27:53 -07:00
Friendika 22cf6b3fe6 'mark seen' not getting all msgs on profile page 2011-05-20 19:28:48 -07:00
Friendika db60d6d78f photo upload plugin size limit is not working, call photo_end hooks in any error return from mainline so html does not leak into json responses bug #77 2011-05-20 15:57:58 -07:00
Friendika 0abf2f11c6 patches for youtube's change in link and embed formats, please test 2011-05-20 15:46:41 -07:00
Friendika 5f20925220 deny link not clickable on admin approval notification page 2011-05-20 15:11:36 -07:00
Friendika 681885a120 "notes" app 2011-05-20 01:15:02 -07:00
Friendika a6603a54d9 don't send any potentially large embeds over ajax so as to avoid huge prefetch downloads. Strip them out and provide a notice to reload page to view them. Ensures they will only be loaded once. 2011-05-18 20:34:18 -07:00
Friendika 990d5e82a0 doc updates - connecting to services 2011-05-18 17:29:12 -07:00
Friendika f9444c8be5 admin directory view 2011-05-16 18:52:27 -07:00
Friendika 730322ee5f bug #70 - error messages on group deletion, warning cleanup 2011-05-15 16:36:49 -07:00
Friendika df7a4206b7 fix json_encode on url's 2011-05-12 02:15:04 -07:00
Fabio Comuni 31aee6b803 missing / in admin profile url 2011-05-12 10:33:59 +02:00
Fabio Comuni 564f9c924a Serve friendika node info as json from url /friendika/json/ 2011-05-12 10:26:34 +02:00
Friendika b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Friendika a00813497f bring back load_view_file for dispy templates 2011-05-10 23:35:31 -07:00
Friendika 5eea0d5ecb photo lockview not working, temp fix for po2php 2011-05-10 20:10:13 -07:00
Friendika 2fffec912c leave extra line between imported url and content 2011-05-10 18:15:45 -07:00
Friendika c052d68828 don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version. 2011-05-10 16:12:50 -07:00
Friendika cb6c1f91b7 rolling version number in preparation for release 2011-05-09 16:51:25 -07:00
Friendika 3b51f28d25 comment macros showing on photos 2011-05-08 22:58:38 -07:00
Friendika c2e35d2d35 set permalink on uploaded photo items 2011-05-08 22:47:35 -07:00
Friendika 26d748f6d8 Merge pull request #96 from fabrixxm/api 
Status.net Api
 2011-05-05 04:29:45 -07:00
Friendika b3fa03d3b4 Merge pull request #95 from fabrixxm/dispy 
Dispy
 2011-05-05 04:29:14 -07:00
Fabio Comuni b3a5fccc9d template for photo display 2011-05-05 10:53:03 +02:00
Friendika eb2aae7987 missing is_public in editpost 2011-05-05 00:29:56 -07:00
Friendika 5f0b43485a incorrect count of total pages in normal view mode 2011-05-04 20:49:11 -07:00
Friendika 6c1d587ae3 notify not called on new photo album (first item) 2011-05-03 05:27:19 -07:00
Friendika 0f261ef8fa configurable FB poll interval, default 1hr. 2011-05-02 20:14:37 -07:00
Friendika 69dc17eb81 when viewing network group, show my private conversations to the group 2011-04-30 21:53:51 -07:00
Friendika d45ad7bb6b suppress duplicate FB posts (incoming after posted locally) 2011-04-27 04:24:00 -07:00
Friendika 242d4805d5 call post_local_end hook on like/dislike 2011-04-26 17:07:49 -07:00
Friendika a01c40a845 no insecure warning on FB connections 2011-04-26 05:45:53 -07:00
Friendika 245a56f0c1 lots of facebook fixes 2011-04-26 04:39:27 -07:00
Friendika a0e7d8fa00 redirect to profile photo upload on very first login 2011-04-23 17:31:23 -07:00
Friendika 639d52ec18 block_public should also block the contacts page and 'Connect' page if not logged in 2011-04-21 19:12:22 -07:00
Friendika eeb3c13ad3 when public access is blocked, profile page should show login box 2011-04-21 18:39:07 -07:00
Friendika 9e19eef194 "firewall" setting - block all public pages from the public if configured to do so 2011-04-21 17:29:47 -07:00
Friendika 1d4791d38c bin2hex not vice versa 2011-04-21 00:43:37 -07:00
Friendika 6e6d143aab another typo 2011-04-21 00:29:48 -07:00
Friendika 0803abcf53 typo 2011-04-21 00:27:35 -07:00
Fabio Comuni 793fc60a65 add rsd.xml (needs a template) 2011-04-21 09:08:50 +02:00
Fabio Comuni b505e76393 First attemp of api 2011-04-21 09:04:15 +02:00
Friendika a1ef8f669d don't show connect link to authenticated visitors 2011-04-20 15:27:10 -07:00
Friendika c0b7000a83 missing acl selector after merge 2011-04-20 05:51:02 -07:00
Friendika e302741e49 merge status editor instances 2011-04-20 05:48:12 -07:00
Friendika 0af6014c94 keep space before t() for legacy string puller 2011-04-20 05:00:58 -07:00
Friendika afe4cc8bfa pull request #91 fabrixxm (manual merge) 2011-04-20 04:50:12 -07:00
Friendika e0e3cc7a72 edit post broke with recent checkin 2011-04-19 22:37:17 -07:00
Friendika 3787e1e500 provide disclosure warning on private network page 2011-04-19 21:09:25 -07:00
Friendika d874a55178 per contact network page (link in photo menu) 2011-04-19 20:50:02 -07:00
Friendika 29a48de5e2 follow requests most adhere to site allow policy 2011-04-19 16:31:39 -07:00
Friendika a0179235d2 provide a way to disable mailbox integration 2011-04-18 20:20:04 -07:00
Friendika b168847b56 still getting a zero 2011-04-18 16:03:07 -07:00
Friendika e2c9d04b36 leave imap port blank if 0 2011-04-18 15:58:01 -07:00
Friendika ab099e9102 email integration, cont. 2011-04-17 23:27:11 -07:00
Friendika 863ddf1676 mail changes 2011-04-16 08:45:08 -07:00
Friendika 13eaa802e4 relocated "follow" url scraping code so it can be used elsewhere (contact repair, etc.) 2011-04-15 00:59:00 -07:00
Friendika 44c47f118c "profile locator/address" is now called "Identity Address" to reduce confusion 2011-04-14 20:37:42 -07:00
Friendika de131c9e58 set utf-8 on all emails 2011-04-14 17:13:13 -07:00
Friendika 54368e3a0d initial spanish translation 2011-04-14 02:34:43 -07:00
Friendika 974077c06c contact "repair/relocate URL" tool 2011-04-13 20:14:30 -07:00
Friendika 5198e039df better visibility of default post permissions 2011-04-13 17:11:24 -07:00
Friendika 17a7dae67d doco 2011-04-13 16:58:21 -07:00
Friendika 767f165965 local documentation library 2011-04-13 07:07:21 -07:00
Friendika d4bb560e7f small wording change 2011-04-12 21:37:54 -07:00
Friendika 4a514fa966 minor ui tweaks 2011-04-12 21:29:58 -07:00
Friendika 080efe4d1e missed file addition 2011-04-12 21:25:00 -07:00
Friendika e8a0dd40b2 profile visibility editor 2011-04-12 21:21:33 -07:00
Friendika f04e2e7044 edit group links on network page 2011-04-12 18:22:58 -07:00
Friendika 5654ce926c move all message display sub-functions from boot.php into conversation.php 2011-04-12 17:58:16 -07:00
Friendika 5545c8ada9 cleanup 2011-04-12 05:37:26 -07:00
Friendika 61915a524d first cut at group chooser UI 2011-04-12 01:31:55 -07:00
Friendika 6da84027af visual display of group members 2011-04-11 22:47:16 -07:00
Friendika 0ed2d19ac8 death to comment box oddities (a slow death as it will take some time for everybody to upgrade) 2011-04-11 20:11:21 -07:00
Friendika 0085bf0c10 that's better... 2011-04-11 16:42:41 -07:00
Friendika a4836ac1ba wallwall oddities on display page 2011-04-11 16:15:38 -07:00
Friendika ff15ea0993 wrong variable passed 2011-04-11 15:45:19 -07:00
Friendika c8f32536ff pull in new 'writable' dfrn flag 2011-04-11 03:22:09 -07:00
Friendika 9133a2384a all conversations unified except photos 2011-04-11 01:31:04 -07:00
Friendika a0956ee955 some w3c validation issues 2011-04-10 23:01:38 -07:00
Friendika a65c595b16 "display list of status items" moved to include/conversation.php, 
currently network module has been updated to use it for display, other modules to follow
with whatever special case code they require.
 2011-04-10 21:21:16 -07:00
Friendika 9341f2c4d6 little fix 2011-04-10 19:46:40 -07:00
Friendika 3d51518a13 set writable flag on dfrn_poll 2011-04-10 19:29:21 -07:00
Friendika 940d216395 initial dfrn update to pass perms 2011-04-10 18:38:55 -07:00
Friendika 12bc4a44cf [privacy] use owner's default permission settings on "is now friends with..." msg 2011-04-10 15:30:56 -07:00
Friendika 58508201a5 bug #37, ampersand + everything following in url is stripped when using link icon to share link 2011-04-10 03:36:12 -07:00
Friendika bf865f0210 bug #34, line breaks double in retweet/share 2011-04-10 03:00:29 -07:00
Fabio Comuni 1713ffb41c add opensearch support 2011-04-08 10:40:04 +02:00
Friendika e35a5bac55 the rest of the english html templates except for htconfig 2011-04-07 23:10:43 -07:00
Friendika 338ba48554 more templates 2011-04-07 18:00:35 -07:00
Friendika 5d5a94c88a comment open/close anomolies in non-English languages 2011-04-07 16:19:46 -07:00
Friendika 4043ede080 more templates 2011-04-06 23:03:54 -07:00
Friendika c32ed16303 more templates converted to string files 2011-04-06 22:42:08 -07:00
Friendika 6728a11ee3 support feed attachments/enclosures, and fix for bug #30 2011-04-06 19:42:35 -07:00
Friendika ded449f697 ostatus doesn't accept activitystreams stop-follow verb or multiple verbs, insists on single ostatus unfollow #non-standard 2011-04-05 23:06:03 -07:00
Friendika ee19746aa9 revert to regex search when < 3 chars 2011-04-05 06:27:40 -07:00
Friendika 4c5e091b78 better twitter follow support 2011-04-04 20:40:31 -07:00
Friendika 793967a1d3 better handling of troublesome feeds. 2011-04-04 19:36:18 -07:00
Friendika 742bdd3054 make photo menu work better on remote profile logins 2011-04-04 05:52:59 -07:00
Friendika 933de1769c item_photo_menu to display page 2011-04-04 02:54:09 -07:00
Friendika 94881c15d3 missed merge conflict tag 2011-04-04 01:26:04 -07:00
Friendika 379af25215 Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup 
Conflicts:
	mod/dfrn_poll.php
 2011-04-04 01:22:05 -07:00
Friendika b5bcf44354 profile not set 2011-04-04 01:18:28 -07:00
Fabio Comuni afa0d8ff70 fix profile redirect url in dfrn_poll 2011-04-04 09:50:25 +02:00
Fabio Comuni 92156cd840 Merge remote-tracking branch 'friendika-master/master' into iconpopup 2011-04-04 09:31:12 +02:00
Friendika 9b50b0e16f Public exposure warning on affected network group pages. config-able so a plugin can shut it up. 2011-04-03 20:41:40 -07:00
Friendika 4b356e59ec allow other destinations according to protocol 2011-04-01 14:39:09 -07:00
Friendika e33b6e0b5a redirect to symbolic rather than absolute URL locations 2011-04-01 00:59:10 -07:00
Friendika d728961cbf translateable time formats (PM & birthdays) 2011-03-31 14:46:16 -07:00
Fabio Comuni 29878d9c26 url \"/message/new/<id>\" preselect contact <id> in \"To\" select box 2011-03-31 16:54:06 +02:00
Fabio Comuni fe67c346e5 Moved popup logic in boot.php, added 'item_photo_menu' hook 2011-03-31 16:52:51 +02:00
Friendika 75ad3219e6 remote deletion - check contact-id 2011-03-30 17:50:18 -07:00
Friendika 0fe997490d dfrn remote profile protocol revision 2011-03-30 15:04:18 -07:00
Fabio Comuni 3f94721d62 first work 2011-03-30 17:10:14 +02:00
Friendika 04cd865cc9 placeholder arg in dfrn conversations 2011-03-30 04:20:40 -07:00
Friendika f198c5cff8 secure profile failure 2011-03-30 04:07:47 -07:00
Friendika 4aa60a7aaf oexchange 2011-03-29 21:59:28 -07:00
Friendika 066bdca30d optionally set article title 2011-03-29 18:57:26 -07:00
Friendika f1db34eebc more templates gone 2011-03-29 17:19:12 -07:00
Friendika 920396e402 off by one 2011-03-28 20:06:45 -07:00
Friendika 00b5f6f8a1 added comments, make typo checker work with redefined plural string functions 2011-03-28 17:24:11 -07:00
Friendika 1f6c6c466a author collapse: close off before pagination 2011-03-28 00:49:20 -07:00
Friendika 77fbd2f78c tweaks to author collapsing 2011-03-27 20:43:45 -07:00
Friendika 7defb1768b collapse posts by same author (but not you). 2011-03-27 20:37:44 -07:00
Friendika b57214cb78 wrong date order profile page 2011-03-27 19:59:27 -07:00
Friendika c962f5c4bc comment collapsing, pagination wasn't advancing past 16 2011-03-27 19:53:36 -07:00
Friendika 76918ed5a5 info page 2011-03-27 16:35:56 -07:00
Friendika 6bc5d6f17b repair duplicate nickname accounts caused by race condition 2011-03-24 15:45:27 -07:00
Friendika 51447932f7 link same as visited 2011-03-24 01:16:14 -07:00
Friendika 85e227151b use correct mime type for json 2011-03-22 16:52:14 -07:00
Friendika e0202d82a1 add fulltext index on keywords, missed some directory localisations 2011-03-22 16:34:12 -07:00
Friendika 8f31935b7d items back in personal data download, chunked this time 2011-03-22 16:19:00 -07:00
Friendika f20464112f remove items from export - too much memory consumed, will have to stream items,photos 2011-03-22 03:25:43 -07:00
Friendika 83a36cbd13 export posts also 2011-03-22 03:20:41 -07:00
Friendika c4b292a4f1 account/profile/contacts export 2011-03-22 03:07:46 -07:00
Friendika cd2a0802e4 horizontal match layout 2011-03-22 02:21:53 -07:00
Friendika ee11a74d0b profile match 2011-03-21 21:43:22 -07:00
Friendika c74367e4c2 pagination in keyword match 2011-03-21 21:26:11 -07:00
Friendika ee1dff9980 converted json to symbolic references 2011-03-21 19:44:00 -07:00
Friendika e16bca4f76 first prototype of profile match against global directory (hint: set some keywords) 2011-03-21 19:33:06 -07:00
Friendika f73e40c188 several install issues sorted out 2011-03-21 17:34:29 -07:00
Friendika d71db3e064 typo 2011-03-21 15:12:40 -07:00
Friendika 94cbf3bb80 another template down 2011-03-21 04:10:08 -07:00
Friendika 798c83b6aa localise some more templates 2011-03-21 00:21:35 -07:00
Friendika 5f9f03daf7 simplify insecure network warning 2011-03-20 19:29:01 -07:00
Friendika b7292bc673 user pref -> block remote wall posting 2011-03-20 17:54:50 -07:00
fabrixxm c1144912e2 small fix 2011-03-20 08:38:42 +01:00
Friendika 7e33c1072a stuff to make connecting to diaspora profiles easier 2011-03-19 01:19:11 -07:00
Friendika 9838245c6c Merge branch 'gettext' of https://github.com/fabrixxm/friendika into fabrixxm-gettext 2011-03-18 05:07:42 -07:00
Friendika 43234a6678 rework post editing a bit 2011-03-18 05:06:16 -07:00
Fabio Comuni 7df8e18dd1 Update more strings 2011-03-18 11:02:42 +01:00
Friendika ce754bc0e2 edit to display page 2011-03-18 01:24:34 -07:00
Friendika 9f5201dcaa edit posting after submission 2011-03-18 00:30:34 -07:00
Friendika ea03d9fa86 more thorough cleanup on account/contact removal 2011-03-17 21:15:27 -07:00
Friendika 47f0abf27e no sharing icon for private msgs 2011-03-16 22:04:00 -07:00
Friendika 9d9176f87e no sharing from thread display page 2011-03-16 21:49:28 -07:00
Friendika 334353e502 vorbis audio/video link buttons 2011-03-16 21:14:22 -07:00
Friendika 8fd989c568 protect tags from double expansion during RT 2011-03-16 19:57:13 -07:00
Friendika 3f432a7b82 share,retweet,relay,forward, whatever 2011-03-16 19:36:59 -07:00
Friendika f01538a54f content expiration 2011-03-15 17:31:49 -07:00
Friendika 53dcede278 pub_keywords -> meta keywords 2011-03-14 20:19:45 -07:00
Friendika 7b92b42603 keywords split into public and private. Public will be used by the friend finder. 2011-03-14 00:28:49 -07:00
fabrixxm a7af6df962 Fix spaces around t() and tt() 2011-03-13 13:50:44 +01:00
Friendika ee210718cc photo album prev/next links 2011-03-11 20:06:13 -08:00
Friendika 5e2f0ff055 roll back "real people preferred" message - ineffectual 2011-03-11 14:48:58 -08:00
Friendika 508636082e bogus 'no results' message on search page 2011-03-10 20:46:27 -08:00
fabrixxm 9f7878057f update source strings 2011-03-11 00:22:21 +01:00
Friendika 2270e73fcd show permission denied photo when direct link was accessed and authentication is insufficient to view 2011-03-09 21:29:32 -08:00
Friendika 35c3e12df5 ability to edit image permissions 2011-03-09 21:10:16 -08:00
Friendika 5f54503780 Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixxm-issue-11 2011-03-09 00:17:47 -08:00
Friendika 0de88eb6b0 yet another template converted to language neutral format 2011-03-08 18:53:52 -08:00
Fabio Comuni 33264dc294 Add title attribute to location links 2011-03-08 16:50:10 +01:00
Friendika c248b28f92 indicate preference to register/communicate-with real people and not fictitious entities. 2011-03-08 04:06:37 -08:00
Friendika 6ff6ac4743 profile deletion issues 2011-03-08 00:39:42 -08:00
Friendika 989b1b209e one more template free from translation, allow for later item editing within jot.tpl 2011-03-07 19:58:22 -08:00
Friendika fb481e0b2f sparkle link enhancements to display page 2011-03-07 17:04:26 -08:00
Friendika 58eba782cf more tweaks #13 2011-03-06 19:48:46 -08:00
Friendika 26c4054652 more improvements on sparkle links bug #13 2011-03-06 19:43:03 -08:00
Friendika 7f1f18675c sparkle links for friends-of-friends, bug #13 2011-03-06 19:24:01 -08:00
Friendika fecef140d5 new item view: sparkle links not redirecting 2011-03-04 21:27:38 -08:00
Friendika 216f038456 icon changes, feed security improvements 2011-03-04 20:55:32 -08:00
Friendika 71d4810697 photo in mail message getting bogus response 2011-03-03 20:58:39 -08:00
Friendika bfdf4bddc9 "New Item View" had no magic sparkle links 2011-03-02 16:19:38 -08:00
Friendika b8740a0a9c add manage file 2011-03-01 20:36:24 -08:00
Friendika 377f991ac5 switch identities to manage pages 2011-03-01 20:18:47 -08:00
Friendika 2d4b3bee60 qsearch_limit, not lsearch 2011-02-28 23:39:59 -08:00
Friendika 80ed4242ee singleuser site mode plus fix search template layout 2011-02-28 19:44:47 -08:00
Friendika f089b1610e feeds: update content when updated/edited changes 2011-02-28 18:24:32 -08:00
Friendika 3308a69320 increase visibility of group filter 2011-02-28 02:56:46 -08:00
Friendika 6ea77889b3 simplify connect/follow text 2011-02-27 18:11:15 -08:00
Friendika 9102fb3a6f autodiscover community pages for the directory 2011-02-27 14:17:42 -08:00
Friendika 05d3eb59ec status.net mentions to non-followers require the numeric profile URL, not the nickname profile URL. Though it works when they are a follower. 2011-02-26 01:53:18 -08:00
Friendika 4efa0f1e81 newline at EOF 2011-02-25 19:57:44 -08:00
Friendika 597d09de1f handle group results without parsing anything 2011-02-25 19:56:38 -08:00
Friendika ee4800a4d3 auto-complete contact/group endpoint 2011-02-25 15:28:07 -08:00
Friendika c3cb3d75e5 use consistent tagging patterns with relationship partner 2011-02-25 12:12:25 -08:00
Friendika 1207bb1b55 silence parse_url on hostile input, need to get_app() for proc_run php location 2011-02-24 15:41:15 -08:00
Friendika 5641532936 yet another template 2011-02-24 02:46:06 -08:00
Friendika c98ed12e10 generalise wallwall template and fix "via wall-to-wall" float 2011-02-24 02:32:46 -08:00
Friendika 755c2245e8 move php path setting inside proc_run 2011-02-23 15:16:12 -08:00
Friendika fdc469ae4c move directory registration block before redirect 2011-02-23 14:04:00 -08:00
Friendika 365ff94137 push directory on register - if permitted 2011-02-23 01:37:15 -08:00
Friendika f57f9852b1 pulled strings from one more template 2011-02-22 15:35:33 -08:00
Friendika 5f2f644064 resolve file inclusion conflicts w/ multiple plugins, improve the typo checker 2011-02-21 20:19:33 -08:00
Friendika c10879efdd default publish to directory, but offer registration privacy setting. 
generalise publish option template - so once translated we can merge them all.
Update strings.
 2011-02-21 16:50:06 -08:00
Friendika 079e63bba9 Merge branch 'themetests' of https://github.com/fabrixxm/friendika into fabrixxm-themetests 2011-02-21 13:27:03 -08:00
Friendika 0a7b3c111e convert html entities on conversational emails 2011-02-21 00:20:55 -08:00
Friendika af0fe4cf42 Merge branch 'chriscase-master' 
Conflicts:
	mod/dfrn_notify.php
 2011-02-20 01:42:11 -08:00
Chris Case 9260bb4ce1 updated private message code to use the new EmailNotification library 2011-02-19 05:35:01 -08:00
Friendika 3d1b153dec apps menu file 2011-02-19 01:01:33 -08:00
Friendika 0bf8e418a8 Merge branch 'chriscase-master' 
Conflicts:
	mod/dfrn_notify.php
 2011-02-17 14:05:51 -08:00
Chris Case 9e654f7e57 removed localized multipart email templates, now the multipart settings are configured directly in the code 2011-02-17 13:41:56 -08:00
Fabio Comuni 3d69e2a50c Merge branch 'master' into themetests 2011-02-17 14:14:06 +01:00
Friendika 979307ef91 ajax testing continues 2011-02-17 00:52:26 -08:00
Friendika f7b2f9f5e7 convert update script arg passing to js - remembering the browser prefetch issues 2011-02-17 00:40:35 -08:00
Friendika 3cc63f2e6f issues found when testing all live network modes 2011-02-16 23:18:43 -08:00
Friendika 0435236192 error return for update process when invalid group 2011-02-16 23:10:18 -08:00
Friendika 9f8b6dff1c ajax live update for all network pages and subpages 2011-02-16 23:05:48 -08:00
Friendika 4bff52990e ajax reload fixes 2011-02-16 21:17:49 -08:00
Friendika c397a2f89b properly handle error returns in post w/ajax 2011-02-16 20:25:10 -08:00
Friendika 67bb737aa1 broken image + linkify site link in body 2011-02-16 17:49:52 -08:00
Friendika 527e050ecc sanitise all incoming url's - also stop them from getting mangled by simplepie 2011-02-16 17:32:15 -08:00
Friendika 9f1f9da89b Merge branch 'chriscase-master' 2011-02-16 14:41:12 -08:00
Friendika d6998ffef2 small fixes 2011-02-16 13:19:54 -08:00
Chris Case 2169329547 forgot to check this in earlier... splits up text and html into two different templates and base64 encodes them 2011-02-16 08:05:10 -08:00
Fabio Comuni dc15e8640d duepuntozero: show desc on image in albums 2011-02-16 12:49:16 +01:00
Friendika acce5c95a3 set contact permissions on photos uploaded to private messages 2011-02-16 03:14:45 -08:00
Friendika 9f02057374 provide permalink for posts, include permalinks in feeds and imported from feeds 2011-02-16 02:07:11 -08:00
Friendika 473786d3a0 Merge branch 'chriscase-master' 2011-02-15 03:45:40 -08:00
Chris Case 0d853433eb fixed error which was causing multiple line breaks, added comments to better document what is occuring, cleaned up code, removed unnecessary parameters from templating step 2011-02-15 03:31:20 -08:00
Friendika 1dea6a2d71 wrong return url for ajax comments on display and photos pages 2011-02-14 20:21:28 -08:00
Chris Case 7b26500510 Merge remote branch 'upstream/master' 2011-02-14 11:50:08 -08:00
Chris Case 42eb6dd723 fixed a bbcode issue with rich text html messages, fixed some issues with plain text. 2011-02-14 05:44:27 -08:00
Friendika fe1a37074a Merge branch 'chriscase-master' 2011-02-14 05:06:16 -08:00
Friendika b87ddbd58a Merge branch 'ajaxcomms' 
Conflicts:
	view/comment_item.tpl
 2011-02-14 04:46:49 -08:00
Friendika df20990753 ajax comments 2011-02-14 04:43:49 -08:00
Chris Case 5eebb373e5 revamped private message templates, added multipart messages with text and html versions, updated de, en, fr and it. Translated the french version of the private message template. 2011-02-14 03:59:54 -08:00
Chris Case f98ba371cf updated private message notification to use HTML, still need the foreign language message notifications updated 2011-02-13 14:55:48 -08:00
Friendika 2d542e0f98 receiving comment notifications for conversations we aren't "involved" in 2011-02-12 22:29:32 -08:00
Friendika 3d9845f4a4 preliminary ajax comment setups 2011-02-12 03:14:59 -08:00
Friendika c16e86add8 toggles "post to facebook, post to twitter", etc. 2011-02-11 02:35:19 -08:00
Friendika 2e78ed00f6 general purpose callback landing page - e.g. for facebook plugin 2011-02-10 00:32:09 -08:00
Friendika 40777b132b log ignored pubsub deliveries 2011-02-09 19:56:40 -08:00
Friendika de2c9531db post permission hooks 2011-02-09 19:39:49 -08:00
Friendika f70a0b0282 more graceful handling of some statusnet followups 2011-02-08 18:44:30 -08:00
Friendika 766c4778cb modify tag handling and replies to stnet 2011-02-08 15:08:07 -08:00
Friendika 9a1e5aaf09 tweaks to reworked remote deletion, which also fixes some comment box oddities 2011-02-08 05:08:10 -08:00
Friendika d8cd693f11 rework remote deletion 2011-02-08 04:25:27 -08:00
Friendika 9f5d3000c7 don't change photo visibility if only album name was changed 2011-02-07 21:16:39 -08:00
Friendika 18c5d1ff90 feed cleanup 2011-02-07 17:06:04 -08:00
Friendika 147d7f3bbf theme name cleanup - rename default to loozah, provide sane fallbacks and change system primary theme. 
Provide indication on contact edit page of last update success/failure - can be extended later to
show actual timestamp of last successful update.
 2011-02-06 15:50:50 -08:00
Friendika 4e63b0acb9 ensure that jot_plugins inherit '$visitor' correctly 2011-02-06 01:08:12 -08:00
Friendika d322bb4613 Merge branch 'fabrixxm-master' 2011-02-05 13:06:20 -08:00
Friendika 1d0d765344 more error checking on posts 2011-02-04 13:37:04 -08:00
Friendika 2a9bfae2b7 prevent runaway notifications when parent=0 due to race condition 2011-02-04 04:25:53 -08:00
Fabio Comuni fb7959cfc0 Add a link to user photos in Upload Profile Photo page 2011-02-04 10:30:56 +01:00
Fabio Comuni d72f248b3c Allow to set a photo from albums as profile photo 2011-02-04 10:18:28 +01:00
Friendika 5c98032893 Merge branch 'photos' of https://github.com/fabrixxm/friendika into fabrixxm-photos 2011-02-03 23:25:33 -08:00
Friendika ac3cbe380f found the issue - remove the extra tracing stuff 2011-02-03 19:39:04 -08:00
Friendika c6b00f7230 allow parentless items from SN - add more tracing on notify failures 2011-02-03 17:40:04 -08:00
Friendika e2c8bedfe5 allow changing album name in photo edit page 2011-02-03 15:13:38 -08:00
fabrixxm b5c3fb1545 remove an erroneously pasted line 2011-02-03 19:42:32 +01:00
Fabio Comuni c15c550a06 Fix tabs 2011-02-03 17:25:10 +01:00
Fabio Comuni bed0391e6f Show lock info on photos 2011-02-03 17:24:58 +01:00
Fabio Comuni 9b3131861f Extend lockview to show info on items, photos and events 2011-02-03 17:20:40 +01:00
Friendika a4cbdc2414 remove self 2011-02-03 03:58:47 -08:00
Friendika 1a18f4bcde get media-rss thumbnail if available and nothing else was found (e.g. github). 2011-02-02 17:32:25 -08:00
Friendika fce9988f73 backward compatibility 2011-02-01 22:45:46 -08:00
Friendika a347d040f0 protocol reversal, roll dfrn_version to 2.1 2011-02-01 21:21:47 -08:00
Friendika 777c47aaa6 silence a few notice warnings 2011-02-01 20:23:58 -08:00
Friendika 8c5c07b265 don't try to scrape atom/rss feeds. missing param in contact store (mod_follow) 2011-02-01 14:55:29 -08:00
Friendika b4f2aac7e7 truncate long names 2011-02-01 14:09:47 -08:00
Friendika 837cce8a75 email cc recipients (front end) 2011-01-31 19:07:13 -08:00
Friendika 8965db24cc post to email recips (backend) 2011-01-31 18:18:28 -08:00
Friendika 3eefe8b500 more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors 2011-01-30 19:38:03 -08:00
Friendika e8d52d879b more debugging to see if the google push hub is even trying to publish our content. 2011-01-30 15:28:50 -08:00
Friendika c012843282 identify email-only contacts 2011-01-29 23:47:40 -08:00
Friendika 26cc2e02fe Merge branch 'fabrixxm-master' 
Conflicts:
	boot.php
 2011-01-28 18:50:20 -08:00
Friendika 33037754d8 removed java photo uploader from mainline. Photo uploaders are now plugins, but a single item upload is available by default. 2011-01-27 18:45:19 -08:00
Friendika 620aae5b50 still not quite ready for the big photos rollover 2011-01-27 03:55:40 -08:00
Friendika 076c25e103 Revert "Revert "roll version - now in alpha 2.1"" 
This reverts commit e8a3166fa9.
 2011-01-27 03:52:18 -08:00
Friendika e8a3166fa9 Revert "roll version - now in alpha 2.1" 
This reverts commit df4f77dadd.
 2011-01-27 03:50:56 -08:00
Friendika df4f77dadd roll version - now in alpha 2.1 2011-01-27 03:46:09 -08:00
Friendika d2dddd995a set update frequency to twice daily for 'feed' contacts, unable to set update frequency on contact edit form. 2011-01-26 20:29:32 -08:00
Friendika 05350082fa Merge branch 'oembed' of https://github.com/fabrixxm/friendika into fabrixxm-oembed 2011-01-26 13:59:20 -08:00
Fabio Comuni 4a2c0fcc36 Add 'jot_tool' hook, plugins can add tool icons. 2011-01-26 16:17:28 +01:00
Friendika c7ace10ffb dissolve relationship (new protocol) working 2011-01-26 02:32:00 -08:00
Friendika abbd498a8b whitespace only 2011-01-26 00:19:54 -08:00
Friendika bb5ad77e2a smilies on new item view 2011-01-25 05:26:12 -08:00
Friendika 5a7ff660c4 "unfriend" protocol 2011-01-25 03:57:10 -08:00
Friendika 08d6fe5ae7 allow RSS for feed contacts, but no comments 2011-01-24 19:36:20 -08:00
Friendika f5674558ca propagate name changes to 'self' contact record 2011-01-24 18:18:47 -08:00
fabrixxm e9251499dd Added proc_run() and modified all occurrence of proc_close(proc_open()) to use proc_run() 2011-01-24 22:00:02 +01:00
Friendika 163e614a3b don't translate CR-LF 2011-01-24 03:08:20 -08:00
Friendika 205a2b8930 owner's sparkle link, sometimes not author's - on display page 2011-01-23 21:26:09 -08:00
Friendika 5be98e3ec8 following random feeds 2011-01-23 20:09:34 -08:00
Friendika 00d2b58358 fix a few issues with code blocks, ignore tags within blocks, fold multi-line blocks to one, also turn html br into two LFs. 2011-01-23 16:29:30 -08:00
Friendika 1460fc0d71 add cc-license text to all content pages 2011-01-23 14:56:14 -08:00
Friendika 950e5f6693 given a tag @foo, don't also link/replace words like food in msg body 2011-01-23 13:49:21 -08:00
Friendika f278d17910 wrong verb in dislike activity body 2011-01-22 03:59:13 -08:00
Friendika a80ab19483 typo 2011-01-22 02:51:31 -08:00
Friendika c0a0710f97 incorrect item owner on like/dislike activity body when remote-auth profile 2011-01-21 12:20:05 -08:00
Friendika d347026094 don't urlencode $_GET vars 2011-01-21 05:21:13 -08:00
Friendika aeb585fee1 profile edit hooks 2011-01-20 15:30:45 -08:00
Friendika 623ae24109 per fabrix, except do the login "on page" 2011-01-20 14:25:44 -08:00
fabrixxm 28ebbe38d6 Netwok page redirect to login page if not local_user 2011-01-20 20:19:20 +01:00
Friendika 2ffe0d0b1d do a better job of comparing same URLs. 2011-01-19 19:51:34 -08:00
Friendika d59585d89d fix context links 2011-01-19 18:31:04 -08:00
Friendika b1d67c8d3c network view all item types by date 2011-01-19 17:56:36 -08:00
Friendika e7c5f9e7de undo sql change in f9f018ef08 (02-DEC-2010), not relevant and incorrect 2011-01-19 14:19:40 -08:00
Friendika 3da2b24951 list network page (parent items) by creation date thx:fabrix 2011-01-18 19:41:30 -08:00
Friendika b40281802f personal title 2011-01-18 19:25:28 -08:00
Friendika 3811923c14 put birthday reminders on default network page, add smileys to private mail 2011-01-16 16:40:09 -08:00
Friendika f4ebd2a213 Don't send conversation slaps, only immediate replies. Redundant and flawed. 2011-01-16 14:58:07 -08:00
Friendika e7ae4ad3fa cannot pass null by reference 2011-01-14 14:56:13 -08:00
Friendika 5bfb0ba4c2 birthday notifications working 2011-01-13 20:28:33 -08:00
Friendika b0a03c328f Merge branch 'dev' 2011-01-13 02:07:57 -08:00
Friendika 5559893293 event and birthday data structures 2011-01-13 02:01:00 -08:00
Friendika 9d6f3aa4dd add owner's birthday information to feed (if allowed to) 2011-01-12 21:04:49 -08:00
Friendika 2d80c601df string extraction 2011-01-12 12:44:22 -08:00
Friendika 1c7dc1879c removed function was still referenced 2011-01-11 14:05:40 -08:00
Friendika 2a269e0c18 use default system theme for system pages 2011-01-07 04:33:34 -08:00
Friendika 0147520e90 add contact edit hooks 2011-01-07 03:15:52 -08:00
Friendika ffbdad7041 friend request homecoming - ensure login redirects back to confirmation page, 
prune old introductions that remain blocked over 30 minutes.
 2011-01-07 02:57:26 -08:00
Friendika 502d59089b schema typo 2011-01-06 23:41:14 -08:00
Friendika fd1abe1c54 undo freesans temporarily due to poor legibility. 2011-01-06 13:26:25 -08:00
Friendika 95ec0767d8 plugin settings were getting changed 2011-01-05 13:10:47 -08:00
Friendika 1b0ddc928d make home tab work from remote profile, fix link in comment notify emails 2011-01-05 01:53:34 -08:00
Friendika f257569713 couple minor issues with reg queue 2011-01-04 23:31:51 -08:00
Friendika 95507cf90f secure admin hijacking from openid 2011-01-04 23:18:52 -08:00
Friendika bb0c24bd4f prevent admin hijacks 2011-01-04 22:17:58 -08:00
fabrixxm ea978af9c1 Merge branch 'friendika-master' 2011-01-04 14:48:19 +01:00
fabrixxm 0df91fd9a2 Manage user registrations in REGISTER_APPROVE mode. 2011-01-04 14:46:08 +01:00
Friendika 64628c800d provide "return home" key 2011-01-04 05:06:10 -08:00
Friendika 15c81716e8 much better solution to privacy on ajax wall photos 2011-01-04 02:01:07 -08:00
Friendika f057cc3a70 missing pagination in photo collections 2011-01-04 00:06:36 -08:00
Friendika 20cc007655 set permissions of uploaded wall photo to match those of the 
associated status post.
 2011-01-03 23:05:20 -08:00
Friendika 7ae8486b36 settings: ensure system theme is default selection 2011-01-03 21:55:21 -08:00
Friendika 0cba6b128a fix typo, check for empty group in network page 2011-01-03 13:53:26 -08:00
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