Commit graph

8131 commits

Author SHA1 Message Date
friendica
e62dfc6f8a add a flag field to xtags so that we can filter tags based on whether or not the parent xchan is safe or not. Otherwise we'll have tags that lead to nowhere because the directory entry is hidden but the tag isn't. A successful porn site in the matrix could also swamp the directory with x-rated tags, even if the site was playing nice and did everything right to self-censor. Accomplishing this with joins would be horrendously inefficient, though it will take a bit of code re-org to get this flag where it needs to be when it's time to set keywords. 2013-09-19 22:27:12 -07:00
friendica
53de5f348a typo 2013-09-19 21:51:52 -07:00
friendica
e81db4428d now bring it to the url 2013-09-19 21:48:55 -07:00
friendica
977b350866 bring safe mode to the client side 2013-09-19 21:45:09 -07:00
friendica
6cb81f6e47 use &safe=-1 for unsafe only 2013-09-19 21:36:22 -07:00
friendica
876a9d1850 missing hash 2013-09-19 21:13:45 -07:00
friendica
82bd1420cc Merge https://github.com/friendica/red into zpull 2013-09-19 19:54:08 -07:00
friendica
54abed8457 provide a "safe search" backend and allow for self-censorship using nsfw or adult profile keywords. Eventually the directories will be forced to mark adult profiles and sync this knowledge between them. At the moment there's no way to do an unsafe search, but we really just need a checkbox and pass the value through directory to dirsearch on the back end, and some will want this as a pconfig. 2013-09-19 19:50:13 -07:00
Thomas Willingham
30f85a19b1 Use get_config 2013-09-20 03:24:38 +01:00
Thomas Willingham
49cfca4b4c Make $kw configurable. 2013-09-20 02:38:59 +01:00
friendica
9f237f7dba Merge https://github.com/friendica/red into zpull 2013-09-19 17:41:08 -07:00
friendica
ef88ba11ba prefill private mail recip from $_REQUEST['to'] if it's there. 2013-09-19 17:40:17 -07:00
Thomas Willingham
2eaea80195 Add tiered access option. 2013-09-19 22:36:25 +01:00
friendica
a5656c350d trim commas from keywords 2013-09-19 01:45:06 -07:00
friendica
c0e8b0cd9d Merge branch 'zpull'
Conflicts:
	boot.php
	install/database.sql
	install/update.php
2013-09-19 01:10:10 -07:00
friendica
63fc92b9e5 sync item_search with yesterday's network fix for collections. Add ud_addr to update table to store the target address since it's possible the mirroring directory won't yet have an xchan or hubloc they can link the ud_hash to and therefore mayn't know how to contact them. 2013-09-19 01:01:51 -07:00
friendica
14f6bf06e7 set default charset of email_header_encode, add ud_flags to indicate which (directory sync) updates have been processed in some way. 2013-09-18 21:22:08 -07:00
friendica
5607737c39 set default charset of email_header_encode, add ud_flags to indicate which updates have been processed in some way. 2013-09-18 21:20:54 -07:00
friendica
e4d2e2200e add "tiered" access policy, add tagcloud to directory pages 2013-09-18 17:47:26 -07:00
friendica
e06b4c6dfc Merge https://github.com/friendica/red into zpull 2013-09-18 04:07:06 -07:00
friendica
9d49f2a47b make collections work again 2013-09-18 04:06:44 -07:00
friendica
90b22bff38 Merge pull request #144 from omigeot/master
Changed CSS class "selected" to "active" in navbar...
2013-09-18 03:21:28 -07:00
friendica
91aa5d73e7 Merge pull request #138 from pixelroot/master
modified:   view/ru/messages.po
2013-09-18 03:20:58 -07:00
Olivier Migeot
98e87b2149 Changed CSS class "selected" to "active" in navbar, according to https://abcentric.net/display/f17b319c6d4b616a0d0a639e177969c6ae084248f1ee2bec9d8147c9291bf495@abcentric.net 2013-09-18 12:11:46 +02:00
friendica
b0a4f1b30a fix sql for directory tagcloud 2013-09-17 22:56:09 -07:00
friendica
f7acc94bfe provide the back-end for a directory tag cloud 2013-09-17 22:52:46 -07:00
friendica
d3aa31be4d site sellpage links 2013-09-17 22:27:51 -07:00
friendica
ff2ada207a Pieces we'll need to tie together chanman and account/channel deletion and directory sync. Please do not mess with any of this.
Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this. Please do not mess with any of this.

OK? Understood?
2013-09-17 20:50:09 -07:00
Thomas Willingham
7f4b865c2b Didn't git add again after fixing typo... 2013-09-18 02:49:14 +01:00
Thomas Willingham
8542127274 Filestorage perms (no ACL), fix nav for browsers that can't handle PCSS, put content wrapper back now JS is fixed for features page. 2013-09-18 02:45:49 +01:00
friendica
4fa68c7f3d missing verb on items linked to photos 2013-09-17 17:53:44 -07:00
friendica
9d718ac529 sync photo permissions with the attached item whenever they change. 2013-09-17 17:38:43 -07:00
friendica
6a9e86e540 bumped the capslock 2013-09-17 02:30:28 -07:00
friendica
44a4997cf7 Merge https://github.com/friendica/red into zpull 2013-09-17 02:27:34 -07:00
friendica
56de8aa05b SEO: add keywords to appropriate channel pages 2013-09-17 02:26:34 -07:00
friendica
8452535467 Merge pull request #142 from dsp1986/master
Thanks!

fix include paths
2013-09-17 01:46:53 -07:00
friendica
a27ba2195c Merge pull request #141 from MicMee/master
Preparation for server / hubloc handling
2013-09-17 01:34:17 -07:00
friendica
3354abfd42 add -C cfgfile option to shred to allow multiple configurations. I just added the option for multiple configs, I didn't make it work as it requires quite a bit of change to the shred program flow; which tries to load the default config before doing anything at all. 2013-09-17 01:31:46 -07:00
Michael Meer
4f55d154d4 removed logger statement 2013-09-17 10:14:52 +02:00
Michael Meer
d330df05f2 extend admin page for hubloc / server key management 2013-09-17 10:11:22 +02:00
dsp1986
ff56e95c6e fix include paths 2013-09-17 09:41:48 +02:00
friendica
4335ef68d6 assuming permissions are correct, unobscure photo comments. Should probably make sure permissions are correct and figure out why some photo comments on public photos are getting stored with privacy. This probably requires that whenever we change photo permissions for linked photos/items we change the item permissions to match. They might be out of sync. 2013-09-16 22:56:36 -07:00
friendica
a78b76d393 more work on viewing obscured api posts 2013-09-16 22:51:39 -07:00
friendica
c6d6c01fb6 use prepare_body in api calls to properly render content, add 'mode' to conversation templates so that themes can use the module context to suppress or show comments as desired 2013-09-16 22:40:53 -07:00
friendica
1c5d56eedc Merge https://github.com/friendica/red into zpull 2013-09-16 21:37:34 -07:00
friendica
9bff739d96 several oauth fixes - shred doesn't completely work yet, but it also doesn't completely NOT work, so at least there's some improvement 2013-09-16 21:35:52 -07:00
Thomas Willingham
8411fb2bf9 Merge pull request #139 from tazmandevil/master
fixed link to wiki
2013-09-16 20:11:41 -07:00
Tazman DeVille
6c308a2d72 fixed link to wiki 2013-09-17 04:52:36 +02:00
pixelroot
88ea4f80bc modified: view/ru/messages.po 2013-09-16 08:46:15 +02:00
friendica
4b5d91ccb5 found it 2013-09-15 23:02:18 -07:00