aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* 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
* | Merge pull request #80 from unary/darkzeroSimon2012-03-041-0/+8
|\ \
| * | improved contrast in acl selector, and preview (darkzero)Michael Johnston2012-03-041-0/+8
* | | Merge pull request #82 from simonlnu/masterSimon2012-03-041-6/+24
|\ \ \
| * | | more ui thingies with dispy - we'll get you well dispy, we promiseSimon L'nu2012-03-041-6/+24
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-045-24/+27
| |\ \ \
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-040-0/+0
| | |/ / | |/| |
* | | | Merge branch 'pull'friendica2012-03-043-22/+25
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #81 from tomtom84/mastertomtom842012-03-043-22/+25
| |\ \ \
| | * | | fixes in diabooktommy tomson2012-03-053-14/+18
| | | |/ | | |/|
| | * | style.css fixtommy tomson2012-03-041-10/+9
* | | | wrap title and text for editplain in zero and TB themesfriendica2012-03-043-5/+6
* | | | correct owner info from misconfigured installs, duepuntozero title block misp...friendica2012-03-042-1/+25
|/ / /
* | | unused replacement variable displays %1 in all html2bbcode 'code' blocksfriendica2012-03-041-1/+1
* | | Merge branch 'pull'friendica2012-03-043-44/+87
|\ \ \ | | |/ | |/|
| * | Merge pull request #79 from simonlnu/masterSimon2012-03-041-5/+6
| |\ \