| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'pull' | friendica | 2012-03-05 | 1 | -14/+23 |
| |\ | |||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-05 | 3 | -7/+7 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: like dislike button fixes in diabook * master: | ||||
| | * | | yet more ui things, and bug fixing | Simon L'nu | 2012-03-05 | 1 | -14/+23 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | testbubble notifications | friendica | 2012-03-05 | 3 | -6/+13 |
| | |/ |/| | |||||
| * | | Merge pull request #83 from tomtom84/master | tomtom84 | 2012-03-04 | 3 | -7/+7 |
| |\ \ | |/ |/| | fixes in diabook theme | ||||
| | * | like dislike button | tommy tomson | 2012-03-05 | 2 | -0/+0 |
| | | | |||||
| | * | fixes in diabook | tommy tomson | 2012-03-05 | 3 | -21/+25 |
| | | | |||||
| * | | Merge pull request #80 from unary/darkzero | Simon | 2012-03-04 | 1 | -0/+8 |
| |\ \ | | | | | | | improved contrast in acl selector, and preview (darkzero) | ||||
| | * | | improved contrast in acl selector, and preview (darkzero) | Michael Johnston | 2012-03-04 | 1 | -0/+8 |
| | | | | |||||
| * | | | Merge pull request #82 from simonlnu/master | Simon | 2012-03-04 | 1 | -6/+24 |
| |\ \ \ | | | | | | | | | say hello to dispy's younger brother | ||||
| | * | | | more ui thingies with dispy - we'll get you well dispy, we promise | Simon L'nu | 2012-03-04 | 1 | -6/+24 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | | Merge branch 'pull' | friendica | 2012-03-04 | 3 | -22/+25 |
| |\| | | | |||||
| | * | | | Merge pull request #81 from tomtom84/master | tomtom84 | 2012-03-04 | 3 | -22/+25 |
| | |\ \ \ | | |/ / | |/| | | fixes in diabook theme | ||||
| | | * | | fixes in diabook | tommy tomson | 2012-03-05 | 3 | -14/+18 |
| | | |/ | |||||
| | | * | style.css fix | tommy tomson | 2012-03-04 | 1 | -10/+9 |
| | | | | |||||
| * | | | wrap title and text for editplain in zero and TB themes | friendica | 2012-03-04 | 3 | -5/+6 |
| | | | | |||||
| * | | | correct owner info from misconfigured installs, duepuntozero title block ↵ | friendica | 2012-03-04 | 1 | -1/+1 |
| |/ / | | | | | | | misplaced in editplain mode | ||||
| * | | removed extra padding/border on tread-wrapper (heh, tea read :P) | Simon L'nu | 2012-03-04 | 1 | -5/+6 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | fix up toolbar so the notifications line up better together | Simon L'nu | 2012-03-04 | 2 | -10/+49 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | more tweakage. stylesheet and jot-header | Simon L'nu | 2012-03-04 | 2 | -29/+32 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes | Simon L'nu | 2012-03-04 | 1 | -5/+8 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | tweak wall items a bit (nasty-looking wall items...). jot-header tries to ↵ | Simon L'nu | 2012-03-04 | 2 | -7/+37 |
| | | | | | | | | | | | | | count chars and fails :P Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | Merge pull request #74 from tomtom84/master | tomtom84 | 2012-03-03 | 5 | -15/+137 |
| |\| | | | | | fixes in diabook theme | ||||
| | * | some fixes in diabook | tommy tomson | 2012-03-04 | 5 | -15/+137 |
| | | | |||||
| * | | Merge pull request #73 from simonlnu/master | Simon | 2012-03-03 | 19 | -1767/+3934 |
| |\ \ | | | | | | | dispy! (and minor formatting) | ||||
| | * | | these are more finessing on formatting again | Simon L'nu | 2012-03-03 | 2 | -3/+3 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | first commit for dispy New Edition | Simon L'nu | 2012-03-03 | 16 | -1752/+3924 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-03 | 2 | -1/+8 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Added docblox default configuration file. fixed apps css * master: | ||||
| | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-03 | 15 | -12/+19 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fixed star/unstar fixed admin fixed editor * master: | ||||
| | * \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-03 | 2 | -14/+34 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix editor * master: | ||||
| | * \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-03 | 18 | -184/+402 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix text-editor in theme german strings as of 28th Feb from transilex small fix in style.css fix star/unstar fixes in wall_item.tpl and style.css in theme diabook fix in wall_item.tpl new icon link.png add diabook to default themes fixed broken tags and notifications in theme * master: | ||||
| | * | | | | | | minor formatting issues | Simon L'nu | 2012-03-02 | 1 | -12/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | | | | | Merge pull request #72 from tomtom84/master | tomtom84 | 2012-03-03 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | fixes in diabook theme | ||||
| | * | | | | | | tag fix | tommy tomson | 2012-03-04 | 1 | -1/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #71 from tomtom84/master | tomtom84 | 2012-03-03 | 1 | -2/+2 |
| |\| | | | | | | | | | | | | | | | | | | | | fixes in diabook theme | ||||
| | * | | | | | | fix | tommy tomson | 2012-03-03 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #70 from tomtom84/master | tomtom84 | 2012-03-03 | 5 | -6/+18 |
| |\| | | | | | | |_|_|_|_|/ |/| | | | | | fixes in diabook theme | ||||
| | * | | | | | navbar fix | tommy tomson | 2012-03-03 | 5 | -6/+18 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #68 from tomtom84/master | tomtom84 | 2012-03-03 | 2 | -1/+8 |
| |\| | | | | | |_|_|_|/ |/| | | | | fixes in diabook theme | ||||
| | * | | | | fixed apps css | tommy tomson | 2012-03-03 | 2 | -1/+8 |
| | | | | | | |||||
| * | | | | | Merge pull request #67 from tomtom84/master | tomtom84 | 2012-03-03 | 5 | -10/+17 |
| |\| | | | | | | | | | | | | | | fixes in diabook theme | ||||
| | * | | | | fixed star/unstar | tommy tomson | 2012-03-03 | 5 | -10/+17 |
| | | | | | | |||||
| * | | | | | Merge pull request #66 from tomtom84/master | tomtom84 | 2012-03-03 | 11 | -2/+2 |
| |\| | | | | |_|_|/ |/| | | | fixed editor and admin-sec in theme diabook | ||||
| | * | | | fixed admin | tommy tomson | 2012-03-03 | 11 | -2/+2 |
| | | | | | | | | | | | | | | | | | fixed editor | ||||
| * | | | | Merge pull request #65 from tomtom84/master | tomtom84 | 2012-03-03 | 2 | -14/+34 |
| |\| | | | |_|/ |/| | | fix editor in theme diabook | ||||
| | * | | fix editor | tommy tomson | 2012-03-03 | 2 | -14/+34 |
| | | | | |||||
| * | | | Merge pull request #64 from tomtom84/master | tomtom84 | 2012-03-03 | 10 | -7/+204 |
| |\| | | | | | | | | fix editor in theme diabook | ||||
| | * | | 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 |
| |\| | | | | | | | | fixes in diabook theme | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |