| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 1 | -1/+1 |
| |\ | |||||
| | * | more work isolating the projectname from core. | redmatrix | 2015-05-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Import/refimport.php include/activities.php include/attach.php include/event.php include/externals.php include/identity.php include/items.php include/notifier.php include/photos.php include/taxonomy.php include/zot.php mod/channel.php mod/connedit.php mod/events.php mod/item.php mod/like.php mod/manage.php mod/mood.php mod/ping.php mod/poke.php mod/subthread.php mod/tagger.php mod/thing.php | ||||
| | * | | first pass name change | redmatrix | 2015-05-05 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -29/+52 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/Contact.php include/ItemObject.php include/api.php include/attach.php include/diaspora.php include/dir_fns.php include/enotify.php include/event.php include/expire.php include/items.php include/notifier.php include/notify.php include/photos.php include/taxonomy.php include/text.php include/widgets.php include/zot.php mod/admin.php mod/channel.php mod/dirsearch.php mod/display.php mod/editwebpage.php mod/events.php mod/home.php mod/item.php mod/manage.php mod/mood.php mod/network.php mod/page.php mod/photos.php mod/ping.php mod/post.php mod/thing.php mod/viewsrc.php view/css/mod_events.css | ||||
| | * | Two possible bugfixes in bb2diaspora.php. | Klaus Weidenbach | 2015-03-22 | 1 | -26/+50 |
| | | | | | | | | | | | | | | | | | | | I have found two suspicious parts and tried to correct them. I have no diaspora enabled hubs and I am also not sure what influence these two changes will have: $unset($item['author']) ==> unset($item['author']); if(cnt) ==> if($cnt) Before merging can someone with diaspora contacts test this. | ||||
| | * | title missing sending to diaspora (which doesn't support titles but let's ↵ | friendica | 2015-02-09 | 1 | -19/+2 |
| | | | | | | | | | not go there). | ||||
| * | | more expanding item flags | friendica | 2015-01-22 | 1 | -1/+1 |
| | | | |||||
| * | | slow progress removing bitfields on item table | friendica | 2015-01-21 | 1 | -16/+0 |
| |/ | |||||
| * | cleanup bb2diaspora - was getting crufty | friendica | 2014-12-23 | 1 | -20/+0 |
| | | |||||
| * | diaspora formatting improvements (getting too many xx-large posts) | friendica | 2014-12-22 | 1 | -4/+6 |
| | | |||||
| * | logging changes, untranslated string | friendica | 2014-11-05 | 1 | -3/+3 |
| | | |||||
| * | should probably check the body since the title is only going to be rarely set. | friendica | 2014-10-24 | 1 | -1/+1 |
| | | |||||
| * | don't decrypt the message body more than once. | friendica | 2014-10-24 | 1 | -2/+7 |
| | | |||||
| * | backtrack on attribution for wall-to-wall comments - triggered too often and ↵ | friendica | 2014-10-22 | 1 | -7/+11 |
| | | | | | unnecessarily. | ||||
| * | strip out the Diaspora quoted reshare markers | friendica | 2014-10-20 | 1 | -0/+2 |
| | | |||||
| * | bb2diaspora wallwall comment - match both bits (ITEM_WALL|ITEM_ORIGIN) | friendica | 2014-10-20 | 1 | -1/+1 |
| | | |||||
| * | show true author of wall-to-wall comments to Diaspora viewers just like we ↵ | friendica | 2014-10-19 | 1 | -0/+13 |
| | | | | | did for wall-to-wall posts. | ||||
| * | diaspora_send_status() - recalculate markdown translation to pickup any ↵ | friendica | 2014-10-12 | 1 | -2/+2 |
| | | | | | later message changes after original submission like wall-to-wall attributions for instance. Normally this would've come from our cached version which was stored prior to tag_deliver being run and therefore isn't yet aware that wall-to-wall status may have changed after delivery. | ||||
| * | return of the missing diaspora wall-to-wall attribution | friendica | 2014-10-09 | 1 | -0/+12 |
| | | |||||
| * | try to track down intermittent wall-to-wall attribution on Diaspora exported ↵ | friendica | 2014-10-09 | 1 | -0/+4 |
| | | | | | posts | ||||
| * | fix url mismatches of a single trailing slash for feed author/owner ↵ | friendica | 2014-09-23 | 1 | -4/+2 |
| | | | | | comparisons; update diaspora_compat | ||||
| * | that's why bb2diaspora_itemwallwall() wasn't doing its thang. | friendica | 2014-09-16 | 1 | -3/+3 |
| | | |||||
| * | that won't work... | friendica | 2014-09-14 | 1 | -1/+2 |
| | | |||||
| * | bb2diaspora_itemwallwall not finding author elements - inserting empty bbcode | friendica | 2014-09-14 | 1 | -0/+4 |
| | | |||||
| * | disabling ability for diaspora to plustag redmatrix forums. See the notes. | friendica | 2014-09-10 | 1 | -1/+5 |
| | | |||||
| * | possible solution to diaspora walltowall mistaken attribution | friendica | 2014-09-10 | 1 | -5/+22 |
| | | |||||
| * | encrypt diaspora_meta since it may contain private message contents | friendica | 2014-09-10 | 1 | -4/+13 |
| | | |||||
| * | cross-network mention issues | friendica | 2014-09-09 | 1 | -2/+5 |
| | | |||||
| * | go through the entire discovery sequence for mentions to make sure we have ↵ | friendica | 2014-09-09 | 1 | -1/+9 |
| | | | | | the correct URL | ||||
| * | d* friending vsprintf error | friendica | 2014-09-09 | 1 | -1/+3 |
| | | |||||
| * | bb2diaspora_itembody - empty body, that explains a lot | friendica | 2014-09-04 | 1 | -0/+2 |
| | | |||||
| * | sort out some of the bb2d madness | friendica | 2014-09-03 | 1 | -4/+4 |
| | | |||||
| * | this is turning into a wretched mess. It's going to get worse before it gets ↵ | friendica | 2014-09-03 | 1 | -189/+79 |
| | | | | | better, but I'm trying to do this incrementally so I don't break the whole shebang for a few days. It will get better once all the bbcode translation is done in a single place (cross fingers), and we can just sign the post once when we submit it and be done with it. If Diaspora ever implements editing of existing posts we'll have to go back and do the whole wretched mess over again. | ||||
| * | use feed title for channel name before checking author, make feed items ↵ | friendica | 2014-09-02 | 1 | -1/+23 |
| | | | | | shareable (they're private to the channel so they won't be shown in searches), try and handle Diaspora mentions a bit more elegantly. (Bug: we don't convert mentions to Diaspora's format on outbound at all!) | ||||
| * | shield share meta info from markdown processing. | friendica | 2014-07-16 | 1 | -0/+17 |
| | | |||||
| * | optionally allow zrl usage from specific markdown sources | friendica | 2014-07-01 | 1 | -2/+9 |
| | | |||||
| * | easter egg | friendica | 2014-07-01 | 1 | -3/+1 |
| | | |||||
| * | add zrl stuff - still a lot of new stuff missing but I'm not going to do it all. | friendica | 2014-06-04 | 1 | -0/+8 |
| | | |||||
| * | start formatting for Doxygen | friendica | 2013-02-25 | 1 | -1/+1 |
| | | |||||
| * | more file cleanup | friendica | 2012-10-22 | 1 | -1/+1 |
| | | |||||
| * | merge upstream | friendica | 2012-08-11 | 1 | -0/+8 |
| | | |||||
| * | updates | friendica | 2012-08-05 | 1 | -3/+3 |
| | | |||||
| * | eliminate the obsolete "last-child" indicator | friendica | 2012-07-18 | 1 | -41/+19 |
| | | |||||
| * | merge upstream, slider work, refactor ping module, language selection work | friendica | 2012-07-13 | 1 | -4/+64 |
| | | |||||
| * | remove check for event description, since it's not required to create an event | Zach Prezkuta | 2012-07-06 | 1 | -1/+1 |
| | | |||||
| * | my php thinks this is a typo | Zach Prezkuta | 2012-07-05 | 1 | -1/+1 |
| | | |||||
| * | fix small bug in lists and revert Diaspora list processing to ↵ | Zach Prezkuta | 2012-07-05 | 1 | -19/+51 |
| | | | | | non-Markdownify version | ||||
| * | recycle symbol woes with multiple html entity encode/decode cycles going on | friendica | 2012-07-04 | 1 | -0/+3 |
| | | |||||
| * | restore translation of bbcode videos, events, bookmarks, etc. to diaspora | friendica | 2012-07-04 | 1 | -10/+27 |
| | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |