Commit graph

11770 commits

Author SHA1 Message Date
friendica
11ccf253e2 Heads up: "custom/module.php" is deprecated. Please read this commit if you are affected. 2014-10-30 20:27:41 -07:00
friendica
4e454656fe Merge https://github.com/friendica/red into pending_merge 2014-10-30 19:29:28 -07:00
friendica
28a35261db What this checkin does is catch the case where a comment arrived and there's a missing top-level post to match it with. So we'll send a request back to the sender that you've never seen this thread and please send a fresh copy of the entire conversation to date. We could soon have posts in the matrix from different platforms from days gone by, which have been migrated into the modern world. We'll be polite and not deliver these to everybody. However, if someone comments on one of these antique threads we wouldn't be able to see it in our own matrix because we won't have a copy of the parent post. So this rectifies that situation. Be aware that item deletion may need to change to keep "hard deleted" items indefinitely so that they don't keep coming back. We'll have to null out the important data of the former item to accomplish the deletion aspect. 2014-10-30 19:15:03 -07:00
Thomas Willingham
fbd027709a Debian doco - no longer uses dropbear. 2014-10-31 01:13:56 +00:00
marijus
4495a30b88 removing this was not a good idea... 2014-10-30 18:55:24 +01:00
marijus
6103494630 update bootstrap library to version 3.3 2014-10-30 14:28:49 +01:00
marijus
0ff4d9015b some work on photo upload 2014-10-30 14:10:55 +01:00
friendica
e219268a6e Merge https://github.com/friendica/red into pending_merge 2014-10-29 17:55:38 -07:00
friendica
cfbfdca610 allow feed paging 2014-10-29 17:55:15 -07:00
marijus
fc704d1f2f if someone does not have permission to chat do not show the chatrooms tab 2014-10-29 14:29:38 +01:00
friendica
7d9f785758 if any privacy tags are created on a top level post, restrict the post; since it could have been quite sensitive. If there were errors processing the actual tag restrict the post to the profile owner. Also make the "privacy tag over-rides ACL" behaviour configurable. Default is that privacy tags over-ride the ACL. 2014-10-28 20:01:44 -07:00
friendica
d9c5823593 the default permissions for new connections when using a custom role is inadequate. Until we can make it configurable start off with something like a public social role. We're typically taking the person straight to the connection editor so they can change it before any privacy damage is done 2014-10-28 19:29:37 -07:00
friendica
653305889c Merge https://github.com/friendica/red into pending_merge 2014-10-28 04:18:35 -07:00
friendica
36110831cb change photo tag bubble tip 2014-10-28 04:18:08 -07:00
RedMatrix
4891eb5b01 Merge pull request #668 from git-marijus/master
change the way tagrm works to allow tag removal on the fly
2014-10-28 22:13:33 +11:00
marijus
ec8bab7784 change the way tagrm works to allow tag removal on the fly 2014-10-28 11:56:00 +01:00
friendica
9cc76cb33d several unrelated things - auto_follow wasn't working for new accounts, error returned in private mention to a collection, and added auto-completion to photo tags; though it only matches people so the hover text is now wrong. Also made the photo edit form XHTML (XML) compliant. 2014-10-27 19:23:40 -07:00
friendica
1b53d1c1d3 Merge https://github.com/friendica/red into pending_merge 2014-10-27 16:20:59 -07:00
friendica
583b445bc0 add "repository" permissions role and make sure we have a sane "accept" default for the custom role. 2014-10-27 16:19:30 -07:00
marijus
d192bcad65 do not reload page for edit album and some minor cleanup 2014-10-27 21:31:54 +01:00
Jeroen
6ff795a9f2 Merge branch 'master' of https://github.com/friendica/red 2014-10-27 15:06:34 +00:00
Jeroen
eec0a67dde update nl + Terms of Service more prominent in the help files. 2014-10-27 15:05:59 +00:00
friendica
bc3e7c4cad some documentation of permission roles and what the differences are. 2014-10-27 02:17:30 -07:00
friendica
be8a01618e turn down the preview logging. Haven't needed that level of detail recently. 2014-10-26 21:56:56 -07:00
friendica
95de759766 a couple of photo tag issues 2014-10-26 21:37:59 -07:00
friendica
d4d44b7a87 couple of other places where we need to reset stuff completely if the role changes 2014-10-26 19:47:55 -07:00
friendica
812135bfab reset ACL just in case it was custom already. 2014-10-26 19:41:53 -07:00
friendica
655c3e1b47 put privacy role selector in settings page. Change visibility of various permissions items accordingly. 2014-10-26 19:32:12 -07:00
friendica
d2af45d206 use intval rather than dbesc since these are ints. Should work regardless, but this makes it consistent with the way we do most other queries. 2014-10-26 15:49:00 -07:00
friendica
864fcd1da6 Merge https://github.com/friendica/red into pending_merge
Conflicts:
	mod/like.php
2014-10-26 15:36:16 -07:00
friendica
5abd01f072 allow photos without comments to be liked 2014-10-26 15:34:18 -07:00
marijus
f2ccd37c8b wrong vars in template 2014-10-26 21:50:20 +01:00
marijus
6497e78956 some work on photos like/dislike 2014-10-25 15:23:20 +02:00
friendica
59e19a1f45 moved post_to_red to its own project ( https://github.com/friendica/wptored ), which I was planning to do anyway since it's kind of lost in the util folder, but also because having it there may present licensing issues, as it's GPL. 2014-10-25 01:03:36 -07:00
friendica
98bce0e719 the to-do list is getting longer again. 2014-10-24 14:31:21 -07:00
friendica
ce8a891682 doh - this needs to be markdown, not bbcode 2014-10-24 14:18:02 -07:00
friendica
322ec2b9df Merge https://github.com/friendica/red into pending_merge 2014-10-24 14:05:28 -07:00
friendica
cf05266b15 should probably check the body since the title is only going to be rarely set. 2014-10-24 14:04:32 -07:00
RedMatrix
e0dd68d77a Merge pull request #665 from zzottel/master
make bbcode/html includes work in markdown help pages and vice versa
2014-10-25 07:54:32 +11:00
zottel
5b04b9480e make bbcode/html includes work in markdown help pages and vice versa 2014-10-24 21:17:56 +02:00
Thomas Willingham
38801f802f Issue #661 2014-10-24 17:46:31 +01:00
zzottel
0f0b9f9b2d Merge pull request #664 from zzottel/master
German help and addon footer correction
2014-10-24 17:12:28 +02:00
zottel
4d0455befd correction to addon footer 2014-10-24 17:09:37 +02:00
zottel
d98fcdf3fb update to German help 2014-10-24 17:08:50 +02:00
friendica
1845ddc4c3 don't decrypt the message body more than once. 2014-10-24 04:17:48 -07:00
friendica
1d8aa7d817 string update 2014-10-24 04:17:35 -07:00
friendica
5ede7bd654 doc updates 2014-10-24 04:16:45 -07:00
friendica
1a9b8d4f0c don't offer forum (@name+) completion in comments, since it won't do anything. 2014-10-23 22:00:16 -07:00
friendica
34781433c1 I'm speechless. This is just reckless. Set a context flag in text using a context trigger character which is likely to be present in that text already. Without escaping any previous instances of that character. Grrr. 2014-10-23 21:20:12 -07:00
friendica
f524fb1f20 generalise the output format of xchan_fetch so it matches the input format 2014-10-23 19:41:42 -07:00