aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-23121-1922/+2405
|\
| * We really can't do this without a hubloc. I was hoping we could, but ↵friendica2014-08-226-7/+23
| | | | | | | | notifier is setup to take hublocs, not xchans.
| * issue #573 - this may not fix everything in that issue but should resolve ↵friendica2014-08-221-0/+3
| | | | | | | | some of it.
| * "false" issuefriendica2014-08-221-4/+9
| |
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-08-222-5/+5
| |\
| | * fix nlJeroen2014-08-222-5/+5
| | |
| * | issue #571 - use feed/nickname?top=1friendica2014-08-222-1/+7
| | |
| * | rev updatefriendica2014-08-222-669/+661
| | |
| * | doc updatefriendica2014-08-22109-1236/+1697
| |/
* | Merge branch 'upstream'marijus2014-08-2215-138/+275
|\ \
| * | Merge branch 'master' of https://github.com/friendica/red into upstreammarijus2014-08-2228-780/+663
| |\|
| | * another round of heavy liftingfriendica2014-08-211-112/+99
| | |
| | * provide the site blacklist everywhere it is neededfriendica2014-08-213-1/+43
| | |
| | * missing template filefriendica2014-08-211-0/+57
| | |
| | * D* receive endpoint is receive/users/$guid - where $guid is really the ↵friendica2014-08-211-4/+5
| | | | | | | | | | | | channel_guid, not the channel_hash. We'll allow this to be truncated for older D* sites or those that can't process our 64 character guids.
| | * the rest of the diaspora local discovery stufffriendica2014-08-212-3/+24
| | |
| | * make the old personal xrd interface (old webfinger) work againfriendica2014-08-214-7/+37
| | |
| | * profile edit - missing visibility and drop link on non-default profiles, ↵friendica2014-08-214-11/+10
| | | | | | | | | | | | re-arrange order of replacing red#matrix smilie so it works correctly, accept a post with body content of '0' which was interpreted by x() as nothing (was treated as integer).
* | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-2114-469/+360
|\ \ \ | | |/ | |/|
| * | abook-edit-me class lost during some edit - we need this to reset the ↵friendica2014-08-212-2/+2
| | | | | | | | | | | | permission fields
| * | extensible profiles - add the input form elements. Still needs styling and ↵friendica2014-08-203-135/+123
| | | | | | | | | | | | we're not yet storing the results. And right now we're ignoring the type and only doing type=string. Oh yeah - and I split off starting the second delivery chain into its own function in tag_deliver since it was largely duplicate code.
| * | verified that chatroom expire is working, so doing away with the second ↵friendica2014-08-202-24/+4
| | | | | | | | | | | | | | | | | | function to do the same thing. If you have a problem with chatroom expiration, check that it was created with cr_expire set to 120 (minutes). Chatrooms created during the first couple of days of the chat feature didn't have this. You can set the DB value manually.
| * | restrict returned directory contents to xchans in the zot network. We could ↵friendica2014-08-201-2/+2
| | | | | | | | | | | | probably add other networks to this and create a distributed directory for the free web. It's highly unlikely we would do this but we *could*.
| * | restructure the author and owner info from feedsfriendica2014-08-201-85/+58
| | |
| * | move Friendica photo migrator to addons, bring back a few XML scraping ↵friendica2014-08-204-176/+165
| | | | | | | | | | | | functions that we're going to require (unfortunately)
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-201-0/+1
| |\ \
| * | | provide admin option for allowing rss/atom feed connections. Need to do this ↵friendica2014-08-202-45/+6
| | | | | | | | | | | | | | | | now before the feature is complete so that public sites don't get borked. We also will need a service class for this.
* | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-203-196/+51
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Merge pull request #570 from zzottel/masterzzottel2014-08-201-0/+1
| |\ \ | | |/ | |/| updated German main.bb doco file
| | * updated German main.bb doco filezottel2014-08-201-0/+1
| | |
| * | greatly simplify consume_feed() - a lot of this was friendica specific and ↵friendica2014-08-202-196/+50
| |/ | | | | | | somebody may want to put some of it back in, but we'd be much better off building a zot compatible feed for friendica (hint,hint) - even if it didn't support the other protocol bits. Special purpose feed handlers for things like likes, dislikes, events, and community tags are better handled as zot arrays. We have all those handlers. We just need to pass them a JSON message instead of an XML/Atom message. Handlers for statusnet follow messages are another casualty. That's easy to bring back - but we need to keep driving nails into the XML coffin or the damn zombies will get out.
* | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-207-239/+373
|\|
| * fangs baredfriendica2014-08-191-1/+23
| |
| * snakebite continuedfriendica2014-08-191-53/+108
| |
| * some work on network discoveryfriendica2014-08-192-168/+167
| |
| * also reset comment policy on alternate delivery chainsfriendica2014-08-191-2/+4
| |
| * make sure privacy scope is completely reset on second delivery chain - ↵friendica2014-08-191-8/+62
| | | | | | | | revert if there are forum issues, this is subtle and complicated
| * follow => connectfriendica2014-08-191-1/+1
| |
| * really really fix lockview (cross fingers) ;-)friendica2014-08-191-5/+7
| |
| * Merge pull request #569 from git-marijus/masterRedMatrix2014-08-201-1/+2
| |\ | | | | | | really fix lock info
| * | fix nlJeroen2014-08-192-3/+3
| | |
* | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-08-192-5927/+6256
|\| | | |/ |/|
| * Update nlJeroen2014-08-192-5927/+6256
| |
* | really fix lock infomarijus2014-08-191-1/+2
|/
* diaspora - crazy amount of work remainingfriendica2014-08-192-81/+64
|
* provide an overt indication that a post/comment was edited.friendica2014-08-183-4/+6
|
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-181-5/+4
|\
| * Merge pull request #568 from git-marijus/masterRedMatrix2014-08-191-5/+4
| |\ | | | | | | make lockview provide the right info
| | * make lockview provide the right infomarijus2014-08-181-5/+4
| |/
* / nav channel selectionfriendica2014-08-185-3/+26
|/