aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-04-0113-44/+174
|\
| * try slightly better detection of html in feedsfriendica2012-04-011-3/+4
| * Merge branch 'pull'friendica2012-04-011-1/+1
| |\
| | * line 86: s/Friendika/Friendica/Simon2012-04-011-1/+1
| * | send unverified private mail using zrlfriendica2012-04-011-0/+85
| |/
| * more error handlingfriendica2012-03-312-1/+4
| * handle escaped file chars in display and searchfriendica2012-03-312-8/+5
| * escape % in file_tag_query as it is ultimately embedded in a sprintffriendica2012-03-311-0/+4
| * warning cleanupfriendica2012-03-301-1/+0
| * catch OpenID login errors in cases when the OpenID server does not answersTobias Diekershoff2012-03-301-1/+5
| * rename "file as" to "save to folder"friendica2012-03-302-3/+3
| * bug #352 - qcomment plugin disabled, qcomments still allowedfriendica2012-03-301-2/+5
| * another silly mistakefriendica2012-03-291-3/+3
| * silly mistakefriendica2012-03-291-2/+3
| * zrl on mentionsfriendica2012-03-291-0/+6
| * use zrl to get home againfriendica2012-03-294-17/+31
| * typo in function namefriendica2012-03-291-3/+2
| * some reported warnings cleaned upfriendica2012-03-283-8/+11
| * Merge branch 'pull'friendica2012-03-288-73/+311
| |\
| * | improved rw notificationsfriendica2012-03-281-0/+11
* | | Several improvementsMichael Vogel2012-03-312-2/+6
| |/ |/|
* | 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
| | |_|/ | |/| |