redmatrix
|
dd45e7b4eb
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-10-01 17:30:15 -07:00 |
|
redmatrix
|
63eb0e3a38
|
allow additional uses for xtags
|
2015-10-01 17:28:03 -07:00 |
|
redmatrix
|
986244eeea
|
issue #63 - missing table fields in db query
|
2015-09-30 21:38:21 -07:00 |
|
redmatrix
|
9bdb7bef5d
|
add delivery reports to mail (not backported to redmatrix)
|
2015-09-30 19:27:53 -07:00 |
|
redmatrix
|
54e7d5d260
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
view/de/messages.po
view/de/strings.php
|
2015-09-30 16:31:06 -07:00 |
|
redmatrix
|
5265c190d4
|
document the issue with cloned delivery to self vs normal delivery to self
|
2015-09-30 16:27:24 -07:00 |
|
redmatrix
|
4b7c052ed8
|
undo self deliver check
|
2015-09-30 12:59:13 -07:00 |
|
redmatrix
|
fd290882fd
|
undo self-deliver check
|
2015-09-30 12:57:02 -07:00 |
|
redmatrix
|
e769fbaffb
|
another error from the db logs
|
2015-09-29 22:56:29 -07:00 |
|
redmatrix
|
5721f9f3a9
|
wrong table column names
|
2015-09-29 22:51:06 -07:00 |
|
redmatrix
|
cca9f2392e
|
queue cleanup, and report issues
|
2015-09-29 22:11:10 -07:00 |
|
redmatrix
|
928fa44154
|
more work on the notifier
|
2015-09-29 21:08:12 -07:00 |
|
redmatrix
|
a795f03c48
|
improve the sys channel location repair to check key issues and re-installs and/or site moves
|
2015-09-29 17:21:14 -07:00 |
|
redmatrix
|
8f7b869c08
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-29 16:56:50 -07:00 |
|
redmatrix
|
c5294f994e
|
check and repair sys channel locations (hublocs) in zot-finger if they are messed up
|
2015-09-29 16:55:51 -07:00 |
|
Mario Vavti
|
2a2da48d18
|
fix typo in 0b1cd826b0
|
2015-09-29 11:56:43 +02:00 |
|
Mario Vavti
|
0b1cd826b0
|
do not store a recalled mail if we can not find the original mid
|
2015-09-29 11:48:41 +02:00 |
|
redmatrix
|
8d5556764c
|
add one more level of parentheses to ensure operator precedence is correctly evaluated
|
2015-09-28 20:03:11 -07:00 |
|
redmatrix
|
f965209eee
|
check public scopes against visitor in item_permissions_sql()
|
2015-09-28 19:45:57 -07:00 |
|
redmatrix
|
5c526995d8
|
resolve conflicts
|
2015-09-28 19:07:31 -07:00 |
|
redmatrix
|
50ee82e8bd
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-28 19:06:10 -07:00 |
|
redmatrix
|
8a3c909c74
|
ignore self delivery in process_delivery
|
2015-09-28 19:05:45 -07:00 |
|
redmatrix
|
3a8e1e0484
|
process_delivery: ignore self
|
2015-09-28 19:04:36 -07:00 |
|
redmatrix
|
3b53cd56ef
|
Merge branch 'deadsite'
|
2015-09-28 17:15:34 -07:00 |
|
redmatrix
|
30e88a4f6b
|
typo
|
2015-09-28 17:15:04 -07:00 |
|
redmatrix
|
e5f47cd14b
|
create site records for all queued sites and check for death
|
2015-09-28 17:13:11 -07:00 |
|
Mario Vavti
|
b97102da01
|
private mail: bring additional inbox/outbox views and ajaxify single message drop
|
2015-09-28 17:40:38 +02:00 |
|
redmatrix
|
dbeae16dc1
|
add site_type to queries, first few - several more to go.
|
2015-09-28 04:21:29 -07:00 |
|
redmatrix
|
ed876a9c52
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
|
2015-09-27 18:03:40 -07:00 |
|
redmatrix
|
67fe8fc4a7
|
well there's one problem...
|
2015-09-27 18:00:37 -07:00 |
|
redmatrix
|
55b530f0fd
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
include/zot.php
util/messages.po
|
2015-09-27 17:00:41 -07:00 |
|
redmatrix
|
aae51a9b23
|
add some safety checks on the sending side of sync
|
2015-09-27 16:47:25 -07:00 |
|
redmatrix
|
cd2b811555
|
move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts.
|
2015-09-26 23:44:30 -07:00 |
|
redmatrix
|
9ab335626c
|
import_xchan_photo: check the return headers to ensure it's an image content-type of some form as imagick chucks a wobbly if you try to initialise an image with an html error page.
|
2015-09-26 13:25:34 -07:00 |
|
redmatrix
|
8aec437c23
|
remove redundant code
|
2015-09-24 23:02:41 -07:00 |
|
redmatrix
|
98f656cfcb
|
delivery optimisations
|
2015-09-24 22:51:47 -07:00 |
|
redmatrix
|
2c665e5e4c
|
add Diaspora (actually any external service which uses the queue) to delivery reports
|
2015-09-24 17:41:05 -07:00 |
|
redmatrix
|
2fe3d16bbe
|
Merge https://github.com/redmatrix/hubzilla into pending_merge
|
2015-09-24 16:58:32 -07:00 |
|
redmatrix
|
2844f276b9
|
Document the additional content export options
|
2015-09-24 16:57:17 -07:00 |
|
Mario Vavti
|
b9723aa85b
|
some heavy private mail restructuring - work in progress
|
2015-09-24 14:07:44 +02:00 |
|
redmatrix
|
b553ffd55d
|
timezone tweaks
|
2015-09-23 20:59:19 -07:00 |
|
redmatrix
|
e45958b967
|
add plugin hooks to channel sync/import/export
|
2015-09-23 18:27:04 -07:00 |
|
redmatrix
|
7734bbfe4d
|
problems with extended item import and signatures
|
2015-09-22 22:30:09 -07:00 |
|
redmatrix
|
d35c5bcb2f
|
merge issue
|
2015-09-22 19:16:13 -07:00 |
|
redmatrix
|
c699d3a17a
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-22 19:14:21 -07:00 |
|
redmatrix
|
d16ac62a51
|
don't send sync packets to deleted hubloc locations
|
2015-09-22 19:13:10 -07:00 |
|
redmatrix
|
15feeb7bfe
|
inverted logic syncing deleted hublocs
|
2015-09-22 18:40:03 -07:00 |
|
redmatrix
|
02ecc93998
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-22 16:50:55 -07:00 |
|
redmatrix
|
34291d5938
|
add names to delivery report for sync delivery
|
2015-09-22 16:50:08 -07:00 |
|
redmatrix
|
e726adc27b
|
Merge https://github.com/redmatrix/redmatrix into pending_merge
|
2015-09-22 16:45:14 -07:00 |
|