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 |
|