aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* added exceptions to dba classAlexander Kampmann2012-04-091-188/+248
* API: API is now enhanced. mentions, repeat and destroy now works.Michael Vogel2012-04-081-9/+142
* Merge commit 'upstream/master'Michael Vogel2012-04-0750-2/+14
|\
| * ignore utf8 offset error for unit testsfriendica2012-04-071-1/+3
| * some work on testsfriendica2012-04-071-1/+1
| * ignore removed pluginsfriendica2012-04-061-2/+9
| * fix messed up config tables w/ duplicate entriesfriendica2012-04-061-1/+1
| * revert config changes, we're getting duplicate keysfriendica2012-04-061-151/+147
| * Merge branch 'pull'friendica2012-04-0550-147/+151
| |\
| | * Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-0555-150/+837
| | |\
| | * | added index to config and pconfig tableAlexander Kampmann2012-04-051-152/+154
| * | | pass autoname(0) testfriendica2012-04-051-0/+3
| | |/ | |/|
* | | 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
|\| |