| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-22 | 6 | -0/+10 |
| |\| | | |
|
| | * | | | Merge pull request #156 from tomtom84/master | tomtom84 | 2012-03-21 | 6 | -0/+10 |
| | |\ \ \ |
|
| | | * | | | add file_as-option to diabook-derivates | tommy tomson | 2012-03-22 | 6 | -0/+10 |
| | |/ / / |
|
| * | | | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-22 | 389 | -10614/+22032 |
| |\| | | |
|
| * | | | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-18 | 6 | -23/+15 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-17 | 3 | -4/+4 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-17 | 31 | -321/+504 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-16 | 51 | -189/+619 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-15 | 38 | -284/+1398 |
| |\ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-14 | 47 | -338/+752 |
| |\ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-13 | 29 | -58/+379 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-12 | 10 | -156/+196 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | Revert "OpenID: display error msg if ID URL used to register an account does ... | Tobias Diekershoff | 2012-03-11 | 1 | -9/+4 |
| * | | | | | | | | | | | | OpenID: display error msg if ID URL used to register an account does not exist | Tobias Diekershoff | 2012-03-11 | 1 | -4/+9 |
| | | | | | | | | | | | * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-19 | 4 | -3/+15 |
| | | | | | | | | | | | |\ |
|
* | | | | | | | | | | | | \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-22 | 356 | -10435/+21643 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|/ / / /
| |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | support lowercase :-p smilie | friendica | 2012-03-21 | 1 | -0/+2 |
| * | | | | | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-21 | 14 | -46/+65 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #155 from tomtom84/master | tomtom84 | 2012-03-21 | 14 | -46/+65 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | add icons to aside diabook, fixes in css | tommy tomson | 2012-03-22 | 14 | -46/+65 |
| | |/ / / / / / / / / / / / / |
|
| * / / / / / / / / / / / / / | work around doubled linefeeds in tinymce3.5b2 | friendica | 2012-03-21 | 1 | -0/+10 |
| |/ / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | revert permissions relaxation on community | friendica | 2012-03-21 | 1 | -2/+2 |
| * | | | | | | | | | | | | | add comix-plain | friendica | 2012-03-21 | 7 | -1/+415 |
| * | | | | | | | | | | | | | smooth the comix comment box | friendica | 2012-03-21 | 2 | -2/+36 |
| * | | | | | | | | | | | | | make autocomplete work with updated tinymce | friendica | 2012-03-21 | 1 | -10/+10 |
| * | | | | | | | | | | | | | ika to ica | friendica | 2012-03-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | | private file in repository | friendica | 2012-03-21 | 1 | -0/+0 |
| * | | | | | | | | | | | | | facepark is unsupported ATM | friendica | 2012-03-21 | 2 | -0/+0 |
| * | | | | | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-20 | 25 | -0/+3661 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #154 from tonybaldwin/master | friendica | 2012-03-20 | 25 | -0/+3661 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote branch 'upstream/master' | tony baldwin | 2012-03-21 | 426 | -11330/+19994 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | added Vijay's theme from facepark.in | tony baldwin | 2012-03-21 | 25 | -0/+3661 |
| * | | | | | | | | | | | | | | | | remove stray template variable from old code | friendica | 2012-03-20 | 2 | -3/+1 |
| |/ / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | add comix theme | friendica | 2012-03-20 | 5 | -0/+386 |
| * | | | | | | | | | | | | | | | use password field for DB input | friendica | 2012-03-20 | 1 | -1/+1 |
| | |/ / / / / / / / / / / / /
| |/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | added README to mcefixes to explain what is going on. | friendica | 2012-03-20 | 1 | -0/+4 |
| * | | | | | | | | | | | | | | update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks | friendica | 2012-03-20 | 296 | -10368/+17048 |
| * | | | | | | | | | | | | | | more friend suggestions | friendica | 2012-03-20 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-20 | 0 | -0/+0 |
|/ / / / / / / / / / / / / / |
|
* | | | | | | | | | | | | | | move friend suggestions to top of contact page, add default contact profile p... | friendica | 2012-03-20 | 2 | -2/+23 |
* | | | | | | | | | | | | | | Merge branch 'pull' | friendica | 2012-03-20 | 3 | -13/+148 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #153 from simonlnu/master | Simon | 2012-03-20 | 3 | -13/+148 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | some tweakings for intro boxes (finally got an intro i could see :). dispy sy... | Simon L'nu | 2012-03-20 | 3 | -13/+148 |
| | * | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-20 | 1 | -4/+5 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-20 | 6 | -103/+98 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-19 | 10 | -30/+66 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-18 | 0 | -0/+0 |
* | | | | | | | | | | | | | | | | | | missed a default profile photo replacement in notifications | friendica | 2012-03-20 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | change default profile photo to something more interesting than a reddish bro... | friendica | 2012-03-20 | 9 | -10/+10 |
* | | | | | | | | | | | | | | | | | | slightly relax overly strict permissions in community and search to match tho... | friendica | 2012-03-20 | 3 | -9/+12 |
|/ / / / / / / / / / / / / / / / / |
|