| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-02 | 1 | -0/+14 |
| |\ | | | | | | | | | Conflicts: include/zot.php | ||||
| | * | a few clone sync fixes as well as some work on hubzilla clone sync back to ↵ | redmatrix | 2015-07-02 | 1 | -0/+14 |
| | | | | | | | | | redmatrix | ||||
| * | | fix the postgres schema with all the changes to date | redmatrix | 2015-06-29 | 1 | -2/+1 |
| | | | |||||
| * | | more work on mail flags | redmatrix | 2015-06-23 | 1 | -5/+5 |
| | | | |||||
| * | | item flag fixes discovered after a few merges | redmatrix | 2015-06-23 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-23 | 1 | -0/+26 |
| |\| | | | | | | | | | | | Conflicts: include/items.php mod/item.php | ||||
| | * | discovered a couple of loose ends in the per-member enable diaspora setting | redmatrix | 2015-06-22 | 1 | -0/+26 |
| | | | |||||
| * | | DB changes for some channel flags | redmatrix | 2015-06-15 | 1 | -3/+2 |
| | | | |||||
| * | | convert the abook fields | redmatrix | 2015-06-14 | 1 | -2/+2 |
| | | | |||||
| * | | diaspora disallowed by default | redmatrix | 2015-06-10 | 1 | -4/+0 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 1 | -0/+19 |
| |\| | |||||
| | * | toggle diaspora protocol on a per-channel level in addition to the existing ↵ | redmatrix | 2015-06-09 | 1 | -0/+19 |
| | | | | | | | | | per site setting. Default is enabled if the site setting is enabled. | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 1 | -2/+8 |
| |\| | | | | | | | | | Conflicts: mod/impel.php | ||||
| | * | fix for forked thread on diaspora | redmatrix | 2015-05-27 | 1 | -0/+5 |
| | | | |||||
| | * | some work on issue #329 | redmatrix | 2015-05-25 | 1 | -2/+3 |
| | | | |||||
| * | | add rot47 to the mix. This shouldn't affect the speed to any measurable degree. | redmatrix | 2015-05-19 | 1 | -6/+6 |
| | | | |||||
| * | | mail_obscure - AES-256 is way too slow, simplify. Ideally a substitution ↵ | redmatrix | 2015-05-19 | 1 | -9/+7 |
| | | | | | | | | | cipher would be adequate for our requirements. | ||||
| * | | Merge branch 'master' into tres | redmatrix | 2015-05-17 | 1 | -4/+5 |
| |\ \ | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-17 | 1 | -4/+5 |
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/bb2diaspora.php include/diaspora.php include/enotify.php mod/admin.php mod/cloud.php mod/dav.php mod/home.php mod/invite.php mod/like.php mod/mitem.php mod/p.php mod/pubsites.php mod/setup.php mod/siteinfo.php util/messages.po | ||||
| | | * | missing $ | redmatrix | 2015-05-17 | 1 | -1/+1 |
| | | | | |||||
| | | * | more work isolating the projectname from core. | redmatrix | 2015-05-17 | 1 | -4/+4 |
| | | | | |||||
| * | | | Merge branch 'master' into tres | redmatrix | 2015-05-14 | 1 | -7/+22 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-10 | 1 | -1/+1 |
| | |\| | | | | | | | | | | | | | | | | | | | Conflicts: mod/mitem.php view/de/messages.po view/de/strings.php | ||||
| | | * | rev update | redmatrix | 2015-05-10 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-06 | 1 | -0/+15 |
| | |\| | |||||
| | | * | turn consensus items into diaspora polls for that network | redmatrix | 2015-05-05 | 1 | -0/+15 |
| | | | | |||||
| | * | | no need to obscure the diaspora signature if we're not obscuring the posts | redmatrix | 2015-05-06 | 1 | -2/+2 |
| | | | | |||||
| | * | | first pass name change | redmatrix | 2015-05-05 | 1 | -5/+5 |
| | |/ | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -108/+236 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | mod_connections ajax failure see ↵ | friendica | 2015-03-29 | 1 | -0/+51 |
| | | | | | | | | | http://stackoverflow.com/questions/14347611/jquery-client-side-template-syntax-error-unrecognized-expression | ||||
| | * | catche edge case of tag "@abcdef +1", which tags the first entry in your ↵ | friendica | 2015-03-24 | 1 | -3/+3 |
| | | | | | | | | | abook, regardless of abcdef. This holds true for other similar patterns as well. | ||||
| | * | create terms for Diaspora mention tags - which in Diaspora are handled ↵ | friendica | 2015-03-13 | 1 | -3/+97 |
| | | | | | | | | | differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause. | ||||
| | * | invoke tgroup_check() on diaspora posts/comments in case the recipient is a ↵ | friendica | 2015-03-13 | 1 | -19/+34 |
| | | | | | | | | | forum with channel_w_stream permissions restricted. | ||||
| | * | don't relay diaspora comments to sys channel | friendica | 2015-03-11 | 1 | -0/+6 |
| | | | |||||
| | * | change default affinity (abook_closeness) to 80 for all new connections ↵ | friendica | 2015-03-08 | 1 | -1/+7 |
| | | | | | | | | | going forward (was 99). This way it can be adjusted down later without requiring you to change all your existing connections upward (since your existing connections are likely all sitting at 99 at the moment). The default setting is also configurable with a pconfig system.new_abook_closeness | ||||
| | * | Diaspora tag replacement was wretchedly buggy. Use our standard tag ↵ | friendica | 2015-02-19 | 1 | -129/+27 |
| | | | | | | | | | replacement calls instead. | ||||
| | * | diaspora: move reshare encapsulation after tag parsing, since it seriously ↵ | friendica | 2015-02-19 | 1 | -13/+12 |
| | | | | | | | | | screws up the tag parser and reshares end up with a lot of unlinked tags. | ||||
| | * | The Diaspora communications policies allow comments to public posts ↵ | friendica | 2015-02-17 | 1 | -17/+35 |
| | | | | | | | | | literally from anybody. Allow this policy model by default for commenters from that network. This policy decision can be set or disabled on the addon/features settings page. | ||||
| | * | provide relief to sites that are severely impacted by the slow ITEM_UNSEEN ↵ | friendica | 2015-02-12 | 1 | -2/+2 |
| | | | | | | | | | searches. This does not incorporate any other flag optimisations as that will require a major DB update and possibly involve significant downtime. This is just to bite off a little chunk now and provide some much needed relief. | ||||
| | * | apply max_import_size to Diaspora posts | friendica | 2015-02-09 | 1 | -0/+43 |
| | | | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-02-08 | 1 | -6/+4 |
| |\| | | | | | | | | | | | Conflicts: mod/events.php view/css/mod_events.css | ||||
| | * | generate the correct service permalink | friendica | 2015-02-08 | 1 | -6/+4 |
| | | | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-02-05 | 1 | -19/+36 |
| |\| | | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css | ||||
| | * | over-ride permissions for sys channel delivery from diaspora | friendica | 2015-02-05 | 1 | -9/+13 |
| | | | |||||
| | * | another issue with diaspora postings to sys channel - sys has no ↵ | friendica | 2015-02-05 | 1 | -6/+14 |
| | | | | | | | | | connections, hence no abook records. | ||||
| | * | diaspora public posts not delivering to sys channel if there were no other ↵ | friendica | 2015-02-04 | 1 | -4/+9 |
| | | | | | | | | | subscribers | ||||
| * | | Merge branch 'master' into tres | friendica | 2015-02-01 | 1 | -1/+1 |
| |\| | |||||
| | * | issue #885, autoperms not working for diaspora connections | friendica | 2015-01-31 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-01-29 | 1 | -22/+13 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php | ||||
| | * | implement diaspora profile message (oops) or updated profile photos won't be ↵ | friendica | 2015-01-29 | 1 | -21/+4 |
| | | | | | | | | | updated | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |