aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \
| | * | Directory sorting as a dropdown, forum filter as checkbox, option to sort old...Stefan Parviainen2014-12-074-10/+28
| | |/
| * | Merge pull request #727 from dawnbreak/docuThomas Willingham2014-12-086-272/+397
| |\ \
| | * | Some Doxygen comments and small cleanups.Klaus Weidenbach2014-12-076-272/+397
| * | | Merge pull request #731 from zzottel/masterzzottel2014-12-0823-28/+31
| |\ \ \
| | * | | add main_footer include to all .md files except TOS and READMEzottel2014-12-0823-28/+31
| | |/ /
| * | | Merge pull request #728 from cvogeley/mastermrjive2014-12-085-130/+42
| |\ \ \ | | |/ / | |/| |
| | * | small changeChristian Vogeley2014-12-071-1/+1
| | * | Remove channel cloud files from file system whenChristian Vogeley2014-12-071-0/+36
| | * | mergeChristian Vogeley2014-12-071-4/+4
| | * | mergeChristian Vogeley2014-12-073-126/+2
| |/ /
| * | Missing include if photo album widget called from not-the-photos page.Thomas Willingham2014-12-041-1/+2
| * | Merge pull request #721 from magicoli/masterRedMatrix2014-12-048-112/+111
| |\ \
| | * | update fr: 'to prod', better translated by 'encourager'Olivier van Helden2014-12-042-10/+10
| | * | update fr: checked mail templates and another bunch of typoes in stringsOlivier van Helden2014-12-048-36/+35
| | * | update fr: use prefixFromNow to display time delta in the most used, natural ...Olivier van Helden2014-12-042-4/+4
| | * | update fr - sorry for multiple posts, I will try to find time to check the wh...Olivier van Helden2014-12-042-36/+36
| | * | update frOlivier van Helden2014-12-042-28/+28
| | * | Merge pull request #2 from friendica/masterOlivier van Helden2014-12-032-2/+3
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #720 from magicoli/masterThomas Willingham2014-12-042-24/+24
| |\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 16:30:06 +0000