aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* tweak wall items a bit (nasty-looking wall items...). jot-header tries to cou...Simon L'nu2012-03-042-7/+37
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-045-15/+137
|\
| * Merge pull request #74 from tomtom84/mastertomtom842012-03-035-15/+137
| |\
| | * some fixes in diabooktommy tomson2012-03-045-15/+137
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-030-0/+0
|/ /
* | Merge pull request #73 from simonlnu/masterSimon2012-03-0319-1767/+3934
|\ \
| * | these are more finessing on formatting againSimon L'nu2012-03-032-3/+3
| * | first commit for dispy New EditionSimon L'nu2012-03-0316-1752/+3924
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-033-1/+21
| |\ \
| * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0317-12/+19
| |\ \ \
| * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-032-14/+34
| |\ \ \ \
| * \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0320-186/+404
| |\ \ \ \ \
| * | | | | | minor formatting issuesSimon L'nu2012-03-021-12/+7
| * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-020-0/+0
* | | | | | | Merge pull request #72 from tomtom84/mastertomtom842012-03-031-1/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | tag fixtommy tomson2012-03-041-1/+2
* | | | | | | Merge pull request #71 from tomtom84/mastertomtom842012-03-031-2/+2
|\| | | | | |
| * | | | | | fixtommy tomson2012-03-031-2/+2
* | | | | | | Merge pull request #70 from tomtom84/mastertomtom842012-03-035-6/+18
|\| | | | | | | |_|_|_|_|/ |/| | | | |
| * | | | | navbar fixtommy tomson2012-03-035-6/+18
* | | | | | Merge pull request #69 from abinoam/docbloxAbinoam P. Marques Jr.2012-03-031-0/+13
|\ \ \ \ \ \
| * | | | | | Added docblox default configuration file.Abinoam P. Marques Jr2012-03-031-0/+13
|/ / / / / /
* | | | | / Merge pull request #68 from tomtom84/mastertomtom842012-03-032-1/+8
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | fixed apps csstommy tomson2012-03-032-1/+8
* | | | | Merge pull request #67 from tomtom84/mastertomtom842012-03-037-10/+17
|\| | | |
| * | | | fixed star/unstartommy tomson2012-03-037-10/+17
* | | | | Merge pull request #66 from tomtom84/mastertomtom842012-03-0311-2/+2
|\| | | | | |_|_|/ |/| | |
| * | | fixed admintommy tomson2012-03-0311-2/+2
* | | | Merge pull request #65 from tomtom84/mastertomtom842012-03-032-14/+34
|\| | | | |_|/ |/| |
| * | fix editortommy tomson2012-03-032-14/+34
* | | Merge pull request #64 from tomtom84/mastertomtom842012-03-0310-7/+204
|\| |
| * | fix text-editor in themetommy tomson2012-03-0310-7/+204
* | | german strings as of 28th Feb from transilexTobias Diekershoff2012-03-032-142/+142
* | | Merge pull request #63 from tomtom84/mastertomtom842012-03-023-1/+5
|\| |
| * | small fix in style.csstommy tomson2012-03-031-1/+5
| * | fix star/unstartommy tomson2012-03-032-0/+0
* | | Merge pull request #62 from tomtom84/masterfriendica2012-03-025-34/+51
|\| |
| * | fixes in wall_item.tpl and style.css in theme diabooktommy tomson2012-03-033-8/+12
| * | fix in wall_item.tpltommy tomson2012-03-033-10/+13
| * | fixed broken tags and notifications in themetommy tomson2012-03-033-16/+26
* | | add diabook to default themesfriendica2012-03-022-2/+2
| |/ |/|
* | Merge pull request #61 from fabrixxm/masterSimon2012-03-022-2/+11
|\ \
| * | fix @mention autocomplete in commentsFabio Comuni2012-03-031-1/+1
| * | Merge remote-tracking branch 'friendica/master'Fabio Comuni2012-03-0333-127/+2470
| |\ \ | |/ / |/| |
* | | Merge pull request #60 from simonlnu/masterSimon2012-03-026-123/+135
|\ \ \
| * | | apply changes to templates to testbubbleSimon L'nu2012-03-026-123/+135
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-020-0/+0
|/ / /
* | | Merge pull request #58 from simonlnu/masterSimon2012-03-025-4/+4
|\ \ \
| * | | fix for comment-wwedit-wrapper CSS class in tpl had a stray $Simon L'nu2012-03-025-4/+4
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0213-69/+50
| |\ \ \