aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* some minor documentation updates and correctionsfriendica2013-11-135-20/+30
|
* Merge https://github.com/friendica/red into zpullfriendica2013-11-131-9/+47
|\
| * Merge pull request #201 from git-marijus/masterfriendica2013-11-131-9/+47
| |\ | | | | | | searchbar work
| | * add font-size to searchbarsmarijus2013-11-131-0/+8
| | |
| | * typomarijus2013-11-131-6/+6
| | |
| | * search placeholder workmarijus2013-11-131-0/+30
| | |
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2013-11-134-3/+12
| | |\ | | |/ | |/|
| | * more searchbar style workmarijus2013-11-131-9/+9
| | |
* | | clicking on an event notification from somebody else should take you to view ↵friendica2013-11-131-1/+1
|/ / | | | | | | event - not edit event. Need to also check permissions on event module because reaching this form shouldn't have been possible without event write permissions.
* / fix photo permissions on encrypted postsfriendica2013-11-134-3/+12
|/
* fix chanviewfriendica2013-11-121-1/+1
|
* fix forbidden photos and vcard photo templatefriendica2013-11-122-4/+5
|
* too many friendica references in the siteinfo panelfriendica2013-11-121-5/+5
|
* removeme sort of works for a single channel - lots of loose ends to deal ↵friendica2013-11-126-38/+64
| | | | with but it's a start
* revert addeditortext changes for tinymce detectionfriendica2013-11-121-6/+5
|
* Merge https://github.com/friendica/red into zpullfriendica2013-11-122-4/+14
|\
| * Merge pull request #199 from oohlaf/fixesOlaf Conradi2013-11-121-3/+13
| |\ | | | | | | Improve Nginx config
| | * Add woff files to static downloadOlaf Conradi2013-11-121-1/+1
| | | | | | | | | | | | This enables font downloading in binary mode.
| | * 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
| |/
* / very crude zid support for e2ee content and move bbcode converter to main.js ↵friendica2013-11-122-123/+135
|/ | | | so it's available when not logged in (though we might ultimately want to force people to get a matrix account to use our encryption).
* 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
|