friendica
44e21c1ef1
Merge https://github.com/friendica/red into zpull
2013-11-13 14:27:47 -08:00
friendica
4e9103830c
clicking on an event notification from somebody else should take you to view 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.
2013-11-13 14:18:07 -08:00
friendica
91f04e69c7
Merge pull request #201 from git-marijus/master
...
searchbar work
2013-11-13 13:46:59 -08:00
marijus
6a9e1f2542
add font-size to searchbars
2013-11-13 19:39:18 +01:00
marijus
83837d89c7
typo
2013-11-13 17:11:51 +01:00
marijus
a10715e4db
search placeholder work
2013-11-13 17:09:42 +01:00
marijus
71fb7f3edf
Merge branch 'master' of https://github.com/friendica/red
2013-11-13 17:04:14 +01:00
friendica
251ba6db30
fix photo permissions on encrypted posts
2013-11-13 03:15:07 -08:00
marijus
71d864f283
more searchbar style work
2013-11-13 10:44:21 +01:00
friendica
a1b8f6e4ec
fix chanview
2013-11-12 23:45:04 -08:00
friendica
be7e732391
fix forbidden photos and vcard photo template
2013-11-12 19:25:23 -08:00
friendica
c803f620e6
too many friendica references in the siteinfo panel
2013-11-12 18:47:55 -08:00
friendica
b26989bb65
removeme sort of works for a single channel - lots of loose ends to deal with but it's a start
2013-11-12 18:27:36 -08:00
friendica
061b438f97
revert addeditortext changes for tinymce detection
2013-11-12 16:48:31 -08:00
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
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
