aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #31 from tobiasd/mastertobiasd2011-10-171-1/+0
|\
| * reverted rewrite baseTobias Diekershoff2011-10-171-1/+0
|/
* Merge pull request #30 from fabrixxm/masterfabrixxm2011-10-1716-419/+307
|\
| * another fix to tabs in notificationsFabio Comuni2011-10-171-3/+0
| * fix buttons in quattroFabio Comuni2011-10-173-22/+19
| * fix tabs in notificationsFabio Comuni2011-10-171-7/+5
| * works on login formFabio Comuni2011-10-179-157/+85
| * Merge remote-tracking branch 'friendika/master'Fabio Comuni2011-10-1744-293/+1121
| |\ | |/ |/|
* | Merge pull request #29 from tobiasd/mastertobiasd2011-10-162-6/+0
|\ \
| * | video button only for dispy and quattroTobias Diekershoff2011-10-172-6/+0
|/ /
* | working on long-term solution to relay issueFriendika2011-10-155-16/+27
* | diaspora birthday notificationsFriendika2011-10-147-11/+90
* | handle diaspora profile update messageFriendika2011-10-131-0/+78
* | remove queued items for contact when removing contactFriendika2011-10-131-0/+4
* | don't propagate deletions for other people's stuffFriendika2011-10-132-1/+12
* | missing arg xmlize x is friends with yFriendika2011-10-131-1/+1
* | sql issue item_storeFriendika2011-10-133-4/+4
* | Merge branch 'pull'Friendika2011-10-123-0/+437
|\ \
| * \ Merge pull request #28 from tobiasd/mastertobiasd2011-10-123-0/+437
| |\ \
| | * | better do all the buttons (quattro)Tobias Diekershoff2011-10-122-8/+2
| | * | little bit more for quattroTobias Diekershoff2011-10-122-2/+2
| | * | some work on quattro themeTobias Diekershoff2011-10-123-0/+443
| |/ /
* / / storage race conditionFriendika2011-10-121-8/+17
|/ /
* | common tabs to notifications and mailFriendika2011-10-114-34/+63
* | solve intro/notify naming issue by providing both or either, theme decides wh...Friendika2011-10-112-3/+6
* | add contact_widgets and provide widgets on appropriate pages, fix the saved s...Friendika2011-10-119-44/+90
* | stuffFriendika2011-10-1125-195/+324
* | Merge branch 'pull'Friendika2011-10-1025-209/+169
|\ \
| * \ Merge pull request #27 from fabrixxm/masterfabrixxm2011-10-103-5/+7
| |\ \
| * \ \ Merge pull request #26 from fabrixxm/masterfabrixxm2011-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
| | | * common_tabs in notifications.phpFabio Comuni2011-10-102-16/+22
| | | * Remove full profile html from php and add new template 'profile_advanced.tpl'Fabio Comuni2011-10-102-227/+191
| | |/
| | * Fix url in profile tabsFabio Comuni2011-10-103-5/+7
| |/
| * New common tab template. Update cssFabio Comuni2011-10-1025-209/+167
|/
* 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