| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'main/master' | Thomas Willingham | 2012-03-26 | 527 | -11251/+34436 |
| |\ | |||||
| | * | Merge pull request #173 from simonlnu/master | Simon | 2012-03-26 | 2 | -5/+8 |
| | |\ | | | | | | | fix dispy's nav element; fix colours in #search-text | ||||
| | | * | fix dispy's nav element; fix colours in #search-text | Simon L'nu | 2012-03-26 | 2 | -5/+8 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-26 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css marking quattro-green as extension of quattro and deleting the tpl files minor css fixes in diabook screenshot for darkzero-NS, same as darkzero added quaddro templates to quaddro-green language issues in enotify small fix in diabook :: add local friendica to right_aside comix screenshot diabook: small fix in theme_info array more theme screenshots themes: use duepuntozero tpls as default * master: | ||||
| | * | add "similar interrest", "Friend Suggestions" and "Invite Friends" to ↵ | tommy tomson | 2012-03-26 | 8 | -20/+50 |
| | | | | | | | | | right_aside, fixes in css | ||||
| | * | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-26 | 13 | -36/+29 |
| | |\ | |||||
| | | * | minor css fixes in diabook | tommy tomson | 2012-03-26 | 12 | -36/+29 |
| | | | | |||||
| | | * | screenshot for darkzero-NS, same as darkzero | friendica | 2012-03-26 | 1 | -0/+0 |
| | | | | |||||
| | * | | marking quattro-green as extension of quattro and deleting the tpl files | Tobias Diekershoff | 2012-03-26 | 14 | -667/+11 |
| | |/ | |||||
| | * | added quaddro templates to quaddro-green | Tobias Diekershoff | 2012-03-26 | 13 | -0/+667 |
| | | | |||||
| | * | Merge pull request #172 from fabrixxm/master | friendica | 2012-03-26 | 34 | -902/+902 |
| | |\ | | | | | | | Rearrange theme tpls | ||||
| | | * | diabook: small fix in theme_info array | Fabio Comuni | 2012-03-26 | 1 | -1/+1 |
| | | | | |||||
| | | * | themes: use duepuntozero tpls as default | Fabio Comuni | 2012-03-26 | 33 | -901/+901 |
| | | | | |||||
| | * | | Merge branch 'pull' | friendica | 2012-03-26 | 4 | -1/+3 |
| | |\ \ | |||||
| | | * | | small fix in diabook :: add local friendica to right_aside | tommy tomson | 2012-03-26 | 4 | -1/+3 |
| | | | | | |||||
| | * | | | language issues in enotify | friendica | 2012-03-26 | 1 | -5/+9 |
| | |/ / | |||||
| | * | | Merge branch 'pull' | friendica | 2012-03-26 | 12 | -22/+37 |
| | |\ \ | |||||
| | | * \ | Merge pull request #171 from simonlnu/master | Simon | 2012-03-26 | 1 | -1/+1 |
| | | |\ \ | | | | | | | | | | | changes in contact_edit.tpl | ||||
| | | | * | | [fix] contact_edit.tpl syntax; reduce cols to fit better | Simon L'nu | 2012-03-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-26 | 0 | -0/+0 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add screenshots to diabook * master: | ||||
| | | * / | add screenshots to diabook | tommy tomson | 2012-03-26 | 4 | -3/+8 |
| | | |/ | |||||
| | | * | Merge pull request #170 from simonlnu/master | Simon | 2012-03-26 | 4 | -8/+22 |
| | | |\ | | | | | | | | | fix search box in dispys | ||||
| | | | * | fix the search box | Simon L'nu | 2012-03-26 | 4 | -8/+22 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-26 | 23 | -18/+45 |
| | | | |\ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: small fix don't include friend suggestions for people with the same name as current contacts. This will remove a lot of #whoaretonybaldwin. position the theme-preview on settings page more wordsmithing of the Friendica invitation email screenshot gallery theme preview for end users * master: | ||||
| | | * | | small fix | tommy tomson | 2012-03-26 | 4 | -11/+7 |
| | | | | | |||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: typo datarry -> datarray * master: | ||||
| | * | | | comix screenshot | friendica | 2012-03-26 | 1 | -0/+0 |
| | | | | | |||||
| | * | | | more theme screenshots | friendica | 2012-03-26 | 7 | -0/+0 |
| | |/ / | |||||
| | * | | don't include friend suggestions for people with the same name as current ↵ | friendica | 2012-03-25 | 1 | -2/+6 |
| | | | | | | | | | | | | | contacts. This will remove a lot of #whoaretonybaldwin. | ||||
| | * | | position the theme-preview on settings page | friendica | 2012-03-25 | 1 | -0/+4 |
| | | | | |||||
| | * | | more wordsmithing of the Friendica invitation email | friendica | 2012-03-25 | 1 | -4/+5 |
| | | | | |||||
| | * | | screenshot gallery | friendica | 2012-03-25 | 12 | -0/+0 |
| | | | | |||||
| | * | | Merge branch 'pull' | friendica | 2012-03-25 | 7 | -15/+45 |
| | |\| | |||||
| | | * | Merge pull request #167 from unary/typo | Simon | 2012-03-25 | 1 | -1/+1 |
| | | |\ | | | | | | | | | typo datarry -> datarray | ||||
| | | | * | typo datarry -> datarray | Michael Johnston | 2012-03-25 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge pull request #169 from simonlnu/master | Simon | 2012-03-25 | 6 | -14/+44 |
| | | |\ \ | | | | | | | | | | | search box | ||||
| | | | * | | add in the search box | Simon L'nu | 2012-03-25 | 6 | -13/+43 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 6 | -2/+22 |
| | | | |\ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: theme screenshots * master: | ||||
| | | | * | | minor fix to dispy theme.php | Simon L'nu | 2012-03-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | * | | | | theme preview for end users | friendica | 2012-03-25 | 4 | -1/+23 |
| | |/ / / | |||||
| | * | | | Merge branch 'pull' | friendica | 2012-03-25 | 3 | -9/+17 |
| | |\| | | |||||
| | | * | | Merge pull request #168 from simonlnu/master | Simon | 2012-03-25 | 1 | -1/+1 |
| | | |\ \ | | | |/ | | |/| | fix dispy-dark | ||||
| | | | * | urgent fix to dispy-dark theme.php | Simon L'nu | 2012-03-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 0 | -0/+0 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: small fixes enotify plugin hook NOTIFY_SYSTEM * master: | ||||
| | | * | small fixes | tommy tomson | 2012-03-25 | 2 | -8/+16 |
| | | | | |||||
| | * | | theme screenshots | friendica | 2012-03-25 | 6 | -2/+22 |
| | |/ | |||||
| | * | enotify plugin hook | friendica | 2012-03-25 | 1 | -2/+24 |
| | | | |||||
| | * | NOTIFY_SYSTEM | friendica | 2012-03-25 | 2 | -1/+9 |
| | | | |||||
| | * | Merge pull request #166 from simonlnu/master | Simon | 2012-03-25 | 19 | -18/+455 |
| | |\ | | | | | | | fpostit; up versions to 1.0; | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |