aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Minor docoThomas Willingham2014-12-162-2/+7
* add Thomas's Diaspora repair script as include/fixd.php - altered so it can b...friendica2014-12-164-17/+51
* Merge https://github.com/friendica/red into pending_mergefriendica2014-12-1512-1212/+1260
|\
| * Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-12-151-1/+4
| |\
| | * Merge pull request #746 from pafcu/autofollowdocThomas Willingham2014-12-151-1/+4
| | |\
| | | * Document the auto_follow optionStefan Parviainen2014-12-151-1/+4
| * | | Issue #743Thomas Willingham2014-12-153-18/+37
| |/ /
| * | Undo accidental reversion included in last checkinThomas Willingham2014-12-151-2/+2
| * | Doco: How to write foreign doco in how to write doco doco.Thomas Willingham2014-12-152-2/+11
| * | Merge pull request #744 from pafcu/searchhelpThomas Willingham2014-12-154-4/+5
| |\ \
| | * | Add hint on how to use search boxStefan Parviainen2014-12-144-4/+5
| * | | Merge pull request #745 from tuscanhobbit/devPaolo T2014-12-152-1189/+1205
| |\ \ \
| | * | | Updated Italian stringsPaolo Tacconi2014-12-152-1189/+1205
| |/ / /
* / / / wall tagsfriendica2014-12-1510-18/+65
|/ / /
* | / don't remove obsolete hublocs that have no sitekey - it will remove all kinds...friendica2014-12-142-2/+2
| |/ |/|
* | Merge pull request #742 from pafcu/verifieditemclassThomas Willingham2014-12-143-3/+3
|\ \
| * | Add extra class to verified item iconStefan Parviainen2014-12-143-3/+3
* | | Merge pull request #741 from dawnbreak/docuThomas Willingham2014-12-145-227/+231
|\ \ \ | |/ / |/| |
| * | Add security logger to RedDAV.Klaus Weidenbach2014-12-145-227/+231
|/ /
* | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-12-132-47/+47
|\ \
| * | Merge pull request #738 from pafcu/moreidsThomas Willingham2014-12-132-47/+47
| |\|
| | * Add some ids to nav elementsStefan Parviainen2014-12-122-47/+47
* | | Let Diaspora hublocs come back by allowing discover_by_webbie() to carry on ifThomas Willingham2014-12-131-3/+2
|/ /
* | Issue #739Thomas Willingham2014-12-132-1/+18
* | Fix WSOD on loginThomas Willingham2014-12-121-3/+5
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-12136-10355/+13468
|\ \
| * | Update SmartyThomas Willingham2014-12-11132-10329/+13450
| * | move profile css to mod_profile and minoor fixesmarijus2014-12-114-26/+18
* | | doc updatefriendica2014-12-125-0/+721
* | | don't import to sys channel from self-censored authorsfriendica2014-12-1283-1580/+1823
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-1068-1166/+1313
|\ \
| * | Missing ''Thomas Willingham2014-12-101-1/+1
| * | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-12-101-232/+228
| |\ \
| | * | some work on profile page - mostly whitespacemarijus2014-12-101-232/+228
| * | | Bring back 'no special theme for mobile'Thomas Willingham2014-12-101-6/+8
| |/ /
| * | Provide censorship.Thomas Willingham2014-12-101-4/+9
| * | Issue #732Thomas Willingham2014-12-092-2/+28
| * | adjustment to clear browser location button only if use browser location opti...marijus2014-12-092-2/+2
| * | show clear browser location button only if use browser location option is set...marijus2014-12-096-15/+8
| * | Merge pull request #735 from pafcu/jotbtnspacing2git-marijus2014-12-092-56/+68
| |\ \
| | * | Group comment editor iconsStefan Parviainen2014-12-081-28/+34
| | * | Put some spacing between share types and other buttons in jotStefan Parviainen2014-12-081-28/+34
| | |/
| * | Merge pull request #733 from pafcu/rewordoptionalgit-marijus2014-12-095-10/+10
| |\ \ | | |/ | |/|
| | * Make it clear that title and categories are optionalStefan Parviainen2014-12-085-10/+10
| |/
| * Merge pull request #726 from pafcu/tagsinotherchannelsThomas Willingham2014-12-083-262/+273
| |\
| | * Show tags in other channels profile field to make it easier to navigate to th...Stefan Parviainen2014-12-073-262/+273
| * | Merge pull request #724 from pafcu/suggestionsindirThomas Willingham2014-12-083-4/+47
| |\ \
| | * | Suggestions in dir redux. Suggestions are now showed in directory if suggest=...Stefan Parviainen2014-12-073-2/+6
| | * | Revert "Revert "Directory shows channel suggestions by default""Stefan Parviainen2014-12-074-4/+43
| | |/
| * | Merge pull request #723 from pafcu/diroptsThomas Willingham2014-12-084-10/+28
| |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 12:16:27 +0000