Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | some minor documentation updates and corrections | friendica | 2013-11-13 | 5 | -20/+30 | |
| | | | | ||||||
* | | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-11-13 | 1 | -9/+47 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #201 from git-marijus/master | friendica | 2013-11-13 | 1 | -9/+47 | |
| |\ \ \ \ | | | | | | | | | | | | | searchbar work | |||||
| | * | | | | add font-size to searchbars | marijus | 2013-11-13 | 1 | -0/+8 | |
| | | | | | | ||||||
| | * | | | | typo | marijus | 2013-11-13 | 1 | -6/+6 | |
| | | | | | | ||||||
| | * | | | | search placeholder work | marijus | 2013-11-13 | 1 | -0/+30 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2013-11-13 | 4 | -3/+12 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | more searchbar style work | marijus | 2013-11-13 | 1 | -9/+9 | |
| | | | | | | ||||||
* | | | | | | clicking on an event notification from somebody else should take you to view ↵ | friendica | 2013-11-13 | 1 | -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 posts | friendica | 2013-11-13 | 4 | -3/+12 | |
|/ / / / | ||||||
* | | | | fix chanview | friendica | 2013-11-12 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | fix forbidden photos and vcard photo template | friendica | 2013-11-12 | 2 | -4/+5 | |
| | | | | ||||||
* | | | | too many friendica references in the siteinfo panel | friendica | 2013-11-12 | 1 | -5/+5 | |
| | | | | ||||||
* | | | | removeme sort of works for a single channel - lots of loose ends to deal ↵ | friendica | 2013-11-12 | 6 | -38/+64 | |
| | | | | | | | | | | | | | | | | with but it's a start | |||||
* | | | | revert addeditortext changes for tinymce detection | friendica | 2013-11-12 | 1 | -6/+5 | |
| | | | | ||||||
* | | | | Merge https://github.com/friendica/red into zpull | friendica | 2013-11-12 | 2 | -4/+14 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #199 from oohlaf/fixes | Olaf Conradi | 2013-11-12 | 1 | -3/+13 | |
| |\ \ \ \ | | | | | | | | | | | | | Improve Nginx config | |||||
| | * | | | | Add woff files to static download | Olaf Conradi | 2013-11-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This enables font downloading in binary mode. | |||||
| | * | | | | Improve Nginx config to prevent php injection in uri | Olaf Conradi | 2013-11-12 | 1 | -2/+12 | |
| |/ / / / | | | | | | | | | | | | | | | | First check if php script exists before calling php-fpm. | |||||
| * | | | | Merge pull request #198 from oohlaf/fixes | Olaf Conradi | 2013-11-12 | 1 | -1/+1 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | Fix missing argument warning | |||||
| | * | | | 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 | |
|/ / / | | | | | | | | | | 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 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 | |
| | | | | | | | | | | | | | | | | | | 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 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 ↵ | friendica | 2013-11-11 | 1 | -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 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 | |
| |\ \ \ | | | | | | | | | | | change spacing to fit other widgets | |||||
| | * | | | 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 ↵ | friendica | 2013-11-11 | 1 | -1/+11 | |
|/ / / | | | | | | | | | | ambiguous and require a few tries. | |||||
* | | | 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 ↵ | friendica | 2013-11-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | sounds like we don't have any at all - and we certainly do. | |||||
* | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | an initial xconfig is set - the first one will turn safe search on (ie, do nothing from a users point of view). Fix that. | |||||
* | | | | 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 ↵ | Thomas Willingham | 2013-11-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | z_root by default. | |||||
* | | | | 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 | |
| | | |