aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 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 branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0317-12/+19
|\| |
| * | 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 branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-032-14/+34
|\| |
| * | Merge pull request #65 from tomtom84/mastertomtom842012-03-032-14/+34
| |\|
| | * fix editortommy tomson2012-03-032-14/+34
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0320-186/+404
|\| |
| * | 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
* | | 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 #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
| |\ \ \
| * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-021-0/+12
| |\ \ \ \
| * \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0236-640/+952
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-298-35/+115
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-298-10/+24
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-281-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-286-55/+14
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-272-9/+18
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-273-7/+9
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-02-270-0/+0
* | | | | | | | | | | | | Merge pull request #59 from tomtom84/masterSimon2012-03-0223-0/+2331
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | deleted readme.txt from folder diabooktommy tomson2012-03-021-0/+0
| * | | | | | | | | | | github finally workingtommy tomson2012-03-021-2/+0
| * | | | | | | | | | | adjust3tommy tomson2012-03-021-0/+1