Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #744 from pafcu/searchhelp | Thomas Willingham | 2014-12-15 | 4 | -4/+5 |
|\ | |||||
| * | Add hint on how to use search box | Stefan Parviainen | 2014-12-14 | 4 | -4/+5 |
* | | Merge pull request #745 from tuscanhobbit/dev | Paolo T | 2014-12-15 | 2 | -1189/+1205 |
|\ \ | |||||
| * | | Updated Italian strings | Paolo Tacconi | 2014-12-15 | 2 | -1189/+1205 |
|/ / | |||||
* | | don't remove obsolete hublocs that have no sitekey - it will remove all kinds... | friendica | 2014-12-14 | 2 | -2/+2 |
* | | Merge pull request #742 from pafcu/verifieditemclass | Thomas Willingham | 2014-12-14 | 3 | -3/+3 |
|\ \ | |||||
| * | | Add extra class to verified item icon | Stefan Parviainen | 2014-12-14 | 3 | -3/+3 |
* | | | Merge pull request #741 from dawnbreak/docu | Thomas Willingham | 2014-12-14 | 5 | -227/+231 |
|\ \ \ | |/ / |/| | | |||||
| * | | Add security logger to RedDAV. | Klaus Weidenbach | 2014-12-14 | 5 | -227/+231 |
|/ / | |||||
* | | 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 | 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 |
|/ / | |||||
* | | 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 opti... | marijus | 2014-12-09 | 2 | -2/+2 |
| * | | show clear browser location button only if use browser location option is set... | marijus | 2014-12-09 | 6 | -15/+8 |
| * | | Merge pull request #735 from pafcu/jotbtnspacing2 | git-marijus | 2014-12-09 | 2 | -56/+68 |
| |\ \ | |||||
| | * | | 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 | 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 to th... | Stefan Parviainen | 2014-12-07 | 3 | -262/+273 |
| * | | Merge pull request #724 from pafcu/suggestionsindir | Thomas Willingham | 2014-12-08 | 3 | -4/+47 |
| |\ \ | |||||
| | * | | Suggestions in dir redux. Suggestions are now showed in directory if suggest=... | Stefan Parviainen | 2014-12-07 | 3 | -2/+6 |
| | * | | Revert "Revert "Directory shows channel suggestions by default"" | Stefan Parviainen | 2014-12-07 | 4 | -4/+43 |
| | |/ | |||||
| * | | 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 sort old... | Stefan Parviainen | 2014-12-07 | 4 | -10/+28 |
| | |/ | |||||
| * | | Merge pull request #727 from dawnbreak/docu | Thomas Willingham | 2014-12-08 | 6 | -272/+397 |
| |\ \ | |||||
| | * | | 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 | zottel | 2014-12-08 | 23 | -28/+31 |
| | |/ / | |||||
| * | | | Merge pull request #728 from cvogeley/master | mrjive | 2014-12-08 | 5 | -130/+42 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | 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 |
| | * | | merge | Christian Vogeley | 2014-12-07 | 1 | -4/+4 |
| | * | | merge | Christian Vogeley | 2014-12-07 | 3 | -126/+2 |
| |/ / |