Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'upstream/master' | Michael Vogel | 2012-03-28 | 24 | -128/+282 |
|\ | |||||
| * | filer: info() on item filed | Fabio Comuni | 2012-03-28 | 1 | -0/+1 |
| | | |||||
| * | profile_tabs hook | friendica | 2012-03-27 | 1 | -1/+1 |
| | | |||||
| * | don't expire filed items | friendica | 2012-03-27 | 1 | -0/+5 |
| | | |||||
| * | theme description with preview (non-translatable unfortunately) | friendica | 2012-03-26 | 1 | -0/+1 |
| | | |||||
| * | preparation for some possibly killer features | friendica | 2012-03-26 | 1 | -6/+4 |
| | | |||||
| * | language issues in enotify | friendica | 2012-03-26 | 1 | -5/+9 |
| | | |||||
| * | don't include friend suggestions for people with the same name as current ↵ | friendica | 2012-03-25 | 1 | -2/+6 |
| | | | | | | | | contacts. This will remove a lot of #whoaretonybaldwin. | ||||
| * | theme screenshots | friendica | 2012-03-25 | 1 | -0/+10 |
| | | |||||
| * | enotify plugin hook | friendica | 2012-03-25 | 1 | -2/+24 |
| | | |||||
| * | NOTIFY_SYSTEM | friendica | 2012-03-25 | 1 | -1/+6 |
| | | |||||
| * | improved the inivitations and added a bit of sales pitch. | friendica | 2012-03-24 | 1 | -3/+1 |
| | | |||||
| * | bug #346 - add oembed maxwidth to oembed request | friendica | 2012-03-24 | 1 | -2/+3 |
| | | |||||
| * | prevent duplicate friend suggestions | friendica | 2012-03-24 | 1 | -0/+9 |
| | | |||||
| * | block filed items from deletion | friendica | 2012-03-24 | 2 | -4/+4 |
| | | |||||
| * | ability to change tags in edited posts | friendica | 2012-03-22 | 2 | -5/+22 |
| | | |||||
| * | prevent re-registrations using a deleted username - not an issue with ↵ | friendica | 2012-03-22 | 1 | -0/+6 |
| | | | | | | | | Friendica but could create a serious privacy issue with federated platforms | ||||
| * | support lowercase :-p smilie | friendica | 2012-03-21 | 1 | -0/+2 |
| | | |||||
| * | remove stray template variable from old code | friendica | 2012-03-20 | 1 | -2/+1 |
| | | |||||
| * | more friend suggestions | friendica | 2012-03-20 | 1 | -1/+1 |
| | | |||||
| * | change default profile photo to something more interesting than a reddish ↵ | friendica | 2012-03-20 | 3 | -5/+5 |
| | | | | | | | | brown square | ||||
| * | add IP address to failed login log message | friendica | 2012-03-19 | 1 | -1/+2 |
| | | |||||
| * | Merge pull request #152 from ↵ | friendica | 2012-03-19 | 1 | -24/+2 |
| |\ | | | | | | | | | | | | | beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27 Smiley removal | ||||
| | * | modified: include/text.php | Thomas | 2012-03-19 | 1 | -3/+2 |
| | | | | | | | | | | | | Stupid bug fixed | ||||
| | * | modified: include/text.php | Thomas | 2012-03-19 | 1 | -21/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png Removed selected smiley per Mike's request. Also removed deprecated smileys that were just commented out. | ||||
| * | | Merge pull request #150 from fabrixxm/master | friendica | 2012-03-19 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Add "logging_out" hook | ||||
| | * \ | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-19 | 20 | -141/+640 |
| | |\ \ | |||||
| | * | | | add 'loggin_out' hook | Fabio Comuni | 2012-03-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | refactor openid logins/registrations | friendica | 2012-03-19 | 1 | -25/+4 |
| | |_|/ | |/| | | |||||
| * | | | some openid fixes, use identity url from openid server and normalise it. | friendica | 2012-03-19 | 1 | -0/+3 |
| | |/ | |/| | |||||
| * | | support "no_smilies" | friendica | 2012-03-19 | 1 | -0/+5 |
| | | | |||||
| * | | Merge pull request #149 from CatoTH/master | Simon | 2012-03-19 | 1 | -8/+12 |
| |\ \ | | | | | | | | | Add a missing security token [Using photos as profile photos] | ||||
| | * | | Existing photos could not be used as profile photos anymore - should be ↵ | Tobias Hößl | 2012-03-19 | 1 | -8/+12 |
| | | | | | | | | | | | | | | | | fixed now. And some extra logging in the CSRF-Protection to make debugging easier | ||||
| * | | | community discovery cont., cleanup of DB debugging | friendica | 2012-03-18 | 5 | -17/+47 |
| |/ / | |||||
| * | | CSRF-Protection in the group-related form (creating, renaming and dropping a ↵ | Tobias Hößl | 2012-03-18 | 1 | -0/+6 |
| | | | | | | | | | | | | group, adding/removing members from it) | ||||
| * | | replace split() by explode(); split is deprecated | Tobias Hößl | 2012-03-18 | 2 | -2/+2 |
| | | | |||||
| * | | bug #337, call template_unescape() only at the end of template processing | friendica | 2012-03-17 | 3 | -4/+4 |
| | | | |||||
| * | | queue optimisation - back off delivery attempts to once per hour after the ↵ | friendica | 2012-03-17 | 1 | -3/+8 |
| | | | | | | | | | | | | first 12 hours. | ||||
| * | | template processor broken with foreach k=>v and k is integer 0 | friendica | 2012-03-17 | 1 | -1/+1 |
| | | | |||||
| * | | add "send pm" link to photo dropdown for Diaspora contacts | friendica | 2012-03-16 | 1 | -0/+11 |
| | | | |||||
| * | | Merge branch 'pull' | friendica | 2012-03-16 | 1 | -6/+8 |
| |\ \ | |||||
| | * \ | Merge pull request #141 from CatoTH/master | Simon | 2012-03-16 | 1 | -6/+8 |
| | |\ \ | | | | | | | | | | | Private messages - tabindex | ||||
| | | * | | Use tabindex to enable easy navigation in the dialog to write private mails; ↵ | Tobias Hößl | 2012-03-16 | 1 | -6/+8 |
| | | | | | | | | | | | | | | | | | | | | Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button | ||||
| * | | | | wrong link in d* comment notifications | friendica | 2012-03-16 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | bug #335 network search broken after new ssl policy settings | friendica | 2012-03-16 | 1 | -1/+1 |
| | | | | |||||
| * | | | whitespace | friendica | 2012-03-16 | 1 | -0/+1 |
| | | | | |||||
| * | | | notification for disapora comments | friendica | 2012-03-16 | 1 | -0/+42 |
| |/ / | |||||
| * | | Merge branch 'pull' | friendica | 2012-03-15 | 7 | -63/+305 |
| |\ \ | |||||
| * | | | track whether contact is a community page or not | friendica | 2012-03-15 | 1 | -0/+5 |
| | | | | |||||
* | | | | New parameter in html2plain for plain text exports. More compatibility in API | Michael Vogel | 2012-03-21 | 2 | -17/+83 |
| | | | |