| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 12 | -36/+152 |
| |\ | |||||
| | * | Merge pull request #165 from tomtom84/master | tomtom84 | 2012-03-24 | 10 | -29/+135 |
| | |\ | |||||
| | | * | move community_pages to right_aside, fixes in css | tommy tomson | 2012-03-25 | 10 | -29/+135 |
| | |/ | |||||
| | * | Merge branch 'pull' | friendica | 2012-03-24 | 8 | -38/+105 |
| | |\ | |||||
| | | * | Merge pull request #164 from simonlnu/master | Simon | 2012-03-24 | 8 | -38/+105 |
| | | |\ | |||||
| | * | | | improved the inivitations and added a bit of sales pitch. | friendica | 2012-03-24 | 2 | -7/+17 |
| | |/ / | |||||
| * | / | increase version to 1.0 for dispys \o/ | Simon L'nu | 2012-03-25 | 2 | -2/+3 |
| | |/ |/| | |||||
| * | | implement filer/file-as | Simon L'nu | 2012-03-25 | 8 | -38/+105 |
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 2 | -9/+15 |
| |\| | |||||
| | * | bug #329 - compress the plugin list on the friendica info page | friendica | 2012-03-24 | 1 | -7/+12 |
| | * | bug #346 - add oembed maxwidth to oembed request | friendica | 2012-03-24 | 1 | -2/+3 |
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-24 | 42 | -122/+5673 |
| |\| | |||||
| | * | prevent duplicate friend suggestions | friendica | 2012-03-24 | 2 | -1/+10 |
| | * | block filed items from deletion | friendica | 2012-03-24 | 2 | -4/+4 |
| | * | add the bang | friendica | 2012-03-24 | 1 | -2/+2 |
| | * | Merge branch 'pull' | friendica | 2012-03-24 | 4 | -4/+4 |
| | |\ | |||||
| | | * | small fix in css | tommy tomson | 2012-03-24 | 4 | -4/+4 |
| | * | | network filter is now a permission group | friendica | 2012-03-24 | 2 | -2/+16 |
| | |/ | |||||
| | * | Merge pull request #163 from tomtom84/master | tomtom84 | 2012-03-24 | 20 | -94/+5443 |
| | |\ | |||||
| | | * | add right_aside to diabook-blue | tommy tomson | 2012-03-24 | 20 | -94/+5443 |
| | |/ | |||||
| | * | Merge pull request #162 from tomtom84/master | tomtom84 | 2012-03-23 | 10 | -3/+19 |
| | |\ | |||||
| | | * | add connectable services to right_aside | tommy tomson | 2012-03-24 | 10 | -3/+19 |
| | |/ | |||||
| | * | Merge pull request #161 from tomtom84/master | tomtom84 | 2012-03-23 | 10 | -17/+180 |
| | |\ | |||||
| | | * | add PostIt to right_aside, fixes in css | tommy tomson | 2012-03-24 | 10 | -17/+180 |
| | |/ | |||||
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-23 | 43 | -127/+5589 |
| |\| | |||||
| | * | Merge pull request #160 from fabrixxm/master | tomtom84 | 2012-03-23 | 5 | -223/+86 |
| | |\ | |||||
| | | * | diabook: theme.php | Fabio Comuni | 2012-03-23 | 3 | -221/+79 |
| | | * | user settings: don't show emoticons | Fabio Comuni | 2012-03-23 | 2 | -2/+7 |
| | | * | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-23 | 14 | -20/+5280 |
| | | |\ | | |/ | |/| | |||||
| | * | | fix in css right_aside | tommy tomson | 2012-03-23 | 5 | -34/+4953 |
| | * | | small fix | tommy tomson | 2012-03-23 | 1 | -1/+1 |
| | * | | Merge pull request #159 from tomtom84/master | tomtom84 | 2012-03-22 | 2 | -14/+15 |
| | |\ \ | |||||
| | | * | | fix 1024resolution | tommy tomson | 2012-03-23 | 2 | -14/+15 |
| | |/ / | |||||
| | * | | Merge pull request #158 from tomtom84/master | friendica | 2012-03-22 | 6 | -11/+329 |
| | |\ \ | |||||
| | | * | | add right_aside to theme diabook | tommy tomson | 2012-03-23 | 6 | -11/+329 |
| | |/ / | |||||
| | * | | ability to change tags in edited posts | friendica | 2012-03-22 | 5 | -14/+36 |
| | | * | 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 |
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |