Commit graph

14581 commits

Author SHA1 Message Date
redmatrix
4b7c052ed8 undo self deliver check 2015-09-30 12:59:13 -07:00
zzottel
ccd13dd643 Merge pull request #62 from zzottel/master
update German strings
2015-09-30 14:03:12 +02:00
zottel
d66715648a update German strings 2015-09-30 14:01:21 +02:00
zottel
0d60789f69 Merge remote-tracking branch 'upstream/master' 2015-09-30 08:45:13 +02: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
jeroenpraat
34f52e47eb Hooray! Dutch language complete again. 2015-09-29 22:22:02 +02:00
zottel
f950d27b3d Merge remote-tracking branch 'upstream/master' 2015-09-29 12:40:24 +02: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
b3525b8657 remove debugging 2015-09-28 20:04:44 -07: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
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
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