| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-06 | 98 | -2520/+7789 |
| |\ |
|
| | * | Merge pull request #92 from tomtom84/master | tomtom84 | 2012-03-05 | 9 | -9/+42 |
| | |\ |
|
| | | * | add img | tommy tomson | 2012-03-06 | 1 | -0/+0 |
| | | * | Merge remote-tracking branch 'origin/master' | tommy tomson | 2012-03-06 | 12 | -477/+648 |
| | | |\
| | |/
| |/| |
|
| | * | | Merge branch 'pull' | friendica | 2012-03-05 | 1 | -1/+2 |
| | |\ \ |
|
| | | * \ | Merge pull request #91 from unary/darkzero | Simon | 2012-03-05 | 1 | -1/+2 |
| | | |\ \ |
|
| | | | * | | changed bg color around comment box from white to match page background, impr... | Michael Johnston | 2012-03-05 | 1 | -1/+2 |
| | | |/ / |
|
| | * | | | some admin page fixes and cleanup | friendica | 2012-03-05 | 4 | -6/+17 |
| | * | | | string update | friendica | 2012-03-05 | 1 | -414/+568 |
| | |/ / |
|
| | * | | Merge branch 'pull' | friendica | 2012-03-05 | 1 | -2/+2 |
| | |\ \ |
|
| | | * \ | Merge pull request #90 from simonlnu/master | Simon | 2012-03-05 | 1 | -2/+2 |
| | | |\ \ |
|
| | | | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 0 | -0/+0 |
| | | | |\ \
| | | |/ /
| | |/| | |
|
| | | | * | | forgot a small change in .field_help | Simon L'nu | 2012-03-05 | 1 | -2/+2 |
| | * | | | | some testbubble stuff | friendica | 2012-03-05 | 3 | -31/+37 |
| | * | | | | Merge branch 'pull' | friendica | 2012-03-05 | 1 | -22/+16 |
| | |\| | | |
|
| | | * | | | Merge pull request #89 from simonlnu/master | Simon | 2012-03-05 | 1 | -22/+16 |
| | | |\| | |
|
| | | | * | | implement more of the changes requested | Simon L'nu | 2012-03-05 | 1 | -22/+16 |
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 0 | -0/+0 |
| | | |/ / |
|
| | * / / | can_write_wall documentation | friendica | 2012-03-05 | 1 | -1/+6 |
| | |/ / |
|
| | * | | Merge branch 'pull' | friendica | 2012-03-05 | 5 | -57/+67 |
| | |\ \ |
|
| | * | | | revup | friendica | 2012-03-05 | 1 | -1/+1 |
| | | | * | fixes in diabook | tommy tomson | 2012-03-06 | 6 | -4/+16 |
| | | | * | fixes | tommy tomson | 2012-03-05 | 4 | -5/+26 |
| | | |/ |
|
| | | * | Merge pull request #88 from simonlnu/master | Simon | 2012-03-05 | 4 | -37/+49 |
| | | |\ |
|
| | | | * | multiple fixes; the jot-header works as standalone, not sure what's up. | Simon L'nu | 2012-03-05 | 4 | -37/+49 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 0 | -0/+0 |
| | | |/ |
|
| | | * | Merge pull request #87 from simonlnu/master | Simon | 2012-03-05 | 2 | -3/+4 |
| | | |\ |
|
| | | | * | tweak sizing of <section> and <aside> more; fix link in 'view contacts' in si... | Simon L'nu | 2012-03-05 | 2 | -3/+4 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 0 | -0/+0 |
| | | |/ |
|
| | | * | Merge pull request #86 from simonlnu/master | Simon | 2012-03-05 | 2 | -18/+14 |
| | | |\ |
|
| | | | * | still working on jot-header. amending <aside> and other elements | Simon L'nu | 2012-03-05 | 2 | -18/+14 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 0 | -0/+0 |
| | | |/ |
|
| | | * | Merge pull request #85 from simonlnu/master | Simon | 2012-03-05 | 1 | -2/+3 |
| | |/| |
|
| | | * | hopefully fix the overflow issue everywhere this time | Simon L'nu | 2012-03-05 | 1 | -2/+3 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 0 | -0/+0 |
| | |/ |
|
| | * | $name appearing on testbubble items | friendica | 2012-03-05 | 1 | -1/+1 |
| | * | Merge branch 'pull' | friendica | 2012-03-05 | 1 | -14/+23 |
| | |\ |
|
| | | * | Merge pull request #84 from simonlnu/master | Simon | 2012-03-04 | 1 | -14/+23 |
| | | |\ |
|
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 3 | -7/+7 |
| | | | |\
| | | |/
| | |/| |
|
| | | | * | yet more ui things, and bug fixing | Simon L'nu | 2012-03-05 | 1 | -14/+23 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-04 | 0 | -0/+0 |
| | * | | | testbubble notifications | friendica | 2012-03-05 | 3 | -6/+13 |
| | |/ / |
|
| | * | | Merge pull request #83 from tomtom84/master | tomtom84 | 2012-03-04 | 3 | -7/+7 |
| | |\ \
| | |/
| |/| |
|
| | | * | like dislike button | tommy tomson | 2012-03-05 | 2 | -0/+0 |
| | | * | fixes in diabook | tommy tomson | 2012-03-05 | 3 | -21/+25 |
| | * | | Merge pull request #80 from unary/darkzero | Simon | 2012-03-04 | 1 | -0/+8 |
| | |\ \ |
|
| | | * | | improved contrast in acl selector, and preview (darkzero) | Michael Johnston | 2012-03-04 | 1 | -0/+8 |
| | * | | | Merge pull request #82 from simonlnu/master | Simon | 2012-03-04 | 1 | -6/+24 |
| | |\ \ \ |
|
| | | * | | | more ui thingies with dispy - we'll get you well dispy, we promise | Simon L'nu | 2012-03-04 | 1 | -6/+24 |
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-04 | 5 | -24/+27 |
| | | |\ \ \ |
|
