Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-16 | 2 | -2/+7 |
|\ | |||||
| * | Minor doco | Thomas Willingham | 2014-12-16 | 2 | -2/+7 |
| | | |||||
* | | edit and preview removed from additional features and turned into core ↵ | friendica | 2014-12-16 | 7 | -11/+10 |
| | | | | | | | | functionality (always enabled). | ||||
* | | build a channel based thread viewing link when in list_mode and when using ↵ | friendica | 2014-12-16 | 2 | -2/+10 |
|/ | | | | the channel module, which will disable list_mode (this was checked in yesterday) for the benefit of viewing threads with the correct identities and comment permissions instead of relying on the semi-random uid chosen by mod/display when viewed by an authenticated remote_user(). | ||||
* | add Thomas's Diaspora repair script as include/fixd.php - altered so it can ↵ | friendica | 2014-12-16 | 4 | -17/+51 |
| | | | | | | be re-run if necessary with a count of remaining hublocs to be fixed. Some sites are down so it probably can't ever get to zero. The check for a null join is quite an expensive query. It could block your DB for a couple minutes while it runs. Also some preliminary work on a means to take the channel module out of list/forum mode if a specific mid is requested. | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-12-15 | 12 | -1212/+1260 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/friendica/red | Thomas Willingham | 2014-12-15 | 1 | -1/+4 |
| |\ | |||||
| | * | Merge pull request #746 from pafcu/autofollowdoc | Thomas Willingham | 2014-12-15 | 1 | -1/+4 |
| | |\ | | | | | | | | | Document the auto_follow option | ||||
| | | * | Document the auto_follow option | Stefan Parviainen | 2014-12-15 | 1 | -1/+4 |
| | | | | |||||
| * | | | Issue #743 | Thomas Willingham | 2014-12-15 | 3 | -18/+37 |
| |/ / | |||||
| * | | Undo accidental reversion included in last checkin | Thomas Willingham | 2014-12-15 | 1 | -2/+2 |
| | | | |||||
| * | | Doco: How to write foreign doco in how to write doco doco. | Thomas Willingham | 2014-12-15 | 2 | -2/+11 |
| | | | |||||
| * | | Merge pull request #744 from pafcu/searchhelp | Thomas Willingham | 2014-12-15 | 4 | -4/+5 |
| |\ \ | | | | | | | | | Add hint on how to use search box | ||||
| | * | | 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 | ||||
| | * | | | Updated Italian strings | Paolo Tacconi | 2014-12-15 | 2 | -1189/+1205 |
| |/ / / | |||||
* / / / | wall tags | friendica | 2014-12-15 | 10 | -18/+65 |
|/ / / | |||||
* | / | don't remove obsolete hublocs that have no sitekey - it will remove all ↵ | friendica | 2014-12-14 | 2 | -2/+2 |
| |/ |/| | | | | | kinds of other hublocs it isn't supposed to (e.g. diaspora). | ||||
* | | Merge pull request #742 from pafcu/verifieditemclass | Thomas Willingham | 2014-12-14 | 3 | -3/+3 |
|\ \ | | | | | | | Add extra class to verified item icon | ||||
| * | | 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. | ||||
| * | | Add security logger to RedDAV. | Klaus Weidenbach | 2014-12-14 | 5 | -227/+231 |
|/ / | | | | | | | Some smaller clean ups whitepsaces and tabs, use PHP_EOL, Doxygen, etc. | ||||
* | | 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 |