aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Thomas Willingham2013-12-18827-17329/+33904
|\ | | | | | | | | Conflicts: mod/page.php
| * Merge pull request #245 from tuscanhobbit/masterPaolo T2013-12-182-1473/+1282
| |\ | | | | | | corrections to italian translation
| | * corrections to italian translationp.tacconi2013-12-182-1473/+1282
| | |
| * | split off mod_connections into mod_connections & mod_connedit - lots of ↵friendica2013-12-189-545/+160
| | | | | | | | | | | | links to fix
| * | split mod/connections for comanchificationfriendica2013-12-171-0/+708
| | |
| * | more comanche stufffriendica2013-12-174-6/+2
| | |
| * | Merge https://github.com/friendica/red into zpullfriendica2013-12-171-4/+7
| |\ \
| | * \ Merge pull request #244 from zzottel/masterfriendica2013-12-171-4/+7
| | |\ \ | | | | | | | | | | JS-less display module
| | | * | JS-less displayzottel2013-12-171-4/+7
| | |/ /
| * / / authtest: do a better job of success/failure indicationfriendica2013-12-173-3/+8
| |/ /
| * | There's always more to do...friendica2013-12-161-0/+2
| | |
| * | Merge https://github.com/friendica/red into zpullfriendica2013-12-162-91/+35
| |\ \
| | * \ Merge pull request #243 from git-marijus/masterfriendica2013-12-162-91/+35
| | |\ \ | | | | | | | | | | some more style.css work
| | | * | move some stuff back to mod_connections.cssmarijus2013-12-162-34/+31
| | | | |
| | | * | remove some cruft and a typomarijus2013-12-161-57/+4
| | | | |
| | | * | Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-1629-169/+1125
| | | |\ \
| | | * \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-144-5/+29
| | | |\ \ \
| | | * \ \ \ Merge branch 'master' of https://github.com/friendica/redmarijus2013-12-13114-2297/+2429
| | | |\ \ \ \
| * | | | | | | Tricky little bug. Allowed somebody to bypass comment permissions. Hopefully ↵friendica2013-12-161-3/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | the fix will have no undesired side effects.
| * | | | / / bring back the collection edit sidebar widget on the connection edit page ↵friendica2013-12-161-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | until I sort out Comanche on that page.
| * | | | | install redbasic during setup so that at least one theme is registered. ↵friendica2013-12-162-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise none of the display settings seem to work very well.
| * | | | | 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 ↵friendica2013-12-152-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | accepts a string as an algorithm. Earlier versions didn't recognise sha256. So we'll look to see if the algorithm constant for sha256 is defined and if so we'll use that instead of the string.
| * | | | | 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. ↵friendica2013-12-158-43/+870
| | | | | | | | | | | | | | | | | | | | | | | | There was a bit of re-org of mod/home, which might alter the behaviour for some existing sites. Basically we're not showing a login box at all if you've got home.html - there should be a login link in th nav bar. If you haven't defined anything at all we'll fall back to the old behaviour but still allow the home contents to be set via plugin.
| * | | | | Provide a fallback channel to probe for magic-auth when we have no prior ↵friendica2013-12-156-24/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | communications with a site. This will be a system channel if one exists, otherwise any channel will do. We'll try to use the first valid channel on the site because that was probably created when the site was installed and is the closest thing to a system channel we've got.
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | but leave off suggest and invite
| * | | | | a couple more comanche conversionsfriendica2013-12-147-86/+142
| | |_|/ / | |/| | |
| * | | | Merge https://github.com/friendica/red into zpullfriendica2013-12-132-25/+31
| |\ \ \ \
| | * | | | Merge pull request #242 from git-marijus/masterfriendica2013-12-132-25/+31
| | |\| | | | | | | | | | | | | | | move affinity slider to widgets.css and minor cleanup
| | | * | | mark some things for deletionmarijus2013-12-121-1/+11
| | | | | |
| | | * | | move affinity slider to widgets.css and minor cleanupmarijus2013-12-122-24/+20
| | | | | |
| * | | | | prepare for Comanchification of mod_photosfriendica2013-12-133-3/+27
| |/ / / /
| * | / / categories should already be html encoded - ensure this is the case but ↵friendica2013-12-131-2/+2
| | |/ / | |/| | | | | | | | | | don't double encode
| * | | 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 ↵friendica2013-12-121-2/+24
| |/ / | | | | | | | | | visited so there is no http/https mismatch.
| * | Merge pull request #241 from zzottel/masterzzottel2013-12-121-1/+1
| |\ \ | | | | | | | | htmspecialchars_decode only takes one argument.
| | * | 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 ↵friendica2013-12-117-87/+55
| | | | | | | | | | | | several places, and this was a bit greedy in the set of characters which were converted from utf-8 to HTML entities. Also brought mail attachments up to date so they are rendered identically to item attachments.