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

14735 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
redmatrix
efcb4abfd0 improve on the last attempt 2015-09-20 18:08:06 -07:00
redmatrix
1501d1c570 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	include/zot.php
 2015-09-20 18:03:41 -07:00
redmatrix
59a56ac77f catch the timestamp also 2015-09-20 17:47:41 -07:00
redmatrix
35f09f4f74 remove system flags from channel import packet 2015-09-20 17:45:23 -07:00
redmatrix
421dfce599 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-20 16:55:53 -07:00
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
Haakon Meland Eriksen
4f65066572 Removed hot_deploy 2015-09-20 23:06:25 +02:00
Mario Vavti
c38687725d kick right aside out a little earlier 2015-09-20 22:12:00 +02:00
Haakon Meland Eriksen
099f236f45 Merge remote-tracking branch 'upstream/master' 2015-09-20 21:29:41 +02:00
redmatrix
996cd7e2ab Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-20 00:28:22 -07:00
redmatrix
77df590f65 initial checkin delivery report class 2015-09-20 00:27:25 -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
zottel
032ef0ca34 Merge remote-tracking branch 'upstream/master' 2015-09-19 20:11:59 +02:00
Haakon Meland Eriksen
5a7e8d8520 Merge remote-tracking branch 'upstream/master' 2015-09-19 11:35:31 +02: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
40bb1699a5 DB table for delivery reports 2015-09-18 22:55:47 -07:00
redmatrix
74827133b2 Merge https://github.com/redmatrix/redmatrix into pending_merge 
Conflicts:
	util/messages.po
 2015-09-18 22:46:21 -07:00
redmatrix
7c8706757d Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-18 22:44:23 -07:00
redmatrix
3dc066a143 dummy update 2015-09-18 22:43:35 -07:00
redmatrix
43251ed8ce add reporting site to delivery report 2015-09-18 22:00:33 -07:00
redmatrix
1a16822987 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-18 14:32:23 -07:00
redmatrix
fdd4c1b9d1 more work on surviving hub re-installs 2015-09-18 14:31:29 -07:00
Haakon Meland Eriksen
1bd1050160 Added hot_deploy directly to .openshift/makers/hot_deploy 2015-09-18 18:58:43 +02:00
Haakon Meland Eriksen
525a0478b0 Added hot_deploy to deploy script - fixed echo 2015-09-18 18:55:56 +02:00
Haakon Meland Eriksen
ce28760c2a Merge remote-tracking branch 'upstream/master' 2015-09-18 18:51:39 +02:00
Haakon Meland Eriksen
438cb1d7e0 Added hot_deploy to deploy script 2015-09-18 18:51:03 +02:00
Mario Vavti
87c8cf4892 css fixes 2015-09-18 13:07:04 +02:00
redmatrix
f2fefb91d5 change photo permissions when attach permissions are changed through mod/filestorage, and fix lockview for photos. 2015-09-18 01:53:04 -07:00
zottel
4d05d477f8 Merge remote-tracking branch 'upstream/master' 2015-09-18 09:38:55 +02:00