| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |\| | | |||||
| | * | | 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 |
| | * | | | 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 |
| | | | |\ \ \ \ | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |