aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-271-3/+4
|\ | | | | | | | | Conflicts: mod/impel.php
| * some work on issue #329redmatrix2015-05-251-3/+4
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-05-201-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 ↵redmatrix2015-05-201-16/+5
| | | | | | | | available on the clone site. This should make it less broken.
* | re-arrange the html cache a bitredmatrix2015-05-201-0/+3
| |
* | Merge branch 'master' into tresredmatrix2015-05-141-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 standaloneredmatrix2015-05-061-3/+3
| | |
| * | first pass name changeredmatrix2015-05-051-1/+1
| |/
* | Merge branch 'master' into tresfriendica2015-04-231-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 Weidenbach2015-04-101-223/+325
| |
| * Correcting reported Doxygen syntax warnings.Klaus Weidenbach2015-03-291-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 ↵friendica2015-03-191-0/+14
| | | | | | | | downgrade any directory that claims to be a primary directory for RED_GLOBAL.
| * add missing %d for abook_closenessMichael Johnston2015-03-111-1/+1
| |
| * diaspora's spammy permission model seems to have leaked through our ↵friendica2015-03-101-2/+5
| | | | | | | | firehose. Don't let it.
| * change default affinity (abook_closeness) to 80 for all new connections ↵friendica2015-03-081-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 ↵friendica2015-03-031-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 ↵friendica2015-03-031-5/+7
| | | | | | | | we're currently talking to.
| * make public delivery to contacts or any connections work againzottel2015-03-021-3/+2
| | | | | | | | $hash wasn't defined in this case
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-02-261-0/+3
| |\
| | * more fake null shenanigansHabeas Codice2015-02-261-0/+3
| | |
| | * Revert "more fake null shenanigans"Habeas Codice2015-02-261-23/+94
| | | | | | | | | | | | This reverts commit b57010e3da6c0521121a622c27013c8af7678132.
| | * more fake null shenanigansHabeas Codice2015-02-261-94/+23
| | |
| * | loop breakerfriendica2015-02-261-0/+16
| |/
| * Found the cause of the delete looping, and I can prevent it going forward. ↵friendica2015-02-251-12/+37
| | | | | | | | The issue remains what to do about comments which are already in the DB and have ITEM_ORIGIN incorrectly set. We can't exactly reset them because the "original" context has been lost. (Sorry but couldn't resist an insider pun that none of you will be able to follow anyway). Read the comments.
| * call post_local hooks prior to storing a post that is going to be sourced. ↵friendica2015-02-251-0/+7
| | | | | | | | There are some fields in the actual stored item that may change when we start the second delivery chain so a few plugins may not deal with these items correctly. Since we only source public items these effects will be slight.
| * solve some (hopefully most) missing delivery issuesfriendica2015-02-251-13/+55
| |
| * public_recips cleanupfriendica2015-02-231-18/+30
| |
| * catch negative agesHabeas Codice2015-02-201-6/+7
| | | | | | | | nix extra var
| * fix parens mismatch from last commitzottel2015-02-181-2/+2
| |
| * also deliver public posts to channels with channel_w_stream = PERMS_AUTHEDzottel2015-02-181-2/+2
| |
| * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-02-161-1/+1
| |\
| | * force site_url to be lowercase when stored. Otherwise rating hubs on ↵friendica2015-02-151-1/+1
| | | | | | | | | | | | postgres could get real messy.
| * | normalize age dataHabeas Codice2015-02-161-2/+7
| |/ | | | | | | | | | | | | | | mysql has type tinyint(3) which probably turns into a 24-bit value, but postgres uses 3-digit decimal as its constraint (probably what the mysql schema was intended to do). either that or mysql silently truncates while postgres respects the constraint. Either way, bad data gets in unchecked, now it's checked.
| * missing paramfriendica2015-02-131-1/+1
| |
| * well that was certainly fun. And the reason why likes and other acitivity ↵friendica2015-02-111-3/+4
| | | | | | | | deletions weren't propagating. Hopefully this is the last reason and there aren't more lurking further down the chain.
| * more efficient processing of response activities, plus a proof of concept ↵friendica2015-02-111-17/+44
| | | | | | | | fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
* | Merge branch 'master' into tresfriendica2015-02-051-11/+35
|\| | | | | | | | | | | Conflicts: view/css/mod_events.css view/theme/redbasic/css/style.css
| * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-02-051-10/+34
| |\
| | * Merge branch 'master' into pocoratefriendica2015-02-031-0/+5
| | |\
| | | * garbage in garbage outfriendica2015-02-031-0/+5
| | | |
| | * | send rating information to directoriesfriendica2015-02-021-10/+29
| | |/
| * / escape datesHabeas Codice2015-02-051-1/+1
| |/
* | Merge branch 'master' into tresfriendica2015-01-311-9/+34
|\| | | | | | | | | Conflicts: include/zot.php
| * sync_locations() toggle DB flag functions were broken - result of postgres ↵friendica2015-01-301-4/+22
| | | | | | | | changes. Split these into seperate set and reset blocks.
| * let zot_refresh continue without a primary hub if one cannot be found. also ↵friendica2015-01-301-5/+14
| | | | | | | | weekly doc updates
* | Merge branch 'master' into tresfriendica2015-01-291-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * local_user => local_channelfriendica2015-01-281-1/+1
| |
| * add yet another firehose checkfriendica2015-01-281-1/+1
| |
| * more minor tweaks to the route mismatch algorithm after watching it all day.friendica2015-01-281-2/+5
| |
* | more message restrict conversionsfriendica2015-01-291-5/+5
| |