| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge remote branch 'upstream/master' | zottel | 2012-05-22 | 29 | -444/+623 |
| |\ |
|
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-21 | 9 | -213/+227 |
| | |\ |
|
| | | * | Merge pull request #308 from simonlnu/master | Simon | 2012-05-21 | 2 | -2/+2 |
| | | |\ |
|
| | | | * | fix (min-)search-text text | Simon L'nu | 2012-05-21 | 2 | -2/+2 |
| | | * | | Merge pull request #307 from simonlnu/master | Simon | 2012-05-21 | 9 | -212/+226 |
| | | |\| |
|
| | | | * | updates to dispy family; fix typo in INSTALL.txt | Simon L'nu | 2012-05-21 | 9 | -212/+226 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-21 | 11 | -66/+205 |
| | | | |\
| | | |/
| | |/| |
|
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-21 | 0 | -0/+0 |
| | * | | | redir links for permission controlled attachments | friendica | 2012-05-21 | 4 | -27/+30 |
| | |/ / |
|
| | * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-21 | 2 | -8/+8 |
| | |\| |
|
| | | * | Merge pull request #306 from simonlnu/master | Simon | 2012-05-21 | 2 | -2/+2 |
| | | |\ |
|
| | | | * | more light fixes | Simon L'nu | 2012-05-21 | 2 | -2/+2 |
| | | * | | Merge pull request #305 from simonlnu/master | Simon | 2012-05-20 | 2 | -6/+6 |
| | | |\| |
|
| | | | * | fix dumb mistake in light | Simon L'nu | 2012-05-21 | 2 | -6/+6 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-21 | 0 | -0/+0 |
| | | |/ |
|
| | * / | rev update, bug 428, 429, and ability to block globaldir submissions from dem... | friendica | 2012-05-21 | 11 | -66/+205 |
| | |/ |
|
| | * | 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 dispy light | Simon L'nu | 2012-05-20 | 2 | -2/+2 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-20 | 7 | -33/+126 |
| | | | |\
| | | |/
| | |/| |
|
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-19 | 0 | -0/+0 |
| | * | | | rev update | friendica | 2012-05-20 | 8 | -135/+158 |
| | |/ / |
|
| * | | | Merge remote branch 'upstream/master' | zottel | 2012-05-20 | 33 | -682/+1171 |
| |\| | |
|
| | * | | search with leading @ performs directory search (# for tag search), nothing f... | friendica | 2012-05-19 | 2 | -1/+8 |
| | * | | 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 |
| | * | | 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 impo... | friendica | 2012-05-19 | 3 | -377/+394 |
| | * | 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 | Simon L'nu | 2012-05-19 | 4 | -5/+5 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-19 | 3 | -246/+266 |
| | | | |\
| | | |/
| | |/| |
|
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-18 | 16 | -40/+183 |
| | | | |\ |
|
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-17 | 0 | -0/+0 |
| | * | | | | 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 au... | friendica | 2012-05-17 | 2 | -5/+22 |
| | |/ |
|
| | * | 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 remote branch 'upstream/master' | zottel | 2012-05-17 | 37 | -5312/+6391 |
| |\| |
|
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-16 | 2 | -2/+2 |
| | |\ |
|
