Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-26 | 1 | -0/+1 |
|\ | |||||
| * | Revert - see comments. | Thomas Willingham | 2014-08-26 | 1 | -3/+3 |
| | | |||||
| * | HTML doesn't work without ACCOUNT_ROLE_ALLOWCODE, so don't offer it | Thomas Willingham | 2014-08-26 | 1 | -2/+3 |
| | | | | | | | | as an option. | ||||
* | | add background color to widgets | marijus | 2014-08-26 | 4 | -31/+9 |
| | | |||||
* | | Merge branch 'master' of https://github.com/friendica/red | marijus | 2014-08-26 | 23 | -82/+489 |
|\| | |||||
| * | get rid of template "auto generated" warnings | friendica | 2014-08-25 | 15 | -75/+0 |
| | | |||||
| * | more diaspora stuff - most of the basic bits are there except queueing and ↵ | friendica | 2014-08-25 | 18 | -12/+300 |
| | | | | | | | | physical delivery (I'm keeping delivery turned off until some of the bugs are fixed so we don't cause inifinite loops or network meltdowns) - now it's just a matter of going through and methodically finding all the bugs | ||||
| * | sort out some anomalies | friendica | 2014-08-25 | 4 | -8/+20 |
| | | |||||
| * | more diaspora heavy lifting | friendica | 2014-08-25 | 3 | -66/+248 |
| | | |||||
| * | notifications/system not marking all notifications seen | friendica | 2014-08-25 | 1 | -1/+1 |
| | | |||||
* | | 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 ↵ | friendica | 2014-08-25 | 2 | -1/+14 |
| | | | | | | | | obscured so we need it to actually be obscured. | ||||
* | | 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 ↵ | friendica | 2014-08-24 | 2 | -295/+378 |
| | | | | | | | | FRUCK ALONE until the feature is stable. I won't help you if you try this and end up with a borked site. You are completely on your own. | ||||
* | | 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 ↵ | friendica | 2014-08-22 | 6 | -7/+23 |
| | | | | | | | | notifier is setup to take hublocs, not xchans. | ||||
| * | issue #573 - this may not fix everything in that issue but should resolve ↵ | friendica | 2014-08-22 | 1 | -0/+3 |
| | | | | | | | | some of it. | ||||
| * | "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 ↵ | friendica | 2014-08-21 | 1 | -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 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, ↵ | friendica | 2014-08-21 | 4 | -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/red | marijus | 2014-08-21 | 14 | -469/+360 |
|\ \ \ | | |/ | |/| | |||||
| * | | abook-edit-me class lost during some edit - we need this to reset the ↵ | friendica | 2014-08-21 | 2 | -2/+2 |
| | | | | | | | | | | | | permission fields | ||||
| * | | extensible profiles - add the input form elements. Still needs styling and ↵ | friendica | 2014-08-20 | 3 | -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 ↵ | friendica | 2014-08-20 | 2 | -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 ↵ | friendica | 2014-08-20 | 1 | -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 feeds | friendica | 2014-08-20 | 1 | -85/+58 |
| | | | |||||
| * | | move Friendica photo migrator to addons, bring back a few XML scraping ↵ | friendica | 2014-08-20 | 4 | -176/+165 |
| | | | | | | | | | | | | functions that we're going to require (unfortunately) |