aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'upstream/master'Michael Vogel2012-04-065-0/+82
|\
| * also block outboundfriendica2012-04-041-0/+5
| * log disabled requestsfriendica2012-04-041-2/+6
| * fix config storage of booleansfriendica2012-04-041-0/+1
| * bug: diaspora_enabled setting turns it on but doesn't fully turn it off.friendica2012-04-041-0/+8
| * make contact ssl_policy change a function since it is used in a few placesfriendica2012-04-023-86/+50
| * more ssl policy fixes and prevent delivery to soapbox when using local deliveryfriendica2012-04-022-0/+100
* | Merge commit 'upstream/master'Michael Vogel2012-04-025-2/+162
|\|
| * remove zrl from query stringfriendica2012-04-021-0/+3
| * catch a couple more Oo smiliesfriendica2012-04-011-0/+4
| * add title to D* postsfriendica2012-04-011-1/+5
| * allow users to set categories on their postsMichael Johnston2012-04-013-0/+142
| * slight improvement in handling of plaintext feedsfriendica2012-04-011-2/+9
| * that didn't quite work outfriendica2012-04-011-2/+2
* | New script that checks if a script is runningMichael Vogel2012-04-011-0/+32
* | poller: An optional lockfile is used to check if the poller is already runningMichael Vogel2012-04-011-0/+10
* | 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