Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-22 | 394 | -10588/+22262 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
* | | | | | | Merge branch 'pull' | friendica | 2012-03-22 | 4 | -7/+52 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-22 | 3 | -4/+246 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | quattro(-green) styling the 'filed under: remove' text | Tobias Diekershoff | 2012-03-22 | 4 | -7/+52 | |
* | | | | | | | | normalise comparison link on delegation page | friendica | 2012-03-22 | 1 | -1/+1 | |
| |/ / / / / / |/| | | | | | | ||||||
* | | | | | | | Merge pull request #157 from campino/master | friendica | 2012-03-22 | 3 | -4/+246 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | new lines removed | Alexander Kampmann | 2012-03-22 | 2 | -1/+2 | |
| * | | | | | | removed some new lines to cut down number of changed files | Alexander Kampmann | 2012-03-22 | 3 | -2/+1 | |
| * | | | | | | removed unneccessary stuff | Alexander Kampmann | 2012-03-22 | 2 | -23/+0 | |
| * | | | | | | Merge branch 'master' of git://github.com/friendica/friendica | Alexander Kampmann | 2012-03-22 | 498 | -11542/+24259 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | removed problem from previous commit | Alexander Kampmann | 2012-03-22 | 1 | -3/+0 | |
| * | | | | | | | tests for the template engine | Alexander Kampmann | 2012-03-22 | 2 | -1/+225 | |
| * | | | | | | | integrated profiler | Alexander Kampmann | 2012-03-15 | 3 | -41/+26 | |
| * | | | | | | | added simple build-in profiling | Alexander Kampmann | 2012-03-15 | 5 | -2/+64 | |
| * | | | | | | | another test for xmlify | Alexander Kampmann | 2012-03-15 | 1 | -1/+22 | |
* | | | | | | | | it's only item.filer ;-) | Tobias Diekershoff | 2012-03-22 | 2 | -2/+2 | |
* | | | | | | | | Merge branch 'quattrofiler' | Tobias Diekershoff | 2012-03-22 | 2 | -0/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | non static filer text | Tobias Diekershoff | 2012-03-22 | 2 | -2/+2 | |
| * | | | | | | | | adding filer functionality to quattro(-green) | Tobias Diekershoff | 2012-03-22 | 2 | -0/+6 | |
* | | | | | | | | | Merge branch 'master' of https://github.com/friendica/friendica | Tobias Diekershoff | 2012-03-22 | 12 | -8/+44 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | | ||||||
| * | | | | | | | missing tooltip for "file as" | friendica | 2012-03-22 | 6 | -6/+6 | |
| * | | | | | | | prevent re-registrations using a deleted username - not an issue with Friendi... | friendica | 2012-03-22 | 6 | -2/+38 | |
* | | | | | | | | 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 |