aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* allow stuff with Diaspora authors to federate in zot conversations even if ↵friendica2014-09-044-2/+25
| | | | the local site has diaspora disabled. This way it won't look like folks are talking to themselves.
* update docs as D* members should now be able to participate in redmatrix ↵friendica2014-09-031-2/+2
| | | | forums. They will need to plus-tag the forum. There may still be minor issues, but nothing fundamentally at odds with this working.
* remove feed items from ACL selector - there's nothing we can do with them ↵friendica2014-09-031-0/+5
| | | | and if we were to try we'd have to binary pack all the hashes
* sort out some of the bb2d madnessfriendica2014-09-032-70/+27
|
* this is turning into a wretched mess. It's going to get worse before it gets ↵friendica2014-09-032-200/+99
| | | | better, but I'm trying to do this incrementally so I don't break the whole shebang for a few days. It will get better once all the bbcode translation is done in a single place (cross fingers), and we can just sign the post once when we submit it and be done with it. If Diaspora ever implements editing of existing posts we'll have to go back and do the whole wretched mess over again.
* implement service class for feed polling frequenecy, fixed a service class ↵friendica2014-09-039-96/+92
| | | | bug, moved service class stuff from plugin to account.php where it belongs and load that by default instead of on demand
* fix group membership management for non-red connectionsfriendica2014-09-031-4/+4
|
* store diaspora meta info in the item table. It has to go there or it will ↵friendica2014-09-037-58/+67
| | | | kill us with complex joins. We can phase out the sign table once this all checks out.
* outbound feed issuefriendica2014-09-034-5/+6
|
* fix diaspora_handle_from_contact()friendica2014-09-021-2/+2
|
* if we don't have a stored diaspora author signature which has been passed ↵friendica2014-09-021-0/+1
| | | | the baton since the post's creation, fill in the field with their redmatrix signature. It's pointless, but there's so much pointless stuff in here that I doubt it matters. From what I can ascertain - nobody is going to look at it anyway.
* try to proceed with a diaspora relayable even if we don't have the original ↵friendica2014-09-021-7/+9
| | | | author's signature.
* provide a config option to prevent wall uploads (photos and files) from ↵friendica2014-09-022-30/+9
| | | | being set to the same ACL as the containing post, and instead are uploaded with public visibility (no ACL). This is to prevent folks on other networks from seeing prohibited signs for things uploaded into a private conversation. It is primarily useful when posting to collections that have mixed folks from red and other networks and an otherwise public (typical) profile. Consequently, these uploads will match your chosen default visibility for photos and storage and not that of the containing conversation item (and is only useful if the default visibility is public). This choice must be explained adequately because it represents a complex series of tradeoffs and side effects. It will reduce complaints from other networks about blocked content, but essentially forces you to use another method (dav or the photos page) if you wish to upload protected files/media.
* feed removal issuefriendica2014-09-022-6/+8
|
* use feed title for channel name before checking author, make feed items ↵friendica2014-09-024-10/+41
| | | | shareable (they're private to the channel so they won't be shown in searches), try and handle Diaspora mentions a bit more elegantly. (Bug: we don't convert mentions to Diaspora's format on outbound at all!)
* updated compatibility notesfriendica2014-09-022-4/+8
|
* minor nitsfriendica2014-09-011-4/+8
|
* fix phantom attachments in feedsfriendica2014-09-012-2/+2
|
* pull in some posts when first connecting to feedsfriendica2014-09-011-2/+1
|
* logic invertedfriendica2014-09-011-1/+1
|
* issue #578 - this won't fix old items but should work going forward. The ↵friendica2014-09-012-2/+2
| | | | extra time slop shouldn't be needed and will in fact result in possibly undesired redundancy.
* Merge pull request #576 from beardy-unixer/masterRedMatrix2014-09-025-15/+54
|\ | | | | Allow directories to stop being directories without killing anyone.
| * Don't forget the ifs. Now we just need to write some blurb, find someThomas Willingham2014-09-021-4/+4
| | | | | | | | | | images, add a link, and decide what to do with non-earned badges...basically all of it.
| * Move achievements on, but just a tad.Thomas Willingham2014-09-022-10/+22
| |
| * If you have a new channel (or a new hub searching for an old channel)Thomas Willingham2014-09-021-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | which uses an xchan_url other than channel or profile, chanview will fail to find $a->poi and fail as there is no way to import the xchan. Instead of giving up and presenting an error, we'll send you to the requested URL anyway. If we send you with a Zid, there's a good chance you'll authenticate because xchans are like glitter - once you've got one, they get everywhere, and there's a good chance you'll know *somebody* at the hub. .
| * Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-09-0217-1411/+1673
| |\ | |/ |/|
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-012-1337/+1389
|\ \
| * \ Merge pull request #577 from tuscanhobbit/masterPaolo T2014-09-012-1337/+1389
| |\ \ | | | | | | | | Italian strings updated
| | * | Italian strings updatedPaolo Tacconi2014-09-012-3/+3
| | | |
| | * | Italian strings updatedPaolo Tacconi2014-09-012-1335/+1387
| | | |
* | | | use feed icon as default avatar for rss connectionsfriendica2014-09-013-3/+6
|/ / /
* | | make fuckin twitter plugin work by selling my soul to the devil for a fuckin ↵friendica2014-09-011-1/+1
| | | | | | | | | | | | api key. Are y'all fuckin happy?
* | | honour the feed_contacts settingfriendica2014-09-012-1/+6
| | |
* | | get out the sunniesfriendica2014-08-315-8/+33
| | |
* | | various rss fixesfriendica2014-08-312-11/+25
| | |
* | | service class check for feeds. Note limit is account based, not channel based.friendica2014-08-311-21/+33
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-311-4/+4
|\ \ \
| * | | Finally updated/re-translated the Dutch introduction textJeroen2014-08-311-4/+4
| | | |
* | | | rss feed discoveryfriendica2014-08-312-25/+178
|/ / /
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-311-1/+1
|\ \ \
| * | | missing 'jeroenpraat2014-08-311-1/+1
| | | |
* | | | sql error in profile_activityfriendica2014-08-313-6/+4
|/ / /
| | * Add check_upstream_directory() to check that your directory is stillThomas Willingham2014-08-312-0/+23
| |/ |/| | | | | | | a directory, and if it isn't, let find_upstream_directory() find you a new one.
* | doc change - read it.friendica2014-08-301-0/+3
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-304-910/+973
|\ \
| * | update nl + Friendica>RedMatrix in two text filesJeroen2014-08-304-910/+973
| | |
* | | insecure network filterfriendica2014-08-302-2/+41
|/ /
* | various diaspora issuesfriendica2014-08-295-22/+82
| |
* | doc updatefriendica2014-08-2946-990/+1157
| |
* | more queue tweaksfriendica2014-08-282-2/+2
| |