aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* acl in webpages and a couple of other little bits related to webpages - sort ...friendica2013-11-144-19/+41
* E2EE on private mail (also fixed autocomplete results dropdown for recipient ...friendica2013-11-134-8/+22
* issues with converse_width uncovered during testingfriendica2013-11-133-3/+3
* change section_width to converse_widthfriendica2013-11-133-12/+9
* 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
| |\
| | * 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
|/ /
* / 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 with...friendica2013-11-126-38/+64
* 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
| |\
| | * Add woff files to static downloadOlaf Conradi2013-11-121-1/+1
| | * Improve Nginx config to prevent php injection in uriOlaf Conradi2013-11-121-2/+12
| |/
| * Merge pull request #198 from oohlaf/fixesOlaf Conradi2013-11-121-1/+1
| |\
| | * 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
|/
* 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
* 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 b...friendica2013-11-111-25/+42
* 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
| |\
| | * 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 ambiguous...friendica2013-11-111-1/+11
|/
* 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 soun...friendica2013-11-111-1/+1
* 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
* | 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 z_ro...Thomas Willingham2013-11-111-1/+1