| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | | | Merge pull request #199 from oohlaf/fixes | Olaf Conradi | 2013-11-12 | 1 | -3/+13 |
| |\ \ \ \ |
|
| | * | | | | Add woff files to static download | Olaf Conradi | 2013-11-12 | 1 | -1/+1 |
| | * | | | | Improve Nginx config to prevent php injection in uri | Olaf Conradi | 2013-11-12 | 1 | -2/+12 |
| |/ / / / |
|
| * | | | | Merge pull request #198 from oohlaf/fixes | Olaf Conradi | 2013-11-12 | 1 | -1/+1 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | Fix missing argument warning | Olaf Conradi | 2013-11-12 | 1 | -1/+1 |
| |/ / / |
|
* / / / | very crude zid support for e2ee content and move bbcode converter to main.js ... | friendica | 2013-11-12 | 2 | -123/+135 |
|/ / / |
|
* | | | cap width of conversations at 1024px | friendica | 2013-11-12 | 2 | -1/+2 |
* | | | basic linking of audio/video tags in encrypted bbcode | friendica | 2013-11-11 | 1 | -1/+2 |
* | | | having a real problem with $section_width - which is preventing fluid layouts. | friendica | 2013-11-11 | 1 | -0/+2 |
* | | | ability to use other ciphers | friendica | 2013-11-11 | 2 | -1/+6 |
* | | | add rabbit and tripledes ciphers - probably need a pconfig to set the default | friendica | 2013-11-11 | 2 | -7/+42 |
* | | | make e2ee work on tinymce | friendica | 2013-11-11 | 2 | -4/+19 |
* | | | provide real barebones XSS protection on e2ee contents and implement a few b... | friendica | 2013-11-11 | 1 | -25/+42 |
* | | | localise js ui strings for e2ee | friendica | 2013-11-11 | 3 | -17/+21 |
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-11-11 | 2 | -10/+9 |
|\ \ \ |
|
| * \ \ | Merge pull request #196 from git-marijus/master | friendica | 2013-11-11 | 2 | -10/+9 |
| |\ \ \ |
|
| | * | | | looks more structured this way | marijus | 2013-11-11 | 1 | -0/+1 |
| | * | | | change spacing to fit other widgets | marijus | 2013-11-11 | 1 | -10/+8 |
| |/ / / |
|
* / / / | because some of the "hints" floating around are pretty pathetic and ambiguous... | friendica | 2013-11-11 | 1 | -1/+11 |
|/ / / |
|
* | | | turn safemode into a proper widget | friendica | 2013-11-11 | 2 | -1/+4 |
* | | | fix editpost which showed an encrypt button but no other buttons | friendica | 2013-11-11 | 1 | -0/+2 |
* | | | change wording on feature to "even more encryption" because otherwise it soun... | friendica | 2013-11-11 | 1 | -1/+1 |
* | | | remove debugging stuff | friendica | 2013-11-11 | 1 | -1/+5 |
* | | | display encrypted text inline | friendica | 2013-11-11 | 4 | -5/+58 |
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-11-10 | 2 | -4/+5 |
|\ \ \ |
|
| * | | | More safe search - since the default is one, toggle only works after | Thomas Willingham | 2013-11-11 | 2 | -4/+5 |
* | | | | e2ee | friendica | 2013-11-10 | 6 | -20/+35 |
|/ / / |
|
* | | | some more doco for how to finish it. | friendica | 2013-11-10 | 2 | -0/+12 |
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-11-10 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | When toggling safesearch, go back to the directory page, rather than the z_ro... | Thomas Willingham | 2013-11-11 | 1 | -1/+1 |
* | | | | Didn't finish it. Gotta' pee. | friendica | 2013-11-10 | 3 | -9/+76 |
* | | | | provide zid in js so we can use it from client | friendica | 2013-11-10 | 2 | -1/+3 |
* | | | | add base64 converters which aren't universal across browsers | friendica | 2013-11-10 | 1 | -0/+109 |
|/ / / |
|
* | | | rev update | friendica | 2013-11-10 | 1 | -1/+1 |
* | | | too much privacy on get_plink() which is left over from Friendica days | friendica | 2013-11-10 | 1 | -1/+1 |
* | | | doc update | friendica | 2013-11-09 | 84 | -894/+1496 |
* | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-11-09 | 5 | -7/+55 |
|\ \ \ |
|
| * \ \ | Merge pull request #195 from beardy-unixer/master | friendica | 2013-11-09 | 5 | -7/+54 |
| |\ \ \ |
|
| | * | | | Stray line | Thomas Willingham | 2013-11-09 | 1 | -3/+0 |
| | * | | | Clean up | Thomas Willingham | 2013-11-09 | 2 | -3/+2 |
| | * | | | Bring safe search to the UI | Thomas Willingham | 2013-11-09 | 3 | -1/+24 |
| | * | | | Add a safesearch toggle | Thomas Willingham | 2013-11-09 | 1 | -0/+22 |
| | * | | | Kill logging/comment | Thomas Willingham | 2013-11-09 | 1 | -2/+0 |
| | * | | | Fix safe search, and also make it an xconfig | Thomas Willingham | 2013-11-09 | 2 | -6/+14 |
| |/ / / |
|
* | | | | oups... should not do that... | marijus | 2013-11-09 | 1 | -1/+1 |
* | | | | yes we might need it sometime and we are not supporting IE6 anyway | marijus | 2013-11-09 | 1 | -9/+5 |
* | | | | fix directory leaking to ppl which aint got zot in searchbar-autocomplete if ... | marijus | 2013-11-09 | 2 | -1/+10 |
* | | | | oups... something missing... | marijus | 2013-11-09 | 1 | -1/+2 |
* | | | | some style work on searchbar autocomplete | marijus | 2013-11-09 | 1 | -3/+30 |
|/ / / |
|
* | | | Wankers. | friendica | 2013-11-07 | 89 | -0/+6923 |