aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improve Nginx config to prevent php injection in uriOlaf Conradi2013-11-121-2/+12
| | | | First check if php script exists before calling php-fpm.
* Merge pull request #198 from oohlaf/fixesOlaf Conradi2013-11-121-1/+1
|\ | | | | Fix missing argument warning
| * Fix missing argument warningOlaf Conradi2013-11-121-1/+1
|/
* cap width of conversations at 1024pxfriendica2013-11-122-1/+2
|
* basic linking of audio/video tags in encrypted bbcodefriendica2013-11-111-1/+2
|
* having a real problem with $section_width - which is preventing fluid layouts.friendica2013-11-111-0/+2
| | | | | | I don't see an easy way a fixed width can work - either as percentage or a pixel width. I think the right way to do this is probably to set a right-margin - which will let the width float within the constraints of the viewport but should achieve the same result.
* ability to use other ciphersfriendica2013-11-112-1/+6
|
* add rabbit and tripledes ciphers - probably need a pconfig to set the defaultfriendica2013-11-112-7/+42
|
* make e2ee work on tinymcefriendica2013-11-112-4/+19
|
* provide real barebones XSS protection on e2ee contents and implement a few ↵friendica2013-11-111-25/+42
| | | | bbcode tags we're likely to see a lot of. Still need to write a js zid() function to properly implement zrl and zmg but at least they will be linked now.
* localise js ui strings for e2eefriendica2013-11-113-17/+21
|
* Merge https://github.com/friendica/red into zpullfriendica2013-11-112-10/+9
|\
| * Merge pull request #196 from git-marijus/masterfriendica2013-11-112-10/+9
| |\ | | | | | | change spacing to fit other widgets
| | * looks more structured this waymarijus2013-11-111-0/+1
| | |
| | * change spacing to fit other widgetsmarijus2013-11-111-10/+8
| |/
* / because some of the "hints" floating around are pretty pathetic and ↵friendica2013-11-111-1/+11
|/ | | | ambiguous and require a few tries.
* turn safemode into a proper widgetfriendica2013-11-112-1/+4
|
* fix editpost which showed an encrypt button but no other buttonsfriendica2013-11-111-0/+2
|
* change wording on feature to "even more encryption" because otherwise it ↵friendica2013-11-111-1/+1
| | | | sounds like we don't have any at all - and we certainly do.
* remove debugging stufffriendica2013-11-111-1/+5
|
* display encrypted text inlinefriendica2013-11-114-5/+58
|
* Merge https://github.com/friendica/red into zpullfriendica2013-11-102-4/+5
|\
| * More safe search - since the default is one, toggle only works afterThomas Willingham2013-11-112-4/+5
| | | | | | | | | | an initial xconfig is set - the first one will turn safe search on (ie, do nothing from a users point of view). Fix that.
* | e2eefriendica2013-11-106-20/+35
|/
* some more doco for how to finish it.friendica2013-11-102-0/+12
|
* Merge https://github.com/friendica/red into zpullfriendica2013-11-101-1/+1
|\
| * When toggling safesearch, go back to the directory page, rather than the ↵Thomas Willingham2013-11-111-1/+1
| | | | | | | | z_root by default.
* | Didn't finish it. Gotta' pee.friendica2013-11-103-9/+76
| |
* | provide zid in js so we can use it from clientfriendica2013-11-102-1/+3
| |
* | add base64 converters which aren't universal across browsersfriendica2013-11-101-0/+109
|/
* rev updatefriendica2013-11-101-1/+1
|
* too much privacy on get_plink() which is left over from Friendica daysfriendica2013-11-101-1/+1
|
* doc updatefriendica2013-11-0984-894/+1496
|
* Merge https://github.com/friendica/red into zpullfriendica2013-11-095-7/+55
|\ | | | | | | | | Conflicts: mod/directory.php
| * Merge pull request #195 from beardy-unixer/masterfriendica2013-11-095-7/+54
| |\ | | | | | | Fix safe search and also make it an xconfig
| | * Stray lineThomas Willingham2013-11-091-3/+0
| | |
| | * Clean upThomas Willingham2013-11-092-3/+2
| | |
| | * Bring safe search to the UIThomas Willingham2013-11-093-1/+24
| | |
| | * Add a safesearch toggleThomas Willingham2013-11-091-0/+22
| | |
| | * Kill logging/commentThomas Willingham2013-11-091-2/+0
| | |
| | * Fix safe search, and also make it an xconfigThomas Willingham2013-11-092-6/+14
| |/
* | oups... should not do that...marijus2013-11-091-1/+1
| |
* | yes we might need it sometime and we are not supporting IE6 anywaymarijus2013-11-091-9/+5
| |
* | fix directory leaking to ppl which aint got zot in searchbar-autocomplete if ↵marijus2013-11-092-1/+10
| | | | | | | | block_public is enabled
* | oups... something missing...marijus2013-11-091-1/+2
| |
* | some style work on searchbar autocompletemarijus2013-11-091-3/+30
|/
* Wankers.friendica2013-11-0789-0/+6923
|
* we should probably only expire things once...friendica2013-11-071-1/+4
|
* update smiliesfriendica2013-11-071-0/+2
|
* more e2ee infrastructure - at this point if somebody wants it they're going ↵friendica2013-11-071-2/+39
| | | | to have to work for it.