| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | * | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-21 | 0 | -0/+0 |
| |/ / / / / / / / / / / |
|
| * | | | | | | | | | | | 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 |
| |/ / / / / / / / / / / / |
|
| * | | | | | | | | | | | | 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 |
| |/ / / / / / / / / / / |
|
* | | | | | | | | | | / | Performance tests | Michael Vogel | 2012-05-20 | 4 | -10/+19 |
| |_|_|_|_|_|_|_|_|_|/
|/| | | | | | | | | | |
|
* | | | | | | | | | | | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-19 | 26 | -665/+1036 |
|\| | | | | | | | | | |
|
| * | | | | | | | | | | 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 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... | Simon L'nu | 2012-05-16 | 2 | -2/+2 |
| * | | | | | | | | | | | | rev update | friendica | 2012-05-16 | 2 | -3/+3 |
| |/ / / / / / / / / / / |
|
| * | | | | | | | | | | | merged from wrong project | friendica | 2012-05-16 | 1 | -4/+0 |
| * | | | | | | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-16 | 4 | -18/+21 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | Merge pull request #300 from simonlnu/master | Simon | 2012-05-16 | 2 | -2/+2 |
| | |\| | | | | | | | | | |
|
| | | * | | | | | | | | | | *sigh*. fix dark *again* | Simon L'nu | 2012-05-16 | 2 | -2/+2 |
| | * | | | | | | | | | | | Merge pull request #299 from simonlnu/master | Simon | 2012-05-16 | 4 | -16/+19 |
| | |\| | | | | | | | | | |
|
| | | * | | | | | | | | | | get rid of the monstrosity for .button. need to find alternate solution | Simon L'nu | 2012-05-16 | 4 | -16/+19 |
| | | * | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-16 | 0 | -0/+0 |
| | |/ / / / / / / / / / |
|
| * | | | | | | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-15 | 7 | -83/+154 |
| |\| | | | | | | | | | |
|
| * | | | | | | | | | | | Merge https://github.com/friendica/dir into dpull | friendica | 2012-05-15 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | initial commit | friendica | 2012-05-15 | 1 | -0/+4 |
| | / / / / / / / / / / |
|
* | | | | | | | | | | | | Merge remote branch 'upstream/master' | Michael Vogel | 2012-05-16 | 109 | -12544/+17543 |
|\ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / /
| |/| | | | | | | | | | |
|
| * | | | | | | | | | | | Merge pull request #298 from simonlnu/master | Simon | 2012-05-15 | 7 | -83/+154 |
| |\ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / /
| |/| | | | | | | | | | |
|