| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-25 | 2 | -1/+14 |
|\ |
|
| * | re-obscure item body if localize_item() changes it. It's already flagged as o... | friendica | 2014-08-25 | 2 | -1/+14 |
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-25 | 2 | -295/+378 |
|\| |
|
| * | Add d* folks to address book. WARNING - DO NOT ATTEMPT THIS. LEAVE IT THE FRU... | friendica | 2014-08-24 | 2 | -295/+378 |
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-24 | 1 | -0/+2 |
|\| |
|
| * | onepoll: don't poll archived, blocked, or ignored connections | friendica | 2014-08-24 | 1 | -0/+2 |
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-24 | 2 | -1/+114 |
|\| |
|
| * | diaspora discovery | friendica | 2014-08-24 | 2 | -1/+114 |
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-24 | 16 | -748/+765 |
|\| |
|
| * | unobscure viewsrc items | friendica | 2014-08-23 | 1 | -2/+5 |
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-08-23 | 11 | -738/+751 |
| |\ |
|
| | * | fix nl | Jeroen | 2014-08-23 | 2 | -13/+13 |
| | * | Minor adjustment photo view + update nl (at 100\%\!) | Jeroen | 2014-08-23 | 11 | -726/+739 |
| * | | add "any connections" to can_comment_on_post() - was missing | friendica | 2014-08-23 | 1 | -0/+1 |
| * | | switch everything over to crypto_encapsulate() | friendica | 2014-08-23 | 4 | -8/+8 |
| |/ |
|
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-23 | 121 | -1922/+2405 |
|\| |
|
| * | We really can't do this without a hubloc. I was hoping we could, but notifier... | friendica | 2014-08-22 | 6 | -7/+23 |
| * | issue #573 - this may not fix everything in that issue but should resolve som... | friendica | 2014-08-22 | 1 | -0/+3 |
| * | "false" issue | friendica | 2014-08-22 | 1 | -4/+9 |
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-08-22 | 2 | -5/+5 |
| |\ |
|
| | * | fix nl | Jeroen | 2014-08-22 | 2 | -5/+5 |
| * | | issue #571 - use feed/nickname?top=1 | friendica | 2014-08-22 | 2 | -1/+7 |
| * | | rev update | friendica | 2014-08-22 | 2 | -669/+661 |
| * | | doc update | friendica | 2014-08-22 | 109 | -1236/+1697 |
| |/ |
|
* | | Merge branch 'upstream' | marijus | 2014-08-22 | 15 | -138/+275 |
|\ \ |
|
| * | | Merge branch 'master' of https://github.com/friendica/red into upstream | marijus | 2014-08-22 | 28 | -780/+663 |
| |\| |
|
| | * | another round of heavy lifting | friendica | 2014-08-21 | 1 | -112/+99 |
| | * | provide the site blacklist everywhere it is needed | friendica | 2014-08-21 | 3 | -1/+43 |
| | * | missing template file | friendica | 2014-08-21 | 1 | -0/+57 |
| | * | D* receive endpoint is receive/users/$guid - where $guid is really the channe... | friendica | 2014-08-21 | 1 | -4/+5 |
| | * | the rest of the diaspora local discovery stuff | friendica | 2014-08-21 | 2 | -3/+24 |
| | * | make the old personal xrd interface (old webfinger) work again | friendica | 2014-08-21 | 4 | -7/+37 |
| | * | profile edit - missing visibility and drop link on non-default profiles, re-a... | friendica | 2014-08-21 | 4 | -11/+10 |
* | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-21 | 14 | -469/+360 |
|\ \ \
| | |/
| |/| |
|
| * | | abook-edit-me class lost during some edit - we need this to reset the permiss... | friendica | 2014-08-21 | 2 | -2/+2 |
| * | | extensible profiles - add the input form elements. Still needs styling and we... | friendica | 2014-08-20 | 3 | -135/+123 |
| * | | verified that chatroom expire is working, so doing away with the second funct... | friendica | 2014-08-20 | 2 | -24/+4 |
| * | | restrict returned directory contents to xchans in the zot network. We could p... | friendica | 2014-08-20 | 1 | -2/+2 |
| * | | restructure the author and owner info from feeds | friendica | 2014-08-20 | 1 | -85/+58 |
| * | | move Friendica photo migrator to addons, bring back a few XML scraping functi... | friendica | 2014-08-20 | 4 | -176/+165 |
| * | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-08-20 | 1 | -0/+1 |
| |\ \ |
|
| * | | | provide admin option for allowing rss/atom feed connections. Need to do this ... | friendica | 2014-08-20 | 2 | -45/+6 |
* | | | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-20 | 3 | -196/+51 |
|\ \ \ \
| | |/ /
| |/| /
| |_|/
|/| | |
|
| * | | Merge pull request #570 from zzottel/master | zzottel | 2014-08-20 | 1 | -0/+1 |
| |\ \
| | |/
| |/| |
|
| | * | updated German main.bb doco file | zottel | 2014-08-20 | 1 | -0/+1 |
| * | | greatly simplify consume_feed() - a lot of this was friendica specific and so... | friendica | 2014-08-20 | 2 | -196/+50 |
| |/ |
|
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-20 | 7 | -239/+373 |
|\| |
|
| * | fangs bared | friendica | 2014-08-19 | 1 | -1/+23 |
| * | snakebite continued | friendica | 2014-08-19 | 1 | -53/+108 |
| * | some work on network discovery | friendica | 2014-08-19 | 2 | -168/+167 |