Commit graph

8472 commits

Author SHA1 Message Date
friendica
e06b0aa767 Merge https://github.com/friendica/red into zpull
Conflicts:
	mod/directory.php
2013-11-09 12:14:06 -08:00
friendica
1f16dd3bb0 Merge pull request #195 from beardy-unixer/master
Fix safe search and also make it an xconfig
2013-11-09 12:10:54 -08:00
Thomas Willingham
bbe16eba34 Stray line 2013-11-09 18:49:50 +00:00
Thomas Willingham
8569fda732 Clean up 2013-11-09 18:45:52 +00:00
Thomas Willingham
7b29400c6c Bring safe search to the UI 2013-11-09 18:43:40 +00:00
Thomas Willingham
6f2163a08e Add a safesearch toggle 2013-11-09 18:13:08 +00:00
marijus
b2bb308e24 oups... should not do that... 2013-11-09 18:32:59 +01:00
marijus
1ee9e8caf8 yes we might need it sometime and we are not supporting IE6 anyway 2013-11-09 18:14:39 +01:00
marijus
3fbf78a859 fix directory leaking to ppl which aint got zot in searchbar-autocomplete if block_public is enabled 2013-11-09 17:56:19 +01:00
Thomas Willingham
420a80e8f3 Kill logging/comment 2013-11-09 15:38:24 +00:00
Thomas Willingham
c030330abc Fix safe search, and also make it an xconfig 2013-11-09 15:36:14 +00:00
marijus
b54858d35f oups... something missing... 2013-11-09 15:54:53 +01:00
marijus
5538972fec some style work on searchbar autocomplete 2013-11-09 15:48:59 +01:00
friendica
3a9cbcaf01 Wankers. 2013-11-07 23:25:13 -08:00
friendica
90ab0d963b we should probably only expire things once... 2013-11-07 22:45:13 -08:00
friendica
4b3db9b523 update smilies 2013-11-07 20:48:46 -08:00
friendica
fc317172d5 more e2ee infrastructure - at this point if somebody wants it they're going to have to work for it. 2013-11-07 20:18:52 -08:00
friendica
cb37c0ce14 make PM expiry UI match the main post editor, e.g. JS input triggered by an icon rather than a scary looking text field 2013-11-07 15:30:59 -08:00
friendica
7381326b7a provide expire feature on post and comments as well as private messages. 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. 2013-11-07 00:47:50 -08:00
friendica
df4c917120 Merge https://github.com/friendica/red into zpull 2013-11-06 18:37:02 -08:00
friendica
6162de142c allow private mail sender to set an expiration on their messages. Once 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". 2013-11-06 18:28:36 -08:00
friendica
8b9633e46b DB - allow private messages to expire 2013-11-06 17:27:51 -08:00
Thomas Willingham
c2cf3254c8 Don't fart if we've got a schema that doesn't exist at this hub. 2013-11-06 17:17:12 +00:00
friendica
310ccfda99 INSTALL for dummies - step 1: ensure that we throw an ugly error message in 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.
2013-11-05 19:45:02 -08:00
friendica
5c71ccba98 add shameless plug if they've not got zot, and add photo favicon to photos pages 2013-11-05 18:20:37 -08:00
friendica
5b3adf7755 more work on channel removal - it might sort of work now but I'm expecting 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. 2013-11-05 17:43:32 -08:00
friendica
f4cb145f3c redbasic - allow changing icon colours 2013-11-05 16:21:38 -08:00
friendica
b15c9de1e5 soften the background a bit more 2013-11-05 15:34:17 -08:00
friendica
e28b12a5e1 Merge https://github.com/friendica/red into zpull 2013-11-05 15:31:03 -08:00
friendica
4a371480c8 Merge pull request #193 from git-marijus/master
make the font-colour for the banner adjustable as well
2013-11-05 15:33:17 -08:00
friendica
b4f8c247a2 soften the colours a wee bit for the default case 2013-11-05 15:29:44 -08:00
marijus
9dfa7c6030 make the font-colour for the banner adjustable as well 2013-11-06 00:16:02 +01:00
friendica
f9e97d97ac Merge https://github.com/friendica/red into zpull 2013-11-05 15:01:06 -08:00
friendica
93a63abcd6 bit of README cleanup 2013-11-05 15:00:33 -08:00
Olaf Conradi
2bed0f30a9 Merge pull request #192 from oohlaf/fixes
Fix Nginx config for Nginx 1.4.x
2013-11-05 14:33:22 -08:00
Olaf Conradi
37e8be8d3b Fix Nginx config for Nginx 1.4.x 2013-11-05 23:30:21 +01:00
friendica
5b48ab772b fix private group delivery 2013-11-05 14:26:31 -08:00
friendica
727e8cc298 don't store update records if we're not a directory server of some kind 2013-11-04 20:43:32 -08:00
friendica
f89e7b2bd5 make the storage permissions tweakable for hosted environments where they may require tweaking. 2013-11-04 19:21:09 -08:00
friendica
1c5e2b8645 solid progress on attach_mkdir - but we need to figure out where to store default file permissions. This should be separate from post/item permissions and we won't be able to set permissions from the DAV interface so if we want something private we have to provide these permissions in our preferences. 2013-11-04 19:08:34 -08:00
friendica
372a92533f tag notifications for private posts contain obscured data - they should be blank 2013-11-04 16:53:42 -08:00
friendica
c61a0d9dab private tagged posts weren't creating second delivery chain - they were incorrectly being marked as "in a reshare" due to being obscured. 2013-11-04 16:44:23 -08:00
friendica
d783183572 add attach_mkdir() 2013-11-03 20:55:58 -08:00
friendica
a966e53ee4 hmmph. That's why the sort order didn't change... 2013-11-03 15:22:22 -08:00
friendica
cea11c9498 make date order the default for the directory 2013-11-03 15:20:40 -08:00
friendica
72287b2478 fix the saved search term delete icons in redbasic so they are hidden by default. This is a bit harder using font-based icons than it was with images that could easily be hidden. We'll do it with opacity instead of visibility or display css settings. 2013-11-03 15:14:31 -08:00
friendica
4d470f2d70 add sloppy photo setting and fix default navbar hide setting 2013-11-03 14:57:29 -08:00
friendica
5ba813397b provide nav_min_opacity which allows the navbar to fade or even vanish until hovered with a value of for instance '0'; 2013-11-03 14:26:42 -08:00
friendica
8a75e92020 rev update and de string fix 2013-11-03 00:38:11 -07:00
friendica
1554b7a56a Merge pull request #191 from maase2/patch-1
Update messages.po
2013-11-03 00:38:39 -07:00