aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | revupfriendica2012-03-061-1/+1
| |/ / / /
| * | | | remove "smilie" expansion for Diaspora logofriendica2012-03-061-2/+2
| * | | | prevent duplicate likesfriendica2012-03-061-0/+25
| * | | | Merge branch 'pull'friendica2012-03-069-9/+42
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge pull request #92 from tomtom84/mastertomtom842012-03-059-9/+42
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | add imgtommy tomson2012-03-061-0/+0
| | | * | Merge remote-tracking branch 'origin/master'tommy tomson2012-03-0612-477/+648
| | | |\ \ | | | |/ / | | |/| |
| | | * | fixes in diabooktommy tomson2012-03-066-4/+16
| | | * | fixestommy tomson2012-03-054-5/+26
| * | | | finalise spam storage model, begin driver changes.friendica2012-03-051-5/+29
| |/ / /
| * | | Merge branch 'pull'friendica2012-03-051-1/+2
| |\ \ \
| | * \ \ Merge pull request #91 from unary/darkzeroSimon2012-03-051-1/+2
| | |\ \ \
| | | * | | changed bg color around comment box from white to match page background, impr...Michael Johnston2012-03-051-1/+2
| | |/ / /
| * | | | some admin page fixes and cleanupfriendica2012-03-054-6/+17
| * | | | string updatefriendica2012-03-051-414/+568
| |/ / /
| * | | Merge branch 'pull'friendica2012-03-051-2/+2
| |\ \ \
| | * \ \ Merge pull request #90 from simonlnu/masterSimon2012-03-051-2/+2
| | |\ \ \
| | | * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| | | |\ \ \ | | | |/ / / | | |/| | |
| | | * | | forgot a small change in .field_helpSimon L'nu2012-03-051-2/+2
| * | | | | some testbubble stufffriendica2012-03-053-31/+37
| * | | | | Merge branch 'pull'friendica2012-03-051-22/+16
| |\| | | |
| | * | | | Merge pull request #89 from simonlnu/masterSimon2012-03-051-22/+16
| | |\| | |
| | | * | | implement more of the changes requestedSimon L'nu2012-03-051-22/+16
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| | |/ / /
| * / / / can_write_wall documentationfriendica2012-03-051-1/+6
| |/ / /
* | | | mergedAlexander Kampmann2012-03-07112-2723/+7901
|\| | |
| * | | Merge branch 'pull'friendica2012-03-055-57/+67
| |\| |
| | * | Merge pull request #88 from simonlnu/masterSimon2012-03-054-37/+49
| | |\ \
| | | * | multiple fixes; the jot-header works as standalone, not sure what's up.Simon L'nu2012-03-054-37/+49
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| | |/ /
| | * | Merge pull request #87 from simonlnu/masterSimon2012-03-052-3/+4
| | |\ \
| | | * | tweak sizing of <section> and <aside> more; fix link in 'view contacts' in si...Simon L'nu2012-03-052-3/+4
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| | |/ /
| | * | Merge pull request #86 from simonlnu/masterSimon2012-03-052-18/+14
| | |\ \
| | | * | still working on jot-header. amending <aside> and other elementsSimon L'nu2012-03-052-18/+14
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| | |/ /
| | * | Merge pull request #85 from simonlnu/masterSimon2012-03-051-2/+3
| | |\ \
| | | * | hopefully fix the overflow issue everywhere this timeSimon L'nu2012-03-051-2/+3
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-050-0/+0
| | |/ /
| * / / revupfriendica2012-03-051-1/+1
| |/ /
| * | $name appearing on testbubble itemsfriendica2012-03-051-1/+1
| * | Merge branch 'pull'friendica2012-03-051-14/+23
| |\ \
| | * \ Merge pull request #84 from simonlnu/masterSimon2012-03-041-14/+23
| | |\ \
| | | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-053-7/+7
| | | |\ \ | | | |/ / | | |/| |
| | | * | yet more ui things, and bug fixingSimon L'nu2012-03-051-14/+23
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| * | | | testbubble notificationsfriendica2012-03-053-6/+13
| |/ / /
| * | | Merge pull request #83 from tomtom84/mastertomtom842012-03-043-7/+7
| |\ \ \ | | |/ / | |/| |
| | * | like dislike buttontommy tomson2012-03-052-0/+0
| | * | fixes in diabooktommy tomson2012-03-053-21/+25