aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update SmartyThomas Willingham2014-12-11132-10329/+13450
|
* move profile css to mod_profile and minoor fixesmarijus2014-12-114-26/+18
|
* 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 ↵marijus2014-12-092-2/+2
| | | | | | | | option is set
| * show clear browser location button only if use browser location option is ↵marijus2014-12-096-15/+8
| | | | | | | | set and minor css fixes
| * Merge pull request #735 from pafcu/jotbtnspacing2git-marijus2014-12-092-56/+68
| |\ | | | | | | Put some spacing between share types and other buttons in jot
| | * 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 optional
| | * 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 ...
| | * Show tags in other channels profile field to make it easier to navigate to ↵Stefan Parviainen2014-12-073-262/+273
| | | | | | | | | | | | the channels
| * | Merge pull request #724 from pafcu/suggestionsindirThomas Willingham2014-12-083-4/+47
| |\ \ | | | | | | | | Show suggestions in directory
| | * | Suggestions in dir redux. Suggestions are now showed in directory if ↵Stefan Parviainen2014-12-073-2/+6
| | | | | | | | | | | | | | | | suggest=1 parameter is given to directory.
| | * | Revert "Revert "Directory shows channel suggestions by default""Stefan Parviainen2014-12-074-4/+43
| | |/ | | | | | | | | | This reverts commit bfde28f28eae1f4b00aac03b2714254d14ab7464.
| * | Merge pull request #723 from pafcu/diroptsThomas Willingham2014-12-084-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 Parviainen2014-12-074-10/+28
| | |/ | | | | | | | | | oldest first
| * | Merge pull request #727 from dawnbreak/docuThomas Willingham2014-12-086-272/+397
| |\ \ | | | | | | | | Some Doxygen comments and small cleanups.
| | * | 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 README
| | * | | 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
| |\ \ \ | | |/ / | |/| | Remove channel cloud files from file system when the channel is removed
| | * | small changeChristian Vogeley2014-12-071-1/+1
| | | |
| | * | Remove channel cloud files from file system whenChristian Vogeley2014-12-071-0/+36
| | | | | | | | | | | | | | | | the channel is removed
| | * | 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
| | * | 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
| | | | | | | | | | | | | | | | 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 Helden2014-12-042-36/+36
| | | | | | | | | | | | | | | | whole french translation and submit once.
| | * | update frOlivier van Helden2014-12-042-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/masterOlivier van Helden2014-12-032-2/+3
| | |\ \ | | |/ / | |/| | Pull from friendica/master
| * | | Merge pull request #720 from magicoli/masterThomas Willingham2014-12-042-24/+24
| |\| | | | | | | | | | update fr
| | * | update fr: fix typo and ambiguous changes in ↵Olivier van Helden2014-12-032-11/+11
| | | | | | | | | | | | | | | | 1ea73a55e8276006b4c0f0307dfbe2a35acdff33
| | * | update fr typoesOlivier van Helden2014-12-032-33/+33
| | | |
| | * | Merge pull request #1 from friendica/masterOlivier van Helden2014-12-03478-36595/+54051
| | |\ \ | | | | | | | | | | Merge master from friendica
| * | | | Put dir back - the fat lady didn't sing afterall.Thomas Willingham2014-12-042-2/+3
| | |/ / | |/| |
* / | | block adult channels from inclusion in public content feedsfriendica2014-12-105-708/+708
|/ / /
* | | add comodo intermediate certs and a method to add other intermediate certs.friendica2014-12-035-2/+4080
| | |
* | | can't reset public to false because it may have been passed in as true and ↵friendica2014-12-011-5/+5
| | | | | | | | | | | | this would be wrong and cause even more subtle bugs. Reset to whatever value was passed in.
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-12-0123-8754/+8897
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: version.inc
| * | | Don't allow affinity of 0 in connedit.Thomas Willingham2014-12-023-2/+3
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-03 03:08:43 +0000