| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-12-13 | 2 | -47/+47 |
| |\ | |||||
| | * | Merge pull request #738 from pafcu/moreids | Thomas Willingham | 2014-12-13 | 2 | -47/+47 |
| | |\ | | | | | | | Add some ids to nav elements | ||||
| | | * | Add some ids to nav elements | Stefan Parviainen | 2014-12-12 | 2 | -47/+47 |
| | | | | |||||
| * | | | Let Diaspora hublocs come back by allowing discover_by_webbie() to carry on if | Thomas Willingham | 2014-12-13 | 1 | -3/+2 |
| |/ / | | | | | | | | | | | and look for a hubloc even if an xchan is found. You'll probably need to loop through the missing ones manually. | ||||
| * | | Issue #739 | Thomas Willingham | 2014-12-13 | 2 | -1/+18 |
| | | | |||||
| * | | Fix WSOD on login | Thomas Willingham | 2014-12-12 | 1 | -3/+5 |
| | | | |||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-12 | 136 | -10355/+13468 |
| |\ \ | |||||
| | * | | Update Smarty | Thomas Willingham | 2014-12-11 | 132 | -10329/+13450 |
| | | | | |||||
| | * | | move profile css to mod_profile and minoor fixes | marijus | 2014-12-11 | 4 | -26/+18 |
| | | | | |||||
| * | | | doc update | friendica | 2014-12-12 | 5 | -0/+721 |
| | | | | |||||
| * | | | don't import to sys channel from self-censored authors | friendica | 2014-12-12 | 83 | -1580/+1823 |
| |/ / | |||||
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-10 | 68 | -1166/+1313 |
| |\ \ | |||||
| | * | | Missing '' | Thomas Willingham | 2014-12-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-12-10 | 1 | -232/+228 |
| | |\ \ | |||||
| | | * | | some work on profile page - mostly whitespace | marijus | 2014-12-10 | 1 | -232/+228 |
| | | | | | |||||
| | * | | | Bring back 'no special theme for mobile' | Thomas Willingham | 2014-12-10 | 1 | -6/+8 |
| | |/ / | |||||
| | * | | Provide censorship. | Thomas Willingham | 2014-12-10 | 1 | -4/+9 |
| | | | | |||||
| | * | | Issue #732 | Thomas Willingham | 2014-12-09 | 2 | -2/+28 |
| | | | | |||||
| | * | | adjustment to clear browser location button only if use browser location ↵ | marijus | 2014-12-09 | 2 | -2/+2 |
| | | | | | | | | | | | | | option is set | ||||
| | * | | show clear browser location button only if use browser location option is ↵ | marijus | 2014-12-09 | 6 | -15/+8 |
| | | | | | | | | | | | | | set and minor css fixes | ||||
| | * | | Merge pull request #735 from pafcu/jotbtnspacing2 | git-marijus | 2014-12-09 | 2 | -56/+68 |
| | |\ \ | | | | | | | | | Put some spacing between share types and other buttons in jot | ||||
| | | * | | Group comment editor icons | Stefan Parviainen | 2014-12-08 | 1 | -28/+34 |
| | | | | | |||||
| | | * | | Put some spacing between share types and other buttons in jot | Stefan Parviainen | 2014-12-08 | 1 | -28/+34 |
| | | |/ | |||||
| | * | | Merge pull request #733 from pafcu/rewordoptional | git-marijus | 2014-12-09 | 5 | -10/+10 |
| | |\ \ | | |/ | |/| | Make it clear that title and categories are optional | ||||
| | | * | Make it clear that title and categories are optional | Stefan Parviainen | 2014-12-08 | 5 | -10/+10 |
| | |/ | |||||
| | * | Merge pull request #726 from pafcu/tagsinotherchannels | Thomas Willingham | 2014-12-08 | 3 | -262/+273 |
| | |\ | | | | | | | Show tags in other channels profile field to make it easier to navigate ... | ||||
| | | * | Show tags in other channels profile field to make it easier to navigate to ↵ | Stefan Parviainen | 2014-12-07 | 3 | -262/+273 |
| | | | | | | | | | | | | | the channels | ||||
| | * | | Merge pull request #724 from pafcu/suggestionsindir | Thomas Willingham | 2014-12-08 | 3 | -4/+47 |
| | |\ \ | | | | | | | | | Show suggestions in directory | ||||
| | | * | | Suggestions in dir redux. Suggestions are now showed in directory if ↵ | Stefan Parviainen | 2014-12-07 | 3 | -2/+6 |
| | | | | | | | | | | | | | | | | | suggest=1 parameter is given to directory. | ||||
| | | * | | Revert "Revert "Directory shows channel suggestions by default"" | Stefan Parviainen | 2014-12-07 | 4 | -4/+43 |
| | | |/ | | | | | | | | | | This reverts commit bfde28f28eae1f4b00aac03b2714254d14ab7464. | ||||
| | * | | Merge pull request #723 from pafcu/diropts | Thomas Willingham | 2014-12-08 | 4 | -10/+28 |
| | |\ \ | | | | | | | | | Directory sorting as a dropdown, forum filter as checkbox, option to sor... | ||||
| | | * | | Directory sorting as a dropdown, forum filter as checkbox, option to sort ↵ | Stefan Parviainen | 2014-12-07 | 4 | -10/+28 |
| | | |/ | | | | | | | | | | oldest first | ||||
| | * | | Merge pull request #727 from dawnbreak/docu | Thomas Willingham | 2014-12-08 | 6 | -272/+397 |
| | |\ \ | | | | | | | | | Some Doxygen comments and small cleanups. | ||||
| | | * | | Some Doxygen comments and small cleanups. | Klaus Weidenbach | 2014-12-07 | 6 | -272/+397 |
| | | | | | |||||
| | * | | | Merge pull request #731 from zzottel/master | zzottel | 2014-12-08 | 23 | -28/+31 |
| | |\ \ \ | | | | | | | | | | | add main_footer include to all .md files except TOS and README | ||||
| | | * | | | add main_footer include to all .md files except TOS and README | zottel | 2014-12-08 | 23 | -28/+31 |
| | | |/ / | |||||
| | * | | | Merge pull request #728 from cvogeley/master | mrjive | 2014-12-08 | 5 | -130/+42 |
| | |\ \ \ | | |/ / | |/| | | Remove channel cloud files from file system when the channel is removed | ||||
| | | * | | small change | Christian Vogeley | 2014-12-07 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Remove channel cloud files from file system when | Christian Vogeley | 2014-12-07 | 1 | -0/+36 |
| | | | | | | | | | | | | | | | | | the channel is removed | ||||
| | | * | | merge | Christian Vogeley | 2014-12-07 | 1 | -4/+4 |
| | | | | | |||||
| | | * | | merge | Christian Vogeley | 2014-12-07 | 3 | -126/+2 |
| | |/ / | |||||
| | * | | Missing include if photo album widget called from not-the-photos page. | Thomas Willingham | 2014-12-04 | 1 | -1/+2 |
| | | | | |||||
| | * | | Merge pull request #721 from magicoli/master | RedMatrix | 2014-12-04 | 8 | -112/+111 |
| | |\ \ | | | | | | | | | update fr | ||||
| | | * | | update fr: 'to prod', better translated by 'encourager' | Olivier van Helden | 2014-12-04 | 2 | -10/+10 |
| | | | | | |||||
| | | * | | update fr: checked mail templates and another bunch of typoes in strings | Olivier van Helden | 2014-12-04 | 8 | -36/+35 |
| | | | | | |||||
| | | * | | update fr: use prefixFromNow to display time delta in the most used, natural ↵ | Olivier van Helden | 2014-12-04 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | form ("Il y a 2 jours" and not "2 jours auparavant") | ||||
| | | * | | update fr - sorry for multiple posts, I will try to find time to check the ↵ | Olivier van Helden | 2014-12-04 | 2 | -36/+36 |
| | | | | | | | | | | | | | | | | | whole french translation and submit once. | ||||
| | | * | | update fr | Olivier van Helden | 2014-12-04 | 2 | -28/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - resubmitted, after online tests, correct translations for poked, pinged, etc - fix wrong sense for poked - there were two different translations for [red:notify], changed to the most used (Red:Notification) everywhere. | ||||
| | | * | | Merge pull request #2 from friendica/master | Olivier van Helden | 2014-12-03 | 2 | -2/+3 |
| | | |\ \ | | |/ / | |/| | | Pull from friendica/master | ||||
| | * | | | Merge pull request #720 from magicoli/master | Thomas Willingham | 2014-12-04 | 2 | -24/+24 |
| | |\| | | | | | | | | | | update fr | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |