aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'pull'Friendika2011-10-051-1/+1
|\
| * Merge pull request #19 from tobiasd/masterFriendika2011-10-051-1/+1
| |\ | | | | | | link Diaspora* to the foundation homepage
| | * 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 branch 'master' of git://github.com/friendika/Free-FriendikaTobias Diekershoff2011-09-290-0/+0
| | |\ \
| | * \ \ Merge branch 'master' of git://github.com/friendika/Free-FriendikaTobias Diekershoff2011-09-2926-462/+134
| | |\ \ \
* | | | | | clean up w3c validation and layout for priv mail and lang selectorFriendika2011-10-058-11/+17
|/ / / / /
* | | | | Merge branch 'pull'Friendika2011-10-052-33/+123
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #18 from duthied/masterduthied2011-10-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | tweak to notification drop-down line items in testbubble theme
| | * | | | wrapped notification line item with the anchros tag instead of the inner, ↵Devlon Duthie2011-10-051-1/+1
| |/ / / / | | | | | | | | | | | | | | | makes the whole line item a link (better)
| * | | | Merge pull request #17 from duthied/masterduthied2011-10-052-33/+123
| |\ \ \ \ | | | | | | | | | | | | drop-down notification menu support added to testbubble theme
| | * | | | - added drop-down notification support in testbubble themeDevlon Duthie2011-10-052-33/+123
| | | | | |
* | | | | | better check for orig post authorFriendika2011-10-052-2/+2
|/ / / / /
* | | | | 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
|\ \ \ \ | | | | | | | | | | Minor ui tweaks
| * | | | - moved the header for profile permissions out of the scrolling divDevlon Duthie2011-10-043-10/+30
| | | | | | | | | | | | | | | | | | | | - tweaks to the testbubble theme's nav
* | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | some work on quattro theme and a little fix to JS
| * | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | / / / / | | |_|_|/ / / / | |/| | | | | | templated 'find similar' content + extended match content in testbubble theme
| * | | | | | | broke 'find similar' matches content into a tpl in core, added an extended ↵Devlon Duthie2011-10-034-54/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tpl to testbubble that lists the profile tags
* | | | | | | | Merge branch 'pull'Friendika2011-10-023-14/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge pull request #13 from duthied/masterduthied2011-10-023-14/+25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | message tab styling - to set as active depending on url
| | * | | | | | | added activetab var to message.php for templatesDevlon Duthie2011-10-023-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (testbubble only) added logic to photo header to make tab 'sticky' (active class for styling) (testbubble only) css fix for avatars in wallitems
| | * | | | | | | 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
| |\| | | | | | | | | | |/ / / / / / / | |/| | | | | | | testbubble photo album image tweaks