redmatrix
b240c15014
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
2015-09-20 16:55:24 -07:00
redmatrix
9de8df496a
we need the xchan record also
2015-09-20 16:52:21 -07:00
redmatrix
ce064188c6
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
2015-09-19 22:48:22 -07:00
redmatrix
5d6f59a598
clone new connections
2015-09-19 22:46:59 -07:00
redmatrix
f4a4cf1402
clone new connection requests
2015-09-19 15:36:07 -07:00
redmatrix
63146821d7
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-18 23:02:49 -07:00
redmatrix
9ed8eac8c6
include site identitfier on redmatrix delivery reports also
2015-09-18 23:02:03 -07:00
redmatrix
43251ed8ce
add reporting site to delivery report
2015-09-18 22:00:33 -07:00
redmatrix
fdd4c1b9d1
more work on surviving hub re-installs
2015-09-18 14:31:29 -07:00
redmatrix
f0a7a6a1e2
consolidate zotfinger and webfinger
2015-09-17 17:51:31 -07:00
redmatrix
692e117c8a
Merge pull request #38 from MicMee/master
...
ensure that living sites are marked as alive
2015-09-12 08:25:27 +10:00
redmatrix
d96ca61f2b
Merge https://github.com/redmatrix/redmatrix into pending_merge
2015-09-11 14:57:26 -07:00
redmatrix
fc58b8cc0d
log the remote message if there was one
2015-09-11 14:56:31 -07:00
redmatrix
45e1f93e56
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
util/messages.po
2015-09-11 14:33:07 -07:00
redmatrix
e062c4e6b5
another tactic to deal with orphan hublocs from re-installs, or at least allow the descendant channel to survive
2015-09-11 14:30:07 -07:00
Michael Meer
755edd2110
ensure that living sites are marked as alive
2015-09-11 14:06:37 +02:00
redmatrix
4abfd4053a
sync likes
2015-09-10 19:18:12 -07:00
redmatrix
00b480527a
provide remote delivery report at logger_debug level
2015-09-10 17:53:06 -07:00
redmatrix
922d2165b3
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
2015-09-10 16:51:22 -07:00
redmatrix
50e32c3d8a
zot_refresh: always try the hubloc pointed to by xchan_addr first
2015-09-10 16:48:08 -07:00
redmatrix
75d521d42a
menu import and sync
2015-09-08 17:52:39 -07:00
redmatrix
650e98b2a9
work on event sync
2015-09-07 21:01:49 -07:00
redmatrix
6d1b64065a
consolidate import_items/sync_items
2015-09-07 18:14:30 -07:00
redmatrix
d79e81a069
import and sync chatrooms
2015-09-03 18:44:40 -07:00
redmatrix
f3cb17ac3b
app sync
2015-09-02 23:09:51 -07:00
redmatrix
c22da3da1c
start to modularise the clone import and sync functions
2015-09-02 20:12:40 -07:00
redmatrix
2a26c898ca
protect from sql injection
2015-09-02 15:52:54 -07:00
redmatrix
69fc10d5ad
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
2015-09-02 15:49:50 -07:00
zottel
441946b9d3
really fix post filtering
2015-09-02 15:49:07 +02:00
redmatrix
6cc60ba477
initial work on obj import, rename import_profile_photo to import_xchan_photo to more accurately state its purpose.
2015-09-01 22:03:10 -07:00
redmatrix
eac9c8a7e6
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
install/update.php
util/messages.po
2015-08-23 20:23:55 -07:00
redmatrix
b1f091e4d7
issues with abook sync between hubzilla and red
2015-08-23 17:40:47 -07:00
redmatrix
bf190be5b4
issues encountered with hubzilla DB changes, zot_refresh and item_drop and hub sync
2015-08-23 13:27:34 -07:00
redmatrix
a4caaefd32
event integration improvements
2015-08-19 16:50:32 -07:00
redmatrix
18bc12c21c
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
include/zot.php
util/messages.po
2015-08-14 22:24:15 -07:00
Alexandre Hannud Abdo
73b30de9cb
Properly fix which perms get checked for comments, Mike's solution
2015-08-14 12:21:05 -03:00
redmatrix
d140620008
add item validation function
2015-08-13 19:35:57 -07:00
redmatrix
ef73880459
reverting 36b5f6ac
2015-08-12 22:48:08 -07:00
redmatrix
0b7365e2db
revert 36b5f6ac
2015-08-12 22:37:24 -07:00
redmatrix
2d9d4dfeb3
Merge https://github.com/redmatrix/redmatrix into pending_merge
...
Conflicts:
doc/history.md
mod/import.php
2015-08-11 22:35:36 -07:00
Alexandre Hannud Abdo
36b5f6acfe
Require comment perms only for own posts, allow senders to deliver comments using stream perms.
2015-08-10 18:20:18 -03:00
redmatrix
cc5b0cde1d
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/diaspora.php
2015-07-23 21:07:35 -07:00
redmatrix
27fa908233
patch to allow theme based widgets
2015-07-23 18:49:37 -07:00
redmatrix
fd8e6f3130
typo
2015-07-19 21:04:02 -07:00
redmatrix
4299ae65a4
abook clone sync - change logic to also unset existing cross-project flags besides just setting them
2015-07-16 18:07:23 -07:00
redmatrix
c3dbacfb88
don't including rating stuff from cloned abooks
2015-07-16 17:53:59 -07:00
redmatrix
b9fd8b4614
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
2015-07-15 18:41:50 -07:00
redmatrix
7db515b77c
fix for empty recip array resulting from a mangled xchan
2015-07-15 18:31:37 -07:00
redmatrix
7f6e4d5f4a
more clone sync issues across projects
2015-07-15 18:21:04 -07:00
redmatrix
95cf1668de
Merge branch 'master' of https://github.com/redmatrix/redmatrix
2015-07-15 18:15:25 -07:00
redmatrix
59b67d52e6
clone sync fixes across red/hz
2015-07-15 18:14:19 -07:00
redmatrix
e8f19c1e15
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/connedit.php
2015-07-14 17:10:13 -07:00
redmatrix
a5989b0f31
coverup and ignore the illegal string offset message that some sites have 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.
2015-07-14 16:54:16 -07:00
redmatrix
dad4ac6c89
incorrect value for hubloc_deleted in zot_get_hublocs() query
2015-07-07 16:06:34 -07:00
redmatrix
90a31f4ad5
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
2015-07-02 22:00:15 -07:00
redmatrix
1a5898bf80
sync abook entries from redmatrix
...
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/items.php
2015-07-02 21:58:28 -07:00
redmatrix
065a50c920
a few clone sync fixes as well as some work on hubzilla clone sync back to redmatrix
2015-07-02 21:55:36 -07:00
redmatrix
63f2e9b412
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/zot.php
mod/connedit.php
util/messages.po
2015-06-28 22:33:13 -07:00
redmatrix
de13497333
no this isn't it. well ok, it's part of it, but not the important part. it's still pretty cool.
2015-06-28 21:16:56 -07:00
redmatrix
1a0655f34e
more work on mail flags
2015-06-23 21:01:59 -07:00
redmatrix
cb76fb8b9b
item flag fixes discovered after a few merges
2015-06-23 19:45:39 -07:00
redmatrix
859a2ac8ef
DB changes for some channel flags
2015-06-15 17:28:52 -07:00
redmatrix
be0459a98b
convert the abook fields
2015-06-14 21:08:00 -07:00
redmatrix
b381ec5734
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
mod/impel.php
2015-05-27 19:27:38 -07:00
redmatrix
9a0264f5d2
some work on issue #329
2015-05-25 19:17:35 -07:00
redmatrix
3763f74a10
Merge branch 'master' of https://github.com/redmatrix/redmatrix
...
Conflicts:
include/items.php
include/text.php
mod/item.php
view/nl/messages.po
2015-05-20 20:49:06 -07:00
redmatrix
c10a4ca9c7
re-arrange the html cache a bit
2015-05-20 20:28:16 -07:00
redmatrix
62df06b3d6
cloning abook entries was broken in several ways if the target xchan wasn't available on the clone site. This should make it less broken.
2015-05-20 20:20:35 -07:00
redmatrix
a6cb90c81c
Merge branch 'master' into tres
...
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
2015-05-14 18:02:29 -07:00
redmatrix
25b599a4bd
convert ITEM_WALL from bitfield to standalone
2015-05-06 21:03:33 -07:00
redmatrix
a3c37f1458
first pass name change
2015-05-05 03:56:10 -07:00
friendica
6679734135
Merge branch 'master' into tres
...
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
2015-04-23 19:49:41 -07:00
Klaus Weidenbach
fdd6508019
Some documentation and whitespaces at line endings.
2015-04-10 00:28:23 +02:00
Klaus Weidenbach
d0361582b0
Correcting reported Doxygen syntax warnings.
...
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.
2015-03-29 22:23:00 +02:00
friendica
b1fd6c53a5
tweaks to directory registrations which don't seem to be happening, also downgrade any directory that claims to be a primary directory for RED_GLOBAL.
2015-03-19 15:56:30 -07:00
Michael Johnston
4e98a70e66
add missing %d for abook_closeness
2015-03-11 20:56:40 -04:00
friendica
54a9fb1774
diaspora's spammy permission model seems to have leaked through our firehose. Don't let it.
2015-03-10 12:22:22 -07:00
friendica
b5683bfac4
change default affinity (abook_closeness) to 80 for all new connections 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
2015-03-08 14:11:38 -07:00
friendica
99e4d2362c
I'm going to use the site_update timestamp to indicate whenever we 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.
2015-03-03 15:54:38 -08:00
friendica
85f79990af
don't let a zot-finger bring a dead hub back to life unless it's the site we're currently talking to.
2015-03-03 15:22:24 -08:00
zottel
e4a2e353d8
make public delivery to contacts or any connections work again
...
$hash wasn't defined in this case
2015-03-02 11:05:03 +01:00
friendica
4162dfe43f
Merge https://github.com/friendica/red into pending_merge
2015-02-26 14:21:26 -08:00
friendica
09f80270de
loop breaker
2015-02-26 14:20:43 -08:00
Habeas Codice
82bb216952
more fake null shenanigans
2015-02-26 08:23:02 -08:00
Habeas Codice
f55e210120
Revert "more fake null shenanigans"
...
This reverts commit b57010e3da
2015-02-26 08:22:15 -08:00
Habeas Codice
b57010e3da
more fake null shenanigans
2015-02-26 08:20:29 -08:00
friendica
b32841e2dd
Found the cause of the delete looping, and I can prevent it going forward. 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.
2015-02-25 15:27:33 -08:00
friendica
1a071ea4f0
call post_local hooks prior to storing a post that is going to be sourced. 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.
2015-02-25 03:16:43 -08:00
friendica
2a2cc309ce
solve some (hopefully most) missing delivery issues
2015-02-25 01:39:45 -08:00
friendica
d29de912b4
public_recips cleanup
2015-02-23 16:27:12 -08:00
Habeas Codice
ffd47e6b95
catch negative ages
...
nix extra var
2015-02-20 19:48:51 -08:00
zottel
d0fe0b5d5f
fix parens mismatch from last commit
2015-02-18 11:48:05 +01:00
zottel
9d745cd072
also deliver public posts to channels with channel_w_stream = PERMS_AUTHED
2015-02-18 11:44:43 +01:00
Habeas Codice
d9d029470f
Merge branch 'master' of https://github.com/friendica/red
2015-02-16 15:13:31 -08:00
Habeas Codice
ca8e221018
normalize age data
...
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.
2015-02-16 15:09:43 -08:00
friendica
1c4b919980
force site_url to be lowercase when stored. Otherwise rating hubs on postgres could get real messy.
2015-02-15 23:45:22 -08:00
friendica
7bb2e25ea0
missing param
2015-02-13 13:04:31 -08:00
friendica
c62d605608
well that was certainly fun. And the reason why likes and other acitivity deletions weren't propagating. Hopefully this is the last reason and there aren't more lurking further down the chain.
2015-02-11 16:11:21 -08:00
friendica
8c061f143f
more efficient processing of response activities, plus a proof of concept fix for the problem of receiving a delete notification before we actually get the item which we're supposed to delete.
2015-02-11 15:26:35 -08:00
friendica
4b348d2489
Merge branch 'master' into tres
...
Conflicts:
view/css/mod_events.css
view/theme/redbasic/css/style.css
2015-02-05 19:38:43 -08:00
