| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-25 | 2 | -9/+15 |
| |\ | | | | | | | | | | | | | | | * remotes/upstream/master: bug #329 - compress the plugin list on the friendica info page bug #346 - add oembed maxwidth to oembed request * master: | ||||
| | * | 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 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: prevent duplicate friend suggestions block filed items from deletion add the bang network filter is now a permission group small fix in css add right_aside to diabook-blue add connectable services to right_aside add PostIt to right_aside, fixes in css * master: | ||||
| | * | 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 |
| | |\ | | | | | | | fixes in diabook-derivates | ||||
| | | * | 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 |
| | |\ | | | | | | | fixes in theme diabook | ||||
| | | * | 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 |
| | |\ | | | | | | | fixes in theme diabook | ||||
| | | * | 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 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: (25 commits) diabook: theme.php remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links) user settings: don't show emoticons fix in css right_aside small fix fix 1024resolution add right_aside to theme diabook ability to change tags in edited posts normalise comparison link on delegation page quattro(-green) styling the 'filed under: remove' text it's only item.filer ;-) non static filer text new lines removed removed some new lines to cut down number of changed files removed unneccessary stuff removed problem from previous commit tests for the template engine adding filer functionality to quattro(-green) missing tooltip for "file as" prevent re-registrations using a deleted username - not an issue with Friendica but could create a serious privacy issue with federated platforms add file_as-option to diabook-derivates ... * master: | ||||
| | * | Merge pull request #160 from fabrixxm/master | tomtom84 | 2012-03-23 | 5 | -223/+86 |
| | |\ | | | | | | | work on diabook theme and settings | ||||
| | | * | diabook: theme.php | Fabio Comuni | 2012-03-23 | 3 | -221/+79 |
| | | | | | | | | | | | | | | | | | | | | | | remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links) | ||||
| | | * | 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 |
| | |\ \ | | | | | | | | | fixes in theme diabook | ||||
| | | * | | 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 ... need author | ||||
| | | * | | 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 |
| | |\ \ \ | | |/ / | |/| | | Tests for the template engine | ||||
| | | * | | 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 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php database.sql include/template_processor.php update.php | ||||
| | | * | | | 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 ↵ | friendica | 2012-03-22 | 6 | -2/+38 |
| | | | | | | | | | | | | | | | | | | | | | Friendica but could create a serious privacy issue with federated platforms | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |