aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \
| * \ \ \ 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
| * | | | | | | | | | | Merge remote-tracking branch 'tomtom84_friendica/master' into master-2tommy tomson2012-03-021-0/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | adjusttommy tomson2012-03-0224-0/+2332
| * | | | | | | | | | | | adjust2tommy tomson2012-03-0223-0/+2331
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #57 from fabrixxm/masterSimon2012-03-0213-69/+50
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |
| | | | | | | | | | | * template proc: fix variables regexpFabio Comuni2012-03-031-1/+10
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | template proc: allow isolation of var name between [ and ]Fabio Comuni2012-03-021-2/+4
| * | | | | | | | | | group: fix create new group formFabio Comuni2012-03-021-0/+1
| * | | | | | | | | | templates: fix tagsFabio Comuni2012-03-0210-20/+22
| * | | | | | | | | | template proc: remove unused function and commented out codeFabio Comuni2012-03-021-44/+1
| * | | | | | | | | | template proc: first optimizationFabio Comuni2012-03-022-10/+29
|/ / / / / / / / / /
* | | | | | | | | / expand multiple heart smilies e.g. <3333friendica2012-03-021-0/+12
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'pull'friendica2012-03-0225-633/+731
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #55 from fabrixxm/masterfabrixxm2012-03-0225-633/+731
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'friendica/master' into randomerrorFabio Comuni2012-03-018-35/+115
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | * | | | | | | | | conversation: remove templating items in code and move it to template.Fabio Comuni2012-03-0115-551/+584