Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge remote branch 'upstream/master' | habeascodice | 2014-09-28 | 3 | -106/+286 | |
| |\ | ||||||
| * | | Typo in regex causes runtime error | habeascodice | 2014-09-28 | 1 | -1/+1 | |
| | | | ||||||
* | | | Silence insanely noisy log - should probably stick this in a dlogger | Thomas Willingham | 2014-09-29 | 1 | -1/+1 | |
| |/ |/| | | | | | if we need it - we're getting literally hundreds of thousands of these. | |||||
* | | BBCode - $1 wrote doesn't make sense as a spoiler. $1 spoiler does. | Thomas Willingham | 2014-09-28 | 1 | -1/+1 | |
| | | ||||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-27 | 1 | -105/+269 | |
|\ \ | ||||||
| * | | Some documentation of include/config.php. | Klaus Weidenbach | 2014-09-26 | 1 | -105/+269 | |
| |/ | | | | | | | | | I hope my guesses are not completely wrong, anyway please take look not that I tell complete bullshit. | |||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-27 | 1 | -1/+1 | |
|\| | ||||||
| * | So much so, in fact, that I didn't even notice the typo. | Thomas Willingham | 2014-09-26 | 1 | -1/+1 | |
| | | ||||||
| * | Minor doco. Add some clarity - that had me scratching my head. | Thomas Willingham | 2014-09-26 | 1 | -1/+1 | |
| | | ||||||
* | | some background work for import/export of things and liked things/profiles | friendica | 2014-09-27 | 1 | -0/+16 | |
|/ | ||||||
* | optionally include wall items (posts) in import/export | friendica | 2014-09-25 | 3 | -6/+29 | |
| | ||||||
* | Typo | Thomas Willingham | 2014-09-25 | 1 | -1/+1 | |
| | ||||||
* | if no rss/atom element author, use feed level contact | friendica | 2014-09-24 | 1 | -7/+11 | |
| | ||||||
* | make it the default | friendica | 2014-09-24 | 1 | -21/+20 | |
| | ||||||
* | one step closer | friendica | 2014-09-24 | 1 | -1/+3 | |
| | ||||||
* | more testing | friendica | 2014-09-24 | 1 | -3/+18 | |
| | ||||||
* | just an experiment - don't do anything with this until I'm finished with it. | friendica | 2014-09-24 | 1 | -0/+9 | |
| | ||||||
* | fix url mismatches of a single trailing slash for feed author/owner ↵ | friendica | 2014-09-23 | 3 | -4/+8 | |
| | | | | comparisons; update diaspora_compat | |||||
* | diaspora private mail seems to work now - but there's an obfuscation leak ↵ | friendica | 2014-09-23 | 2 | -11/+13 | |
| | | | | via the conversation structure that needs to be dealt with. | |||||
* | d* little fixes | friendica | 2014-09-23 | 1 | -10/+4 | |
| | ||||||
* | d* PM cont. | friendica | 2014-09-23 | 3 | -4/+11 | |
| | ||||||
* | more work on d* private messages | friendica | 2014-09-23 | 2 | -8/+77 | |
| | ||||||
* | trying to call mod/magic on rss resources - which have no hub | friendica | 2014-09-22 | 2 | -5/+9 | |
| | ||||||
* | better way to deal with effective_uid | friendica | 2014-09-22 | 2 | -10/+10 | |
| | ||||||
* | make discover items interactive | friendica | 2014-09-22 | 3 | -9/+25 | |
| | ||||||
* | found the sucker | friendica | 2014-09-22 | 2 | -2/+4 | |
| | ||||||
* | private mail from d* to r# seems to work with these edits. - Now have to go ↵ | friendica | 2014-09-22 | 1 | -10/+7 | |
| | | | | back the other way. | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-21 | 1 | -96/+90 | |
|\ | ||||||
| * | Merge pull request #600 from dawnbreak/master | RedMatrix | 2014-09-22 | 1 | -96/+90 | |
| |\ | | | | | | | Don't link unknown likes. | |||||
| | * | Don't link unknown likes. | Klaus Weidenbach | 2014-09-21 | 1 | -96/+90 | |
| | | | | | | | | | | | | | | | Likes/Dislikes of unknown channels have disabled links now. Fixed intention a bit, romved a unused variable. | |||||
* | | | we don't always set HUBLOC_FLAGS_DELETED but we often set hubloc_status = ↵ | friendica | 2014-09-21 | 1 | -2/+3 | |
|/ / | | | | | | | HUBLOC_OFFLINE instead. Filter this as well from deliveries. | |||||
* / | feeds with '@' in the URL were being handled as webfinger addresses and ↵ | friendica | 2014-09-21 | 2 | -1/+2 | |
|/ | | | | didn't fall through to RSS discovery. Issue #599 | |||||
* | Navbar notifications: don't show "nothing new here" unless we've checked and ↵ | friendica | 2014-09-20 | 2 | -1/+2 | |
| | | | | there's nothing. Until we know for sure, display "Loading...". | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2014-09-20 | 4 | -7/+35 | |
|\ | ||||||
| * | oups... | marijus | 2014-09-20 | 1 | -1/+1 | |
| | | ||||||
| * | aalso change the way we check for number of chatrooms | marijus | 2014-09-20 | 3 | -4/+15 | |
| | | ||||||
| * | show bookmarks menu only if we have any bookmarks already | marijus | 2014-09-20 | 3 | -3/+20 | |
| | | ||||||
* | | fix empty likes | friendica | 2014-09-20 | 1 | -2/+9 | |
|/ | ||||||
* | closing tag | friendica | 2014-09-19 | 1 | -1/+1 | |
| | ||||||
* | try to sort out walltowall translation for diaspora recipients | friendica | 2014-09-19 | 3 | -15/+7 | |
| | ||||||
* | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2014-09-18 | 12 | -64/+527 | |
|\ | ||||||
| * | usability tweaks | friendica | 2014-09-17 | 2 | -2/+15 | |
| | | ||||||
| * | channel permission roles | friendica | 2014-09-17 | 2 | -6/+31 | |
| | | ||||||
| * | defined several permission roles - these will probably require some review ↵ | friendica | 2014-09-17 | 1 | -0/+245 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | and adjustment. social social_restricted social_private forum forum_restricted forum_private feed feed_restricted soapbox | |||||
| * | implement permission roles - the backend should be done except for maybe a ↵ | friendica | 2014-09-17 | 3 | -12/+73 | |
| | | | | | | | | couple of small tweaks. Now we just need to define the rest of the roles and create a chooser for them. Adam started on this some time back but I don't know where that has gone. | |||||
| * | that's why bb2diaspora_itemwallwall() wasn't doing its thang. | friendica | 2014-09-16 | 1 | -3/+3 | |
| | | ||||||
| * | still some old Friendica database queries in diaspora_signed_retraction | friendica | 2014-09-16 | 1 | -17/+15 | |
| | | ||||||
| * | z_post_url_json() added to easily deal with JSON post APIs; without getting ↵ | friendica | 2014-09-16 | 1 | -0/+17 | |
| | | | | | | | | content-type unknown warnings/errors. Also added a debug option to z_get|post_url so you could track and log some of these nasty little buggers. | |||||
| * | just mark dead hubloc deleted - don't remove them. This could cause ↵ | friendica | 2014-09-16 | 3 | -13/+9 | |
| | | | | | | | | problems. Also clean up fetch_url/post_url header option | |||||
| * | use the more portable encoded_item format for exported items - but with ↵ | friendica | 2014-09-16 | 2 | -15/+31 | |
| | | | | | | | | added attributes so we can use it as a reasonably complete item backup. The encoded_item format gives us extended author and owner information in case we need to probe them to bring the entry back. It also contains taxonomy entries. Importing and/or recovering will best be accomplished in chunks. It could take some time and some memory to chew through this. |