| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-05-22 | 4 | -27/+30 |
| |\ | |||||
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-21 | 9 | -213/+227 |
| | |\ | |||||
| | * | | redir links for permission controlled attachments | friendica | 2012-05-21 | 4 | -27/+30 |
| | | | | |||||
| * | | | fix setting array values to config items | Tobias Diekershoff | 2012-05-22 | 1 | -3/+1 |
| | |/ |/| | |||||
| * | | Merge pull request #308 from simonlnu/master | Simon | 2012-05-21 | 2 | -2/+2 |
| |\ \ | | | | | | | fix (mini-)search-text text | ||||
| | * | | fix (min-)search-text text | Simon L'nu | 2012-05-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | Merge pull request #307 from simonlnu/master | Simon | 2012-05-21 | 9 | -212/+226 |
| |\| | | |/ |/| | updates to dispy family; fix typo in INSTALL.txt | ||||
| | * | updates to dispy family; fix typo in INSTALL.txt | Simon L'nu | 2012-05-21 | 9 | -212/+226 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-21 | 11 | -66/+205 |
| | |\ | |/ |/| | | | | | | | | | * remotes/upstream/master: rev update, bug 428, 429, and ability to block globaldir submissions from demo sites * master: | ||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-21 | 2 | -8/+8 |
| |\ \ | |||||
| * | | | rev update, bug 428, 429, and ability to block globaldir submissions from ↵ | friendica | 2012-05-21 | 11 | -66/+205 |
| | | | | | | | | | | | | | demo sites | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-21 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | * | Merge pull request #306 from simonlnu/master | Simon | 2012-05-21 | 2 | -2/+2 |
| | |\ | | | | | | | more light fixes | ||||
| | | * | more light fixes | Simon L'nu | 2012-05-21 | 2 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | Merge pull request #305 from simonlnu/master | Simon | 2012-05-20 | 2 | -6/+6 |
| |/| | | |/ | | | fix dumb mistake in light | ||||
| | * | fix dumb mistake in light | Simon L'nu | 2012-05-21 | 2 | -6/+6 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-21 | 0 | -0/+0 |
| |/ | | | | | | | * remotes/upstream/master: rev update * master: | ||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-20 | 2 | -2/+2 |
| |\ | |||||
| | * | Merge pull request #303 from simonlnu/master | Simon | 2012-05-20 | 2 | -2/+2 |
| | |\ | | | | | | | fix brown paper bag with dispy light | ||||
| | | * | fix dispy light | Simon L'nu | 2012-05-20 | 2 | -2/+2 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-20 | 7 | -33/+126 |
| | | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: search with leading @ performs directory search (# for tag search), nothing for text search Darkzero-NS + 'Friendicaland' countries. set comment permissions explicitly to parent permissions * master: | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-19 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Darkzero, another missing part of "everything" Diabook-dark - some more cleaning up Okay, so maybe not *everything* Give Darkzero some loving. backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @ sql script to ccnvert all tables to innodb * master: | ||||
| * | | | rev update | friendica | 2012-05-20 | 8 | -135/+158 |
| |/ / | |||||
| * | | search with leading @ performs directory search (# for tag search), nothing ↵ | friendica | 2012-05-19 | 2 | -1/+8 |
| | | | | | | | | | for text search | ||||
| * | | Darkzero-NS + 'Friendicaland' countries. | Thomas Willingham | 2012-05-20 | 2 | -12/+69 |
| | | | |||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-19 | 3 | -7/+35 |
| |\| | |||||
| | * | Darkzero, another missing part of "everything" | Thomas Willingham | 2012-05-19 | 1 | -0/+1 |
| | | | |||||
| | * | Diabook-dark - some more cleaning up | Thomas Willingham | 2012-05-19 | 2 | -4/+5 |
| | | | |||||
| | * | Okay, so maybe not *everything* | Thomas Willingham | 2012-05-19 | 1 | -2/+11 |
| | | | |||||
| | * | Give Darkzero some loving. | Thomas Willingham | 2012-05-19 | 1 | -1/+18 |
| | | | | | | | | | Everything that used to be hidden with light text on light backgrounds is legible now. | ||||
| * | | set comment permissions explicitly to parent permissions | friendica | 2012-05-19 | 3 | -20/+49 |
| |/ | |||||
| * | backend support for 'x' deliveries per process - x is configurable, more ↵ | friendica | 2012-05-19 | 3 | -377/+394 |
| | | | | | importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @ | ||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-19 | 4 | -5/+5 |
| |\ | |||||
| | * | Merge pull request #302 from simonlnu/master | Simon | 2012-05-19 | 4 | -5/+5 |
| | |\ | | | | | | | fix -desc again | ||||
| | | * | fix -desc again | Simon L'nu | 2012-05-19 | 4 | -5/+5 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-19 | 3 | -246/+266 |
| | | |\ | | |/ | |/| | | | | | | | | | | | | | * remotes/upstream/master: profile change activity link bug * master: | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-18 | 16 | -40/+183 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: apply max-width to images in posts, duepuntozero theming for default group selector catch more places to apply default group make it difficult to setup a private forum with no privacy more private forums, default privacy group for new contacts tell browser not to cache permission denied (private) photos so that after authenticating we don't have to fight the browser - plus more prvgroup work * master: | ||||
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-17 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: setup delivery chain for private groups (work in progress) bring in the *much better* xml parser from the original zot branch rev update merged from wrong project initial commit * master: | ||||
| * | | | | sql script to ccnvert all tables to innodb | friendica | 2012-05-19 | 1 | -0/+19 |
| |/ / / | |||||
| * | / | profile change activity link bug | friendica | 2012-05-18 | 3 | -246/+266 |
| | |/ |/| | |||||
| * | | apply max-width to images in posts, duepuntozero | friendica | 2012-05-18 | 1 | -0/+5 |
| | | | |||||
| * | | theming for default group selector | friendica | 2012-05-18 | 4 | -4/+9 |
| | | | |||||
| * | | catch more places to apply default group | friendica | 2012-05-18 | 1 | -0/+10 |
| | | | |||||
| * | | make it difficult to setup a private forum with no privacy | friendica | 2012-05-17 | 1 | -4/+13 |
| | | | |||||
| * | | more private forums, default privacy group for new contacts | friendica | 2012-05-17 | 13 | -34/+131 |
| | | | |||||
| * | | tell browser not to cache permission denied (private) photos so that after ↵ | friendica | 2012-05-17 | 2 | -5/+22 |
| |/ | | | | authenticating we don't have to fight the browser - plus more prvgroup work | ||||
| * | setup delivery chain for private groups (work in progress) | friendica | 2012-05-17 | 3 | -24/+29 |
| | | |||||
| * | bring in the *much better* xml parser from the original zot branch | friendica | 2012-05-16 | 1 | -0/+164 |
| | | |||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-16 | 2 | -2/+2 |
| |\ | |||||
| | * | Merge pull request #301 from simonlnu/master | Simon | 2012-05-16 | 2 | -2/+2 |
| | |\ | | | | | | | fix admin links | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |