aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-1629-169/+1125
|\
| * install redbasic during setup so that at least one theme is registered. Other...friendica2013-12-162-1/+3
| * some re-work of mod_sourcesfriendica2013-12-154-4/+25
| * use 'a' ACL search instead of 'm' ACL search for mod_sourcesfriendica2013-12-151-0/+2
| * bloody hell - it isn't defined either.friendica2013-12-151-2/+2
| * bloody hell... php version incompatibility with openssl - openssl no longer a...friendica2013-12-152-1/+12
| * headline spacingfriendica2013-12-152-2/+3
| * use consistent font-size for textfriendica2013-12-152-3/+3
| * improve the flow of the message a bitfriendica2013-12-151-3/+5
| * change the top margin so the headline gets in.friendica2013-12-151-1/+1
| * can't use an access file or we can't see the assetsfriendica2013-12-151-4/+0
| * set system.projecthome to 1 if you want the project page for a home page. The...friendica2013-12-158-43/+870
| * Provide a fallback channel to probe for magic-auth when we have no prior comm...friendica2013-12-156-24/+61
| * use sitename for the banner if nothing else has been setfriendica2013-12-141-1/+1
| * missed thisfriendica2013-12-141-7/+9
| * make home.html fullpage mode - make directory search work for non-logged in, ...friendica2013-12-144-13/+12
| * a couple more comanche conversionsfriendica2013-12-147-86/+142
* | Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-144-5/+29
|\|
| * Merge https://github.com/friendica/red into zpullfriendica2013-12-132-25/+31
| |\
| | * Merge pull request #242 from git-marijus/masterfriendica2013-12-132-25/+31
| | |\
| * | | prepare for Comanchification of mod_photosfriendica2013-12-133-3/+27
| |/ /
| * | categories should already be html encoded - ensure this is the case but don't...friendica2013-12-131-2/+2
* | | Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-13114-2297/+2429
|\| | | |/ |/|
| * doc additionsfriendica2013-12-132-0/+141
| * add construct_page hookfriendica2013-12-13111-2295/+2264
| * always load css and js sources using the same url as the page that is being v...friendica2013-12-121-2/+24
* | mark some things for deletionmarijus2013-12-121-1/+11
* | move affinity slider to widgets.css and minor cleanupmarijus2013-12-122-24/+20
|/
* Merge pull request #241 from zzottel/masterzzottel2013-12-121-1/+1
|\
| * htmspecialchars_decode only takes one argument.zottel2013-12-121-1/+1
|/
* more htmlspecialchars sanitisationfriendica2013-12-124-7/+7
* check that every invocation of htmlspecialchars has the right arg listfriendica2013-12-128-10/+10
* issue #240 - we were using htmlentities instead of htmlspecialchars in severa...friendica2013-12-117-87/+55
* cmax wasn't defaulting correctlyfriendica2013-12-111-1/+4
* The affinity tool is not a "traditional" widget. But it is nevertheless a wid...friendica2013-12-114-27/+34
* head_remove_css, head_remove_jsfriendica2013-12-111-1/+17
* missing brace in redbasic style.cssfriendica2013-12-112-0/+2
* Merge https://github.com/friendica/red into zpullfriendica2013-12-1113-1695/+1702
|\
| * Merge pull request #239 from git-marijus/masterfriendica2013-12-119-124/+165
| |\
| | * this is not needed anymoremarijus2013-12-112-5/+1
| | * .selected is in use for something else alreadymarijus2013-12-111-1/+1
| | * also add group widget to widgets.cssmarijus2013-12-112-31/+33
| | * unify styling a littlemarijus2013-12-112-15/+10
| | * split out widgets.cssmarijus2013-12-113-79/+132
| | * we dont use doubble tagging in /network and /channel anymore... remove it fro...marijus2013-12-111-7/+1
| | * this saves notes on the fly. i think this is appropriate behavior for a notes...marijus2013-12-111-6/+3
| | * this makes quotes appear as quotes in notes once page is reloaded. i guess th...marijus2013-12-111-1/+1
| | * make suggest channels a featuremarijus2013-12-112-1/+5
| | * make empty notes saveable as wellmarijus2013-12-111-2/+2
| * | Don't let nobody set an xconfig in safe search.Thomas Willingham2013-12-112-1/+4
| |/