aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* stuffFriendika2011-10-1125-195/+324
* Merge branch 'pull'Friendika2011-10-1025-209/+169
|\
| * Merge pull request #27 from fabrixxm/masterfabrixxm2011-10-103-5/+7
| |\
| | * Fix url in profile tabsFabio Comuni2011-10-103-5/+7
| * | Merge pull request #26 from fabrixxm/masterfabrixxm2011-10-1025-209/+167
| |\|
| | * New common tab template. Update cssFabio Comuni2011-10-1025-209/+167
* | | revupFriendika2011-10-101-1/+1
|/ /
* / bug #177 - birthday month on profile incorrect if October or later and no yearFriendika2011-10-101-1/+1
|/
* redoFriendika2011-10-101-0/+10
* more notification cleanup duepuntozeroFriendika2011-10-092-2/+5
* some notification text cleanup and notification page layout fixes for duepunt...Friendika2011-10-093-15/+22
* Merge branch 'pull'Friendika2011-10-091-1/+1
|\
| * Merge pull request #25 from duthied/masterduthied2011-10-081-1/+1
| |\
| | * fix for comment on line 117 from githubDevlon Duthie2011-10-091-1/+1
| |/
* / add first,last to D* vcardFriendika2011-10-092-1/+20
|/
* Merge pull request #24 from duthied/masterduthied2011-10-081-6/+14
|\
| * added sorting to drop-down notifications list, added posts to this list as we...Devlon Duthie2011-10-081-6/+14
|/
* Merge pull request #23 from duthied/masterduthied2011-10-082-3/+15
|\
| * added posts to network section of the notifications pageDevlon Duthie2011-10-082-3/+15
* | Merge branch 'pull'Friendika2011-10-081-2/+2
|\ \
| * | Merge pull request #22 from duthied/masterduthied2011-10-081-2/+2
| |\|
| | * fix for z-index on wall-to-wall avatars in testbubble themeDevlon Duthie2011-10-081-2/+2
* | | Merge branch 'pull'Friendika2011-10-082-4/+13
|\| |
| * | Merge pull request #21 from duthied/masterduthied2011-10-082-4/+13
| |\|
| | * fix for 'show all notifications' on notifications drop-down to handle install...Devlon Duthie2011-10-082-4/+13
| |/
* / revupFriendika2011-10-081-1/+1
|/
* bug #175 - hide_help config option not workingFriendika2011-10-085-5/+6
* missing arg to diaspora_transmit from share/unshareFriendika2011-10-072-3/+3
* Merge pull request #20 from duthied/masterduthied2011-10-0612-130/+326
|\
| * Anne set testbubble banner to be fixed, I added the other notification types ...Devlon Duthie2011-10-0712-130/+326
|/
* local_deliver testingFriendika2011-10-064-662/+85
* local deliver 1Friendika2011-10-061-0/+664
* revupFriendika2011-10-061-1/+1
* check author url to see if it matches current contact before relay is acceptedFriendika2011-10-061-0/+8
* use strpos instead of strstr, fasterFriendika2011-10-051-1/+1
* ensure D* photos only attached onceFriendika2011-10-051-5/+7
* bug 173Friendika2011-10-051-0/+42
* provide ability to repair contact photoFriendika2011-10-053-1/+33
* mostly cosmetic changes to make DB tables accurately reflect the conversation...Friendika2011-10-054-7/+11
* Merge branch 'pull'Friendika2011-10-051-1/+1
|\
| * Merge pull request #19 from tobiasd/masterFriendika2011-10-051-1/+1
| |\
| | * 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
| |\ \ \ \
| | * | | | 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
| |\ \ \ \