Commit graph

8961 commits

Author SHA1 Message Date
friendica
ac7292489c Merge https://github.com/friendica/red into zpull 2013-11-12 15:47:05 -08:00
friendica
8eaab0642f very crude zid support for e2ee content and move bbcode converter to main.js 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). 2013-11-12 15:44:49 -08:00
Olaf Conradi
2f68d1d1ad Merge pull request #199 from oohlaf/fixes
Improve Nginx config
2013-11-12 14:31:29 -08:00
Olaf Conradi
66a6dc1844 Add woff files to static download
This enables font downloading in binary mode.
2013-11-12 23:22:22 +01:00
Olaf Conradi
f55fec9ace Improve Nginx config to prevent php injection in uri
First check if php script exists before calling php-fpm.
2013-11-12 23:21:08 +01:00
Olaf Conradi
428e0c8945 Merge pull request #198 from oohlaf/fixes
Fix missing argument warning
2013-11-12 13:40:14 -08:00
Olaf Conradi
e31dae76ce Fix missing argument warning 2013-11-12 22:26:47 +01:00
Paolo T
67a101452b Merge pull request #4 from friendica/master
Fork aligned to red master
2013-11-12 02:09:32 -08:00
friendica
7cb4c2f8ad cap width of conversations at 1024px 2013-11-12 01:34:09 -08:00
friendica
34ee8de821 basic linking of audio/video tags in encrypted bbcode 2013-11-11 20:20:31 -08:00
friendica
cdcc68a168 having a real problem with $section_width - which is preventing fluid layouts.
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.
2013-11-11 19:45:40 -08:00
friendica
a7c53d470b ability to use other ciphers 2013-11-11 18:42:49 -08:00
friendica
58e0d58489 add rabbit and tripledes ciphers - probably need a pconfig to set the default 2013-11-11 18:31:34 -08:00
friendica
54438be7c2 make e2ee work on tinymce 2013-11-11 17:50:36 -08:00
friendica
d9013f4311 provide real barebones XSS protection on e2ee contents and implement a few 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. 2013-11-11 16:47:49 -08:00
friendica
4a3191cd19 localise js ui strings for e2ee 2013-11-11 15:20:30 -08:00
friendica
6ab8a6a17d Merge https://github.com/friendica/red into zpull 2013-11-11 14:11:52 -08:00
friendica
e095e15f47 because some of the "hints" floating around are pretty pathetic and ambiguous and require a few tries. 2013-11-11 14:10:11 -08:00
friendica
edc1a94f7b Merge pull request #196 from git-marijus/master
change spacing to fit other widgets
2013-11-11 12:13:04 -08:00
marijus
c06dd4b589 looks more structured this way 2013-11-11 18:44:23 +01:00
marijus
f8a34c737d change spacing to fit other widgets 2013-11-11 16:50:43 +01:00
friendica
b5bc04799c turn safemode into a proper widget 2013-11-11 01:18:09 -08:00
friendica
b233166d20 fix editpost which showed an encrypt button but no other buttons 2013-11-11 00:35:33 -08:00
friendica
260d5231a4 change wording on feature to "even more encryption" because otherwise it sounds like we don't have any at all - and we certainly do. 2013-11-11 00:29:25 -08:00
friendica
dc1cb583a0 remove debugging stuff 2013-11-11 00:22:51 -08:00
friendica
435e2dae0e display encrypted text inline 2013-11-11 00:21:00 -08:00
friendica
0adf31eef2 Merge https://github.com/friendica/red into zpull 2013-11-10 23:20:07 -08:00
friendica
ca4103debe e2ee 2013-11-10 23:19:44 -08:00
Thomas Willingham
888d7e05bf More safe search - since the default is one, toggle only works after
an initial xconfig is set - the first one will turn safe search on
(ie, do nothing from a users point of view).  Fix that.
2013-11-11 06:13:17 +00:00
friendica
c392004290 some more doco for how to finish it. 2013-11-10 20:34:10 -08:00
friendica
0f241ab571 Merge https://github.com/friendica/red into zpull 2013-11-10 20:06:27 -08:00
friendica
3a10e698c9 Didn't finish it. Gotta' pee. 2013-11-10 19:58:08 -08:00
Thomas Willingham
c8008039d8 When toggling safesearch, go back to the directory page, rather than the z_root by default. 2013-11-11 03:09:45 +00:00
friendica
effb1a0534 provide zid in js so we can use it from client 2013-11-10 18:57:24 -08:00
friendica
0d28608db7 add base64 converters which aren't universal across browsers 2013-11-10 16:39:21 -08:00
friendica
29e142acb3 rev update 2013-11-10 15:25:13 -08:00
friendica
a6f37739c2 too much privacy on get_plink() which is left over from Friendica days 2013-11-10 14:15:57 -08:00
friendica
97a109eed4 doc update 2013-11-09 12:15:34 -08:00
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