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

14794 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
6368b09337 a clear is needed after floating 2015-09-28 21:51:04 +02: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
edbcba6f11 schema support for additional site types 2015-09-28 04:15:21 -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
3a2c3ea8fa Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-27 16:47:58 -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
15d1a6c937 Merge https://github.com/redmatrix/hubzilla into pending_merge 2015-09-26 13:28:24 -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
Mario Vavti
451db7dd98 Merge branch 'master' of https://github.com/redmatrix/hubzilla 2015-09-25 23:26:47 +02:00
Mario Vavti
d6293730fc private mail: some work on conversations view 2015-09-25 23:26:28 +02:00
zottel
8e410f14b1 Merge remote-tracking branch 'upstream/master' 2015-09-25 22:25:35 +02:00
jeroenpraat
49000dadda Another Spanish update 2015-09-25 21:25:42 +02:00
jeroenpraat
9bde18492a As a result of the logo vote: replaced favicon, remade alternative hubzilla avatar and uploaded 6 logo variants. Originals courtesy of Iko. 2015-09-25 21:17:48 +02:00
Haakon Meland Eriksen
b22fa9f7f4 Merge remote-tracking branch 'upstream/master' 2015-09-25 17:52:58 +02:00
zottel
a7b2d23e9b Merge remote-tracking branch 'upstream/master' 2015-09-25 11:19:42 +02:00
redmatrix
ba94f824b9 deliveries per process ui for setting 2015-09-25 01:31:58 -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
e558ddae3f clean up the delivery reports to make them manageable, more approachable, and translateable 2015-09-24 18:19:33 -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
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