| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | event integration improvements | redmatrix | 2015-08-19 | 1 | -2/+13 |
| | | |||||
| * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-14 | 1 | -3/+0 |
| |\ | | | | | | | | | | | Conflicts: include/zot.php util/messages.po | ||||
| | * | Properly fix which perms get checked for comments, Mike's solution | Alexandre Hannud Abdo | 2015-08-14 | 1 | -14/+3 |
| | | | |||||
| | * | revert 36b5f6ac | redmatrix | 2015-08-12 | 1 | -12/+14 |
| | | | |||||
| * | | add item validation function | redmatrix | 2015-08-13 | 1 | -19/+8 |
| | | | |||||
| * | | reverting 36b5f6ac | redmatrix | 2015-08-12 | 1 | -11/+18 |
| | | | |||||
| * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-08-11 | 1 | -1/+11 |
| |\| | | | | | | | | | | | Conflicts: doc/history.md mod/import.php | ||||
| | * | Require comment perms only for own posts, allow senders to deliver comments ↵ | Alexandre Hannud Abdo | 2015-08-10 | 1 | -1/+11 |
| | | | | | | | | | using stream perms. | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-23 | 1 | -1/+2 |
| |\| | | | | | | | | | Conflicts: include/diaspora.php | ||||
| | * | patch to allow theme based widgets | redmatrix | 2015-07-23 | 1 | -1/+2 |
| | | | |||||
| * | | typo | redmatrix | 2015-07-19 | 1 | -1/+1 |
| | | | |||||
| * | | abook clone sync - change logic to also unset existing cross-project flags ↵ | redmatrix | 2015-07-16 | 1 | -16/+8 |
| | | | | | | | | | besides just setting them | ||||
| * | | don't including rating stuff from cloned abooks | redmatrix | 2015-07-16 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -3/+9 |
| |\| | | | | | | | | | Conflicts: include/zot.php | ||||
| | * | fix for empty recip array resulting from a mangled xchan | redmatrix | 2015-07-15 | 1 | -5/+8 |
| | | | |||||
| * | | more clone sync issues across projects | redmatrix | 2015-07-15 | 1 | -5/+5 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-15 | 1 | -2/+7 |
| |\| | |||||
| | * | clone sync fixes across red/hz | redmatrix | 2015-07-15 | 1 | -2/+7 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-14 | 1 | -1/+3 |
| |\| | | | | | | | | | Conflicts: mod/connedit.php | ||||
| | * | coverup and ignore the illegal string offset message that some sites have ↵ | redmatrix | 2015-07-14 | 1 | -1/+3 |
| | | | | | | | | | been reporting. This does not fix it. A fix would be to examine the data that has been received and find out why it is mangled and trace this back to where it was mangled. | ||||
| * | | incorrect value for hubloc_deleted in zot_get_hublocs() query | redmatrix | 2015-07-07 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-07-02 | 1 | -1/+0 |
| |\| | | | | | | | | | 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/+22 |
| | | | | | | | | | redmatrix | ||||
| * | | sync abook entries from redmatrix | redmatrix | 2015-07-02 | 1 | -0/+21 |
| |\| | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 1 | -14/+32 |
| |\| | | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po | ||||
| | * | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 1 | -14/+31 |
| | | | | | | | | | still pretty cool. | ||||
| * | | more work on mail flags | redmatrix | 2015-06-23 | 1 | -1/+1 |
| | | | |||||
| * | | item flag fixes discovered after a few merges | redmatrix | 2015-06-23 | 1 | -2/+1 |
| | | | |||||
| * | | DB changes for some channel flags | redmatrix | 2015-06-15 | 1 | -16/+13 |
| | | | |||||
| * | | convert the abook fields | redmatrix | 2015-06-14 | 1 | -28/+22 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 1 | -3/+4 |
| |\| | | | | | | | | | Conflicts: mod/impel.php | ||||
| | * | some work on issue #329 | redmatrix | 2015-05-25 | 1 | -3/+4 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-20 | 1 | -16/+5 |
| |\| | | | | | | | | | | | | | | | Conflicts: include/items.php include/text.php mod/item.php view/nl/messages.po | ||||
| | * | cloning abook entries was broken in several ways if the target xchan wasn't ↵ | redmatrix | 2015-05-20 | 1 | -16/+5 |
| | | | | | | | | | available on the clone site. This should make it less broken. | ||||
| * | | re-arrange the html cache a bit | redmatrix | 2015-05-20 | 1 | -0/+3 |
| | | | |||||
| * | | 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 | ||||
| | * | | convert ITEM_WALL from bitfield to standalone | redmatrix | 2015-05-06 | 1 | -3/+3 |
| | | | | |||||
| | * | | first pass name change | redmatrix | 2015-05-05 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' into tres | friendica | 2015-04-23 | 1 | -567/+821 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | Some documentation and whitespaces at line endings. | Klaus Weidenbach | 2015-04-10 | 1 | -223/+325 |
| | | | |||||
| | * | Correcting reported Doxygen syntax warnings. | Klaus Weidenbach | 2015-03-29 | 1 | -413/+380 |
| | | | | | | | | | | | | | | | Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation. | ||||
| | * | tweaks to directory registrations which don't seem to be happening, also ↵ | friendica | 2015-03-19 | 1 | -0/+14 |
| | | | | | | | | | downgrade any directory that claims to be a primary directory for RED_GLOBAL. | ||||
| | * | add missing %d for abook_closeness | Michael Johnston | 2015-03-11 | 1 | -1/+1 |
| | | | |||||
| | * | diaspora's spammy permission model seems to have leaked through our ↵ | friendica | 2015-03-10 | 1 | -2/+5 |
| | | | | | | | | | firehose. Don't let it. | ||||
| | * | 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 | ||||
| | * | I'm going to use the site_update timestamp to indicate whenever we ↵ | friendica | 2015-03-03 | 1 | -0/+15 |
| | | | | | | | | | successfully connect with a site. This way we can mark hubs dead on non-directory servers; but we have to wait before implementing this until we have a history of site_update being updated. | ||||
| | * | don't let a zot-finger bring a dead hub back to life unless it's the site ↵ | friendica | 2015-03-03 | 1 | -5/+7 |
| | | | | | | | | | we're currently talking to. | ||||
| | * | make public delivery to contacts or any connections work again | zottel | 2015-03-02 | 1 | -3/+2 |
| | | | | | | | | | $hash wasn't defined in this case | ||||
| | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-02-26 | 1 | -0/+3 |
| | |\ | |||||
| | | * | more fake null shenanigans | Habeas Codice | 2015-02-26 | 1 | -0/+3 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |