| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-14 | 81 | -708/+7818 |
| |\ |
|
| | * | add links to home, profile, photos, events, notes to aside in network-stream | tommy tomson | 2012-03-14 | 6 | -3/+189 |
| | * | fix css | tommy tomson | 2012-03-13 | 1 | -1/+1 |
| | * | Merge pull request #127 from tomtom84/master | tomtom84 | 2012-03-12 | 44 | -1490/+2 |
| | |\ |
|
| | | * | use fancybox instead of lightbox | tommy tomson | 2012-03-13 | 44 | -1490/+2 |
| | * | | Merge pull request #126 from tomtom84/master | tomtom84 | 2012-03-12 | 6 | -4/+72 |
| | |\| |
|
| | | * | fixes | tommy tomson | 2012-03-12 | 6 | -4/+72 |
| | * | | Merge pull request #125 from tomtom84/master | tomtom84 | 2012-03-12 | 59 | -45/+1667 |
| | |\| |
|
| | | * | add lightbox, fixex in css | tommy tomson | 2012-03-12 | 59 | -45/+1667 |
| | * | | Merge branch 'pull' | friendica | 2012-03-12 | 1 | -17/+18 |
| | |\ \ |
|
| | | * | | fix dispy-dark photo album stuff | Simon L'nu | 2012-03-11 | 1 | -17/+18 |
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 0 | -0/+0 |
| | * | | | more save to file backend | friendica | 2012-03-11 | 1 | -1/+55 |
| | * | | | backend for "save to file" feature | friendica | 2012-03-11 | 2 | -7/+33 |
| | |/ / |
|
| | * | | Merge pull request #124 from simonlnu/master | Simon | 2012-03-11 | 7 | -130/+147 |
| | |\ \ |
|
| | | * | | fix dispys' css and layout | Simon L'nu | 2012-03-11 | 7 | -130/+147 |
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 3 | -3/+3 |
| | | |\ \
| | |/ /
| |/| | |
|
| | * | | | Merge branch 'pull' | friendica | 2012-03-11 | 2 | -7/+29 |
| | |\ \ \ |
|
| | * | | | | community meta tag renamed from "ika" | friendica | 2012-03-11 | 3 | -3/+3 |
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 0 | -0/+0 |
| | | |/ / |
|
| | | * | | Merge pull request #123 from simonlnu/master | Simon | 2012-03-11 | 1 | -1/+1 |
| | | |\ \ |
|
| | | | * | | screwed up on the font-size for screen last push | Simon L'nu | 2012-03-11 | 1 | -1/+1 |
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 0 | -0/+0 |
| | | |/ / |
|
| | | * | | Merge pull request #122 from simonlnu/master | Simon | 2012-03-11 | 2 | -1/+14 |
| | | |\ \ |
|
| | | | * | | add some '@media handheld' types for dispys | Simon L'nu | 2012-03-11 | 2 | -1/+14 |
| | | * | | | Merge pull request #121 from simonlnu/master | Simon | 2012-03-11 | 1 | -5/+9 |
| | | |\| | |
|
| | | | * | | fix more stuff | Simon L'nu | 2012-03-11 | 1 | -5/+9 |
| | | * | | | Merge pull request #120 from simonlnu/master | Simon | 2012-03-11 | 1 | -2/+7 |
| | |/| | |
| | |/ / |
|
| | | * | | fix some stuff right away | Simon L'nu | 2012-03-11 | 1 | -2/+7 |
| | * | | | Merge pull request #119 from simonlnu/master | Simon | 2012-03-10 | 33 | -13/+6144 |
| | |\| | |
|
| | | * | | preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP! | Simon L'nu | 2012-03-11 | 33 | -13/+6144 |
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-11 | 15 | -494/+883 |
| | | |\ \
| | |/ /
| |/| | |
|
| | * | | | bug #328 | friendica | 2012-03-10 | 1 | -3/+3 |
| | * | | | default the text template var on conversations | friendica | 2012-03-10 | 1 | -0/+1 |
| | * | | | bug #327 - composed private message is lost if no recip specified. | friendica | 2012-03-10 | 2 | -6/+16 |
| | * | | | Merge branch 'pull' | friendica | 2012-03-10 | 11 | -484/+862 |
| | |\ \ \ |
|
| | | * \ \ | Merge pull request #118 from tomtom84/master | tomtom84 | 2012-03-10 | 9 | -11/+52 |
| | | |\ \ \
| | | | |/
| | | |/| |
|
| | | | * | | fixed login-fields, fixed. notofication.png, changed locations | tommy tomson | 2012-03-10 | 9 | -11/+52 |
| | | * | | | German translation | Tobias Diekershoff | 2012-03-10 | 2 | -473/+810 |
| | * | | | | revup | friendica | 2012-03-10 | 1 | -1/+1 |
| | |/ / / |
|
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-10 | 8 | -2/+13 |
| | | | |\
| | |_|/
| |/| | |
|
| | * | | | Merge branch 'pull' | friendica | 2012-03-09 | 3 | -1/+12 |
| | |\ \ \ |
|
| | | * \ \ | Merge pull request #117 from unary/issue299 | friendica | 2012-03-09 | 3 | -1/+12 |
| | | |\ \ \ |
|
| | | | * | | | allow user to set number of items to show on network page | Michael Johnston | 2012-03-09 | 3 | -1/+12 |
| | | |/ / / |
|
| | * | | | | spec directory | friendica | 2012-03-09 | 4 | -0/+0 |
| | * | | | | Merge branch 'pull' | friendica | 2012-03-09 | 10 | -86/+157 |
| | |\| | | |
|
| | * | | | | revup | friendica | 2012-03-09 | 1 | -1/+1 |
| | | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-09 | 0 | -0/+0 |
| | | | |/
| | |/| |
|
| | | * | | Merge pull request #116 from tomtom84/master | tomtom84 | 2012-03-09 | 5 | -0/+134 |
| | | |\| |
|
| | | | * | add js to hide nav-menus, when clicked outside | tommy tomson | 2012-03-09 | 5 | -0/+134 |
