Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 20:15:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14718 commits 7 branches 30 tags 160 MiB
Commit graph

14718 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Haakon Meland Eriksen
414b5ea6f3 Merge remote-tracking branch 'upstream/master' 2015-09-24 23:32:18 +02:00
redmatrix
c42dcd5ac9 Merge pull request #55 from git-marijus/master 
some heavy private mail restructuring - work in progress
 2015-09-25 06:37:38 +10:00
Mario Vavti
b9723aa85b some heavy private mail restructuring - work in progress 2015-09-24 14:07:44 +02:00
zottel
03fb13e749 Merge remote-tracking branch 'upstream/master' 2015-09-24 12:50:27 +02:00
redmatrix
e04f04ef0f Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	install/update.php
 2015-09-23 22:33:48 -07:00
redmatrix
0f3c2c4b24 add vdata field for caldav 2015-09-23 22:32:46 -07:00
redmatrix
8a94a4938f dummy update 2015-09-23 22:31:49 -07: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
zottel
0bfdb45b41 Merge remote-tracking branch 'upstream/master' 2015-09-23 08:59:28 +02:00
Haakon Meland Eriksen
8cbccb20ef Merge remote-tracking branch 'upstream/master' 2015-09-23 07:43:17 +02:00
redmatrix
f506f73d3f Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/items.php
 2015-09-22 22:31:53 -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
2fa5b8c0a2 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-22 18:41:53 -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
redmatrix
642f460dca report the channel sync 2015-09-22 16:43:36 -07:00
redmatrix
1d7d9818fa Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/items.php
	include/zot.php
 2015-09-22 16:26:28 -07:00
redmatrix
c2dcc68803 backport item sync 2015-09-22 16:19:08 -07:00
Haakon Meland Eriksen
d7c9f2ccba Merge remote-tracking branch 'upstream/master' 2015-09-22 19:02:20 +02:00
redmatrix
7dd61c05dc allow self delivery until we figure out why clone sync of posted items isn't doing it's thing 2015-09-22 04:39:36 -07:00
redmatrix
1c1155513a add one more test 2015-09-22 04:28:05 -07:00
redmatrix
f84151e1fe fix foreach warning 2015-09-22 04:24:54 -07:00
redmatrix
4b13f0e025 since this is now usable, protect the displayed delivery reports from XSS injection 2015-09-22 04:08:03 -07:00
redmatrix
2869ccfe39 delivery reports - crude but mostly functional at least for zot deliveries 2015-09-22 04:04:51 -07:00
redmatrix
8ead4745f8 Merge pull request #54 from git-marijus/master 
fix consensus items - issue #53
 2015-09-22 19:41:08 +10:00
redmatrix
15b241cc3e remove dummy update from merge 2015-09-22 02:34:34 -07:00
redmatrix
2b07a69b93 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-22 02:34:05 -07:00
redmatrix
5068ce0569 dummy update 2015-09-22 02:33:24 -07:00
redmatrix
0b1b11ea53 heavy lifting for delivery reports 2015-09-22 02:32:04 -07:00
Mario Vavti
ea9f169a6c fix consensus items - issue #53 2015-09-22 10:59:19 +02:00
Haakon Meland Eriksen
cbd7f89066 Merge remote-tracking branch 'upstream/master' 2015-09-22 07:34:42 +02:00
redmatrix
146ff6f703 more progress on delivery reports. Store the remote results from zot sites locally. 2015-09-21 22:30:28 -07:00
redmatrix
326ae5ff6b Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	mod/post.php
 2015-09-21 20:29:18 -07:00
redmatrix
8c16f12d7a issue #52 - try all matching hublocs for remote auth, not just the "best one". 2015-09-21 20:20:16 -07:00
redmatrix
477228d4ff issue #50 - cloud listings produce white screen for unauthenticated viewer 2015-09-21 20:17:48 -07:00
redmatrix
9baaa6fa56 issue #51 2015-09-21 20:05:54 -07:00
Haakon Meland Eriksen
7834274bff Merge remote-tracking branch 'upstream/master' 2015-09-21 07:31:36 +02:00
redmatrix
d2565d0f61 looks like chat has been neglected a bit recently 2015-09-20 21:37:18 -07:00
redmatrix
4fde0bf62e Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-20 20:58:55 -07:00
redmatrix
a679081993 new delivery report format 2015-09-20 20:21:54 -07:00
redmatrix
177292de13 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-20 18:10:25 -07:00