aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* point Diaspora* to the foundation homepage instead of joindiaspora.comTobias Diekershoff2011-10-051-1/+1
* Merge branch 'master' of git://github.com/friendika/Free-FriendikaTobias Diekershoff2011-10-0585-2961/+1745
|\
| * Merge pull request #18 from duthied/masterduthied2011-10-051-1/+1
| |\
| | * wrapped notification line item with the anchros tag instead of the inner, mak...Devlon Duthie2011-10-051-1/+1
| |/
| * Merge pull request #17 from duthied/masterduthied2011-10-052-33/+123
| |\
| | * - added drop-down notification support in testbubble themeDevlon Duthie2011-10-052-33/+123
| * | added prepare_body hooksFriendika2011-10-051-0/+6
| * | document backward compat issueFriendika2011-10-041-0/+4
| * | yikesFriendika2011-10-042-2/+2
| * | another typoFriendika2011-10-041-1/+1
| * | and a typo fixFriendika2011-10-041-1/+1
| * | notification issue after last checkinFriendika2011-10-041-1/+9
| * | performance enhancementsFriendika2011-10-045-8/+22
| |/
| * Merge pull request #16 from duthied/masterduthied2011-10-043-10/+30
| |\
| | * - moved the header for profile permissions out of the scrolling divDevlon Duthie2011-10-043-10/+30
| * | urlescape saved search termsFriendika2011-10-041-1/+1
| * | document multi-pass mode on consume_feedFriendika2011-10-041-0/+11
| * | Merge branch 'pull'Friendika2011-10-042-392/+969
| |\ \
| | * | Updated french locale.Olivier Migeot2011-10-042-394/+971
| | * | Merge remote branch 'upstream/master'Olivier Migeot2011-10-04467-15528/+23770
| | |\ \
| | * | | Small fixOlivier Migeot2011-08-242-2/+2
| * | | | improve feed import performanceFriendika2011-10-043-13/+13
| * | | | lrdd attributes for zot changedFriendika2011-10-041-7/+5
| | |/ / | |/| |
| * | | tagmatch available to anon, add paging variable to queryFriendika2011-10-032-11/+9
| * | | item_store: prevent storing a duplicate item with same uri+uidFriendika2011-10-031-0/+8
| * | | Merge pull request #15 from fabrixxm/masterFriendika2011-10-038-89/+107
| |\ \ \
| | * | | move call to ping before call to update_*Fabio Comuni2011-10-031-8/+9
| | * | | fix typoFabio Comuni2011-10-032-13/+14
| | * | | quattro: add comment boxFabio Comuni2011-10-035-67/+83
| | * | | Merge remote-tracking branch 'friendika/master'Fabio Comuni2011-10-0354-2355/+331
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'friendika/master'Fabio Comuni2011-09-3088-693/+2651
| | |\ \ \ \
| | * | | | | fix star icon viewing profile page as unlogged userFabio Comuni2011-09-301-1/+1
| * | | | | | add tagmatchFriendika2011-10-031-0/+54
| * | | | | | removing another potential way a post could have a zero parent.Friendika2011-10-031-0/+5
| * | | | | | ?f did not have = after itFriendika2011-10-031-1/+1
| * | | | | | Merge pull request #14 from duthied/masterduthied2011-10-024-54/+48
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | broke 'find similar' matches content into a tpl in core, added an extended tp...Devlon Duthie2011-10-034-54/+48
| * | | | | Merge branch 'pull'Friendika2011-10-023-14/+25
| |\ \ \ \ \
| | * | | | | Merge pull request #13 from duthied/masterduthied2011-10-023-14/+25
| | |\| | | |
| | | * | | | added activetab var to message.php for templatesDevlon Duthie2011-10-023-14/+25
| | | * | | | Merge branch 'master' of http://github.com/friendika/Free-FriendikaDevlon Duthie2011-10-0247-2292/+188
| | | |\ \ \ \
| * | | | | | | Merge branch 'pull'Friendika2011-10-023-26/+54
| |\| | | | | |
| | * | | | | | Merge pull request #12 from duthied/masterduthied2011-10-023-26/+54
| | |\| | | | | | | | |/ / / / | | |/| | | |
| | | * | | | aspect ratio fixes for photos in testbubble themeDevlon Duthie2011-10-023-26/+54
| * | | | | | basic support for AS friend requestsFriendika2011-10-022-10/+38
| |/ / / / /
| * | | | | attack of the zombie orphansFriendika2011-10-022-0/+5
| * | | | | fix notifications duepuntozeroFriendika2011-10-022-1/+11
| * | | | | malformed xml in pingFriendika2011-10-021-1/+1
| * | | | | Merge pull request #11 from duthied/masterFriendika2011-10-012-14/+25
| |\| | | |
| | * | | | class and wrapper div added to photo for aspect ratio displayDevlon Duthie2011-10-012-14/+25