aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* make PM expiry UI match the main post editor, e.g. JS input triggered by an ↵friendica2013-11-074-14/+29
| | | | icon rather than a scary looking text field
* provide expire feature on post and comments as well as private messages. ↵friendica2013-11-0714-14/+58
| | | | This requires a feature setting and is currently unmaskable - if the author says it's gone, there's not a lot you can do to stop it or try and save it. It's gone.
* Merge https://github.com/friendica/red into zpullfriendica2013-11-061-1/+4
|\
| * Don't fart if we've got a schema that doesn't exist at this hub.Thomas Willingham2013-11-061-1/+4
| |
* | allow private mail sender to set an expiration on their messages. Once ↵friendica2013-11-066-13/+32
| | | | | | | | expired the message is destroyed at both ends (subject to the granularity of the polling interval) and is gone. Officially it takes some form of language independent string like 2013/11/22, but English speakers can use anything that strtotime() understands, like "+30 minutes" or "next Tuesday".
* | DB - allow private messages to expirefriendica2013-11-065-23/+32
|/
* INSTALL for dummies - step 1: ensure that we throw an ugly error message in ↵friendica2013-11-053-0/+41
| | | | | | | their face if there's an ugly error when we first try to install. DON'T white screen until after they've got it running.
* add shameless plug if they've not got zot, and add photo favicon to photos pagesfriendica2013-11-052-2/+8
|
* more work on channel removal - it might sort of work now but I'm expecting ↵friendica2013-11-051-4/+22
| | | | lots of issues. Hence there is still no code in chanman to start the process rolling and make it happen. Will need a barrage of test cases.
* redbasic - allow changing icon coloursfriendica2013-11-055-44/+66
|
* soften the background a bit morefriendica2013-11-051-2/+2
|
* Merge https://github.com/friendica/red into zpullfriendica2013-11-054-5/+13
|\
| * Merge pull request #193 from git-marijus/masterfriendica2013-11-054-5/+13
| |\ | | | | | | make the font-colour for the banner adjustable as well
| | * make the font-colour for the banner adjustable as wellmarijus2013-11-064-5/+13
| |/
* / soften the colours a wee bit for the default casefriendica2013-11-051-3/+3
|/
* Merge https://github.com/friendica/red into zpullfriendica2013-11-051-7/+10
|\
| * Merge pull request #192 from oohlaf/fixesOlaf Conradi2013-11-051-7/+10
| |\ | | | | | | Fix Nginx config for Nginx 1.4.x