aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* D* receive endpoint is receive/users/$guid - where $guid is really the channe...friendica2014-08-211-4/+5
* 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, re-a...friendica2014-08-214-11/+10
* abook-edit-me class lost during some edit - we need this to reset the permiss...friendica2014-08-212-2/+2
* extensible profiles - add the input form elements. Still needs styling and we...friendica2014-08-203-135/+123
* verified that chatroom expire is working, so doing away with the second funct...friendica2014-08-202-24/+4
* restrict returned directory contents to xchans in the zot network. We could p...friendica2014-08-201-2/+2
* restructure the author and owner info from feedsfriendica2014-08-201-85/+58
* move Friendica photo migrator to addons, bring back a few XML scraping functi...friendica2014-08-204-176/+165
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-201-0/+1
|\
| * Merge pull request #570 from zzottel/masterzzottel2014-08-201-0/+1
| |\
| | * updated German main.bb doco filezottel2014-08-201-0/+1
* | | provide admin option for allowing rss/atom feed connections. Need to do this ...friendica2014-08-202-45/+6
|/ /
* / greatly simplify consume_feed() - a lot of this was friendica specific and so...friendica2014-08-202-196/+50
|/
* 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 - revert...friendica2014-08-191-8/+62
* 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 infomarijus2014-08-191-1/+2
* | fix nlJeroen2014-08-192-3/+3
* | Update nlJeroen2014-08-192-5927/+6256
|/
* 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 infomarijus2014-08-181-5/+4
| |/
* / nav channel selectionfriendica2014-08-185-3/+26
|/
* beginning of permission role settingsfriendica2014-08-172-1/+61
* add ability to follow somebody not already in your connections from "post act...friendica2014-08-171-0/+5
* diaspora - begin heavy lifting. This is a 738 tonne brick with a herd of elep...friendica2014-08-171-218/+118
* some more work on realmsfriendica2014-08-176-15/+54
* Merge https://github.com/friendica/red into pending_mergefriendica2014-08-178-2472/+2923
|\
| * Merge pull request #567 from tuscanhobbit/masterPaolo T2014-08-172-1208/+1416
| |\
| | * IT: strings updatedtuscanhobbit2014-08-172-1208/+1416
| * | Doco - attempt to explain pull requests in git for non developers.Thomas Willingham2014-08-171-2/+27
| * | Merge pull request #565 from RedMatrixCanada/BranchRedMatrix2014-08-172-1197/+1387
| |\ \
| | * | French Transalations - UPDATEDRedMatrixCanada2014-08-162-1197/+1387
| * | | Merge pull request #566 from tonnerkiller/masterRedMatrix2014-08-173-65/+93
| |\ \ \ | | |/ / | |/| |
| | * | Added "if(!function_exists('xpost_to_html2bbcode'))"tonnerkiller2014-08-161-64/+68
| | * | api_posting.bb is a new doco file that explains posting to the redmatrix from...tonnerkiller2014-08-162-1/+25
* | | | add collections widget to connections page - and some more work on realmsfriendica2014-08-175-2/+27
|/ / /
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-163-4/+7
|\ \ \
| * \ \ Merge pull request #564 from cvogeley/masterRedMatrix2014-08-172-3/+6
| |\ \ \
| | * | | Add account deletion to the UIChristian Vogeley2014-08-162-3/+6
| * | | | Install doc - mcrypt is required, not optional. Even if it's intendedThomas Willingham2014-08-161-1/+1
| | |/ / | |/| |