aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-1721-12/+184
|\
| * no birthdays for nonexistent contactsFriendika2011-03-161-0/+2
| * no sharing icon for private msgsFriendika2011-03-162-2/+4
| * no sharing from thread display pageFriendika2011-03-161-1/+1
| * vorbis audio/video link buttonsFriendika2011-03-1611-6/+93
| * small position adjustmentFriendika2011-03-161-1/+1
| * protect tags from double expansion during RTFriendika2011-03-161-0/+4
| * share,retweet,relay,forward, whateverFriendika2011-03-1617-3/+80
* | Merge github.com:tobiasd/friendikaTobias Diekershoff2011-03-161-4/+0
|\ \
| * | resolved some local git quirksTobias Diekershoff2011-03-131-4/+0
* | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-1628-65/+380
|\ \ \ | |/ / |/| / | |/
| * facebook parses out punctuation on the left of links but not on rightFriendika2011-03-151-1/+1
| * content expirationFriendika2011-03-1515-20/+165
| * revupFriendika2011-03-151-1/+1
| * fix youtube videos that use https:// urlsFriendika2011-03-151-1/+1
| * Merge branch 'ffind'Friendika2011-03-142-1/+6
| |\
| | * pub_keywords -> meta keywordsFriendika2011-03-142-1/+6
| * | force last-child on foster children, disallow time travelFriendika2011-03-141-0/+23
| |/
| * revupFriendika2011-03-141-1/+1
| * keywords split into public and private. Public will be used by the friend fin...Friendika2011-03-1410-34/+75
| * friend finder support functionsFriendika2011-03-131-0/+41
| * friend finder data structuresFriendika2011-03-133-2/+38
| * Merge branch 'omigeot-master'Friendika2011-03-132-7/+14
| |\
| | * Autodetect browser language (should we make this optional?)olivierm2011-03-081-1/+8
| | * Merge remote branch 'mike/master'olivierm2011-03-0849-498/+652
| | |\
| | * \ Merge commit 'mike/master'olivierm2011-03-031-0/+5
| | |\ \
| | * | | Slight change in strings (now guess better whether 'likes' are plural or sing...olivierm2011-03-021-6/+6
| * | | | non-code changeFriendika2011-03-131-1/+2
| * | | | don't let somebody install with a bogus db hostname as this seems to lead to ...Friendika2011-03-132-1/+17
* | | | | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-03-1341-128/+1675
|\| | | |
| * | | | Swedish translationFriendika2011-03-123-0/+1223
| * | | | photo album prev/next linksFriendika2011-03-113-2/+62
| * | | | roll back "real people preferred" message - ineffectualFriendika2011-03-112-2/+4
| * | | | bogus 'no results' message on search pageFriendika2011-03-103-10/+3
| * | | | never enough commentsFriendika2011-03-101-5/+33
| * | | | allowed_email matching $host instead of $domainFriendika2011-03-091-1/+1
| * | | | show permission denied photo when direct link was accessed and authentication...Friendika2011-03-092-0/+18
| * | | | ability to edit image permissionsFriendika2011-03-095-4/+37
| * | | | bring loozah theme up to date, move name slightly lowerFriendika2011-03-092-15/+40
| * | | | automated versioningFriendika2011-03-093-15/+16
| * | | | fb "post by default" implemented, post_by_default logic fixed for other pluginsFriendika2011-03-094-10/+38
| * | | | Merge branch 'fabrixxm-issue-11'Friendika2011-03-091-2/+5
| |\ \ \ \
| | * \ \ \ Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixx...Friendika2011-03-091-2/+5
| | |\ \ \ \
| | | * | | | Update search_item.tplFabio Comuni2011-03-091-2/+5
| * | | | | | EOFFriendika2011-03-091-1/+1
| * | | | | | reload plugins if they changeFriendika2011-03-094-5/+62
| |/ / / / /
| * | | | | Merge branch 'issue-11' of https://github.com/fabrixxm/friendika into fabrixx...Friendika2011-03-095-26/+62
| |\| | | |
| | * | | | reworked wall-to-wall styleFabio Comuni2011-03-091-16/+11
| | * | | | reworked items templateFabio Comuni2011-03-083-15/+56
| | * | | | Add title attribute to location linksFabio Comuni2011-03-082-6/+6