| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-03 | 17 | -12/+19 |
| |\ |
|
| | * | Merge pull request #67 from tomtom84/master | tomtom84 | 2012-03-03 | 7 | -10/+17 |
| | |\ |
|
| | | * | fixed star/unstar | tommy tomson | 2012-03-03 | 7 | -10/+17 |
| | * | | Merge pull request #66 from tomtom84/master | tomtom84 | 2012-03-03 | 11 | -2/+2 |
| | |\| |
|
| | | * | fixed admin | tommy tomson | 2012-03-03 | 11 | -2/+2 |
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-03 | 2 | -14/+34 |
| |\| | |
|
| | * | | Merge pull request #65 from tomtom84/master | tomtom84 | 2012-03-03 | 2 | -14/+34 |
| | |\| |
|
| | | * | fix editor | tommy tomson | 2012-03-03 | 2 | -14/+34 |
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-03 | 20 | -186/+404 |
| |\| | |
|
| | * | | Merge pull request #64 from tomtom84/master | tomtom84 | 2012-03-03 | 10 | -7/+204 |
| | |\| |
|
| | | * | fix text-editor in theme | tommy tomson | 2012-03-03 | 10 | -7/+204 |
| | * | | german strings as of 28th Feb from transilex | Tobias Diekershoff | 2012-03-03 | 2 | -142/+142 |
| | * | | Merge pull request #63 from tomtom84/master | tomtom84 | 2012-03-02 | 3 | -1/+5 |
| | |\| |
|
| | | * | small fix in style.css | tommy tomson | 2012-03-03 | 1 | -1/+5 |
| | | * | fix star/unstar | tommy tomson | 2012-03-03 | 2 | -0/+0 |
| | * | | Merge pull request #62 from tomtom84/master | friendica | 2012-03-02 | 5 | -34/+51 |
| | |\| |
|
| | | * | fixes in wall_item.tpl and style.css in theme diabook | tommy tomson | 2012-03-03 | 3 | -8/+12 |
| | | * | fix in wall_item.tpl | tommy tomson | 2012-03-03 | 3 | -10/+13 |
| | | * | fixed broken tags and notifications in theme | tommy tomson | 2012-03-03 | 3 | -16/+26 |
| | * | | add diabook to default themes | friendica | 2012-03-02 | 2 | -2/+2 |
| * | | | minor formatting issues | Simon L'nu | 2012-03-02 | 1 | -12/+7 |
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-02 | 0 | -0/+0 |
| |/ / |
|
| * | | Merge pull request #61 from fabrixxm/master | Simon | 2012-03-02 | 2 | -2/+11 |
| |\ \ |
|
| | * | | fix @mention autocomplete in comments | Fabio Comuni | 2012-03-03 | 1 | -1/+1 |
| | * | | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-03 | 33 | -127/+2470 |
| | |\ \
| |/ /
|/| | |
|
| * | | | Merge pull request #60 from simonlnu/master | Simon | 2012-03-02 | 6 | -123/+135 |
| |\ \ \ |
|
| | * | | | apply changes to templates to testbubble | Simon L'nu | 2012-03-02 | 6 | -123/+135 |
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-02 | 0 | -0/+0 |
| |/ / / |
|
| * | | | Merge pull request #58 from simonlnu/master | Simon | 2012-03-02 | 5 | -4/+4 |
| |\ \ \ |
|
| | * | | | fix for comment-wwedit-wrapper CSS class in tpl had a stray $ | Simon L'nu | 2012-03-02 | 5 | -4/+4 |
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-02 | 13 | -69/+50 |
| | |\ \ \ |
|
| | * \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-02 | 1 | -0/+12 |
| | |\ \ \ \ |
|
| | * \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-02 | 36 | -640/+952 |
| | |\ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-29 | 8 | -35/+115 |
| | |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-29 | 8 | -10/+24 |
| | |\ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-28 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-28 | 6 | -55/+14 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-27 | 2 | -9/+18 |
| | |\ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-27 | 3 | -7/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-02-27 | 0 | -0/+0 |
| * | | | | | | | | | | | | | Merge pull request #59 from tomtom84/master | Simon | 2012-03-02 | 23 | -0/+2331 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | | | /
| | |_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | |
|
| | * | | | | | | | | | | | deleted readme.txt from folder diabook | tommy tomson | 2012-03-02 | 1 | -0/+0 |
| | * | | | | | | | | | | | github finally working | tommy tomson | 2012-03-02 | 1 | -2/+0 |
| | * | | | | | | | | | | | adjust3 | tommy tomson | 2012-03-02 | 1 | -0/+1 |
| | * | | | | | | | | | | | Merge remote-tracking branch 'tomtom84_friendica/master' into master-2 | tommy tomson | 2012-03-02 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | adjust | tommy tomson | 2012-03-02 | 24 | -0/+2332 |
| | * | | | | | | | | | | | | adjust2 | tommy tomson | 2012-03-02 | 23 | -0/+2331 |
| | |/ / / / / / / / / / / |
|
| * | | | | | | | | | | | | Merge pull request #57 from fabrixxm/master | Simon | 2012-03-02 | 13 | -69/+50 |
| |\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|/ /
|/| | | | | | | | | | | |
|
| | | | | | | | | | | | * | template proc: fix variables regexp | Fabio Comuni | 2012-03-03 | 1 | -1/+10 |
| | | |_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | |
|
| | * | | | | | | | | | | template proc: allow isolation of var name between [ and ] | Fabio Comuni | 2012-03-02 | 1 | -2/+4 |
