aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-03-2824-128/+282
|\
| * filer: info() on item filedFabio Comuni2012-03-281-0/+1
| * profile_tabs hookfriendica2012-03-271-1/+1
| * don't expire filed itemsfriendica2012-03-271-0/+5
| * theme description with preview (non-translatable unfortunately)friendica2012-03-261-0/+1
| * preparation for some possibly killer featuresfriendica2012-03-261-6/+4
| * language issues in enotifyfriendica2012-03-261-5/+9
| * don't include friend suggestions for people with the same name as current con...friendica2012-03-251-2/+6
| * theme screenshotsfriendica2012-03-251-0/+10
| * enotify plugin hookfriendica2012-03-251-2/+24
| * NOTIFY_SYSTEMfriendica2012-03-251-1/+6
| * improved the inivitations and added a bit of sales pitch.friendica2012-03-241-3/+1
| * bug #346 - add oembed maxwidth to oembed requestfriendica2012-03-241-2/+3
| * prevent duplicate friend suggestionsfriendica2012-03-241-0/+9
| * block filed items from deletionfriendica2012-03-242-4/+4
| * ability to change tags in edited postsfriendica2012-03-222-5/+22
| * prevent re-registrations using a deleted username - not an issue with Friendi...friendica2012-03-221-0/+6
| * support lowercase :-p smiliefriendica2012-03-211-0/+2
| * remove stray template variable from old codefriendica2012-03-201-2/+1
| * more friend suggestionsfriendica2012-03-201-1/+1
| * change default profile photo to something more interesting than a reddish bro...friendica2012-03-203-5/+5
| * add IP address to failed login log messagefriendica2012-03-191-1/+2
| * Merge pull request #152 from beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657...friendica2012-03-191-24/+2
| |\
| | * modified: include/text.phpThomas2012-03-191-3/+2
| | * modified: include/text.phpThomas2012-03-191-21/+0
| * | Merge pull request #150 from fabrixxm/masterfriendica2012-03-191-1/+1
| |\ \
| | * \ Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-1920-141/+640
| | |\ \
| | * | | add 'loggin_out' hookFabio Comuni2012-03-121-1/+1
| * | | | refactor openid logins/registrationsfriendica2012-03-191-25/+4
| | |_|/ | |/| |
| * | | some openid fixes, use identity url from openid server and normalise it.friendica2012-03-191-0/+3
| | |/ | |/|
| * | support "no_smilies"friendica2012-03-191-0/+5
| * | Merge pull request #149 from CatoTH/masterSimon2012-03-191-8/+12
| |\ \
| | * | Existing photos could not be used as profile photos anymore - should be fixed...Tobias Hößl2012-03-191-8/+12
| * | | community discovery cont., cleanup of DB debuggingfriendica2012-03-185-17/+47
| |/ /
| * | CSRF-Protection in the group-related form (creating, renaming and dropping a ...Tobias Hößl2012-03-181-0/+6
| * | replace split() by explode(); split is deprecatedTobias Hößl2012-03-182-2/+2
| * | bug #337, call template_unescape() only at the end of template processingfriendica2012-03-173-4/+4
| * | queue optimisation - back off delivery attempts to once per hour after the fi...friendica2012-03-171-3/+8
| * | template processor broken with foreach k=>v and k is integer 0friendica2012-03-171-1/+1
| * | add "send pm" link to photo dropdown for Diaspora contactsfriendica2012-03-161-0/+11
| * | Merge branch 'pull'friendica2012-03-161-6/+8
| |\ \
| | * \ Merge pull request #141 from CatoTH/masterSimon2012-03-161-6/+8
| | |\ \
| | | * | Use tabindex to enable easy navigation in the dialog to write private mails; ...Tobias Hößl2012-03-161-6/+8
| * | | | wrong link in d* comment notificationsfriendica2012-03-161-1/+1
| |/ / /
| * | | bug #335 network search broken after new ssl policy settingsfriendica2012-03-161-1/+1
| * | | whitespacefriendica2012-03-161-0/+1
| * | | notification for disapora commentsfriendica2012-03-161-0/+42
| |/ /
| * | Merge branch 'pull'friendica2012-03-157-63/+305
| |\ \
| * | | track whether contact is a community page or notfriendica2012-03-151-0/+5
* | | | New parameter in html2plain for plain text exports. More compatibility in APIMichael Vogel2012-03-212-17/+83