aboutsummaryrefslogtreecommitdiffstats
path: root/view
Commit message (Expand)AuthorAgeFilesLines
...
* | 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-032-1/+8
| |\ \
| * \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-0315-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-0318-184/+402
| |\ \ \ \ \
| * | | | | | minor formatting issuesSimon L'nu2012-03-021-12/+7
* | | | | | | 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 #68 from tomtom84/mastertomtom842012-03-032-1/+8
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | fixed apps csstommy tomson2012-03-032-1/+8
* | | | | Merge pull request #67 from tomtom84/mastertomtom842012-03-035-10/+17
|\| | | |
| * | | | fixed star/unstartommy tomson2012-03-035-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
* | apply changes to templates to testbubbleSimon L'nu2012-03-026-123/+135
* | Merge pull request #58 from simonlnu/masterSimon2012-03-024-4/+4
|\ \
| * | fix for comment-wwedit-wrapper CSS class in tpl had a stray $Simon L'nu2012-03-024-4/+4
* | | Merge pull request #59 from tomtom84/masterSimon2012-03-0222-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
| * adjusttommy tomson2012-03-0223-0/+2332
* | templates: fix tagsFabio Comuni2012-03-0210-20/+22
* | Merge pull request #55 from fabrixxm/masterfabrixxm2012-03-0221-495/+575
|\ \ | |/ |/|
| * conversation: remove templating items in code and move it to template.Fabio Comuni2012-03-0114-457/+481
| * show relation in contact_templateFabio Comuni2012-03-011-0/+1
| * Merge remote-tracking branch 'friendica/master' into randomerrorFabio Comuni2012-02-2947-1008/+1831
| |\
| * | fix visualization in groupeditorFabio Comuni2012-02-231-2/+2
| * | less html in mod/group.php, template for group members editor, quattro theme ...Fabio Comuni2012-02-236-38/+93
* | | diabook committommy tomson2012-03-021-0/+0
| |/ |/|
* | revert 01a2791e3a to avoid random preg internal errors. fix contact_templateFabio Comuni2012-02-271-2/+2
* | add plugin hooks to enotifyfriendica2012-02-263-3/+3