Commit Graph

728 Commits

Author SHA1 Message Date
Mario Vavti e1c3a19420 merge include/zot.php from dev 2018-10-29 10:08:12 +01:00
Mario Vavti fa9e9510e5 Merge branch '3.8RC' 2018-10-19 11:18:28 +02:00
Max Kostikov 65785ead69 Update zot.php 2018-09-28 01:05:03 +02:00
Max Kostikov 51c0045be4 Update zot.php 2018-09-28 00:38:36 +02:00
Mario c4c1b1f5a2 Merge branch 'patch-3' into 'dev'
Save combined view while deleting or recalling first message in thread

See merge request hubzilla/core!1273
2018-09-17 13:29:52 +02:00
Max Kostikov 12b9106fc7 Update zot.php 2018-09-17 13:16:04 +02:00
zotlabs 6ab12597f5 do not sync the channel_moved field 2018-09-16 18:59:12 -07:00
Max Kostikov 034441bd13 use common msg_drop function 2018-09-15 22:32:56 +02:00
Max Kostikov 3d3f4f50fb formatting 2018-09-15 01:40:17 +02:00
Max Kostikov 8d89c4bbce Save combined view on calling first message in thread 2018-09-15 01:20:49 +02:00
M.Dent 9446e0348e Corrected resubmit of fixes to Authors unable to comment on posts they authored when owned by others. 2018-09-04 08:14:52 -04:00
Mario Vavti 41ccb61c2e Revert "Fix: Authors unable to comment on posts they authored when under owned by others in certain circumstances."
This reverts commit e2824f9259.

Reverting because it breaks forum mentions.
2018-09-03 18:14:17 +02:00
M.Dent e2824f9259 Fix: Authors unable to comment on posts they authored when under owned by others in certain circumstances. 2018-09-01 13:45:05 -04:00
M.Dent da441c59f6 Add dreport_process hook 2018-08-29 08:58:49 -04:00
zotlabs e8aeecc4c9 When checking permissions ignore checking site "Block Public" settings in cases where site permissions aren't applicable 2018-07-30 17:41:37 -07:00
Mario Vavti 1b1d11dcf1 Merge branch '3.6RC' 2018-07-25 10:19:19 +02:00
zotlabs f808a2b5a1 issue syncing pageflags 2018-07-04 19:53:51 -07:00
zotlabs 51a2e64a89 issue syncing pageflags 2018-07-04 19:51:16 -07:00
zotlabs 721496f922 hubzilla issue #1169 2018-05-10 17:11:03 -07:00
Mario Vavti be4c9a9598 Merge branch '3.4RC' 2018-05-04 09:46:27 +02:00
Mario Vavti fedb5fbcf5 update zot.php to fix php warning invalid argument supplied for foreach()
- this is taken from pr #1085 which was against wrong branch
2018-04-23 10:47:35 +02:00
zotlabs 43e55eb9a6 Active channels information is a bit imprecise. Provide a higher accuracy method. This will require a transition period 2018-04-16 21:40:43 -07:00
zotlabs f4c94ab121 use profile_store_lowlevel() when importing profile structures to ensure all non-null fields are present 2018-04-05 17:31:20 -07:00
zotlabs 034032c7c2 slight change in mail privacy implementation. If you initiate a private mail conversation and they respond, accept the reply. You can't hide behind your permissions or lack thereof. Often this will be accidental. If you truly want to block them from replying and your permissions otherwise would not allow them to reply, delete the conversation. 2018-03-22 19:52:25 -07:00
Mario 4baf5eab16 Merge branch '3.2RC' 2018-03-09 11:12:18 +01:00
zotlabs 46a4208b3d don't add pending connections to the default privacy group until accepted 2018-03-07 08:59:29 +01:00
zotlabs 0a876e1518 don't add pending connections to the default privacy group until accepted 2018-03-06 11:39:49 -08:00
Klaus Weidenbach b60098ec68 Update composer autoload cache. 2018-03-01 11:29:15 +01:00
zotlabs 56d1c08317 move dreport from zot to lib 2018-02-21 21:18:54 -08:00
zotlabs 2d69b419ff move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the z6 re-org 2018-02-21 20:59:30 -08:00
zotlabs 02575f46a6 move the zot6 delivery to zot_fetch where it makes more sense. Exhaustively hand tested. 2018-02-20 17:18:08 -08:00
zotlabs 441cdeff3f zot6 delivery cleanup 2018-02-20 16:13:43 -08:00
zotlabs b6b4827680 OAEP padding mismatch on some newer encryption methods 2018-02-19 15:44:18 -08:00
zotlabs a310cb2fbb more logging 2018-02-19 14:37:49 -08:00
zotlabs 67069beddc add logging 2018-02-19 14:27:27 -08:00
zotlabs 3dfafb710c cosmetic 2018-02-08 21:32:18 -08:00
zotlabs 9f5d44fa32 turn the logs down again 2018-02-08 16:30:44 -08:00
zotlabs cd1e5d4171 zot6 testing 2018-02-08 16:22:10 -08:00
zotlabs 635c5e532b z6 testing 2018-02-08 15:32:54 -08:00
zotlabs 6cf2e9945a encrypt the httpsig for zot6 transport 2018-02-07 21:53:47 -08:00
zotlabs b21a5c3ce9 compatibility: fallback to legacy zot if OWA succeeds but no data['msg'] is present 2018-02-07 20:17:32 -08:00
zotlabs 5057a4bd4c zot6 delivery work 2018-02-07 19:15:56 -08:00
zotlabs 3a0db39fa0 more zot6 delivery work 2018-02-07 18:38:10 -08:00
zotlabs 05de59d4ad initial z6 delivery 2018-01-16 20:08:10 -08:00
zotlabs 2de1285121 z6 deliver 2018-01-16 18:15:58 -08:00
Mario 4f4d0e416e Merge branch '3.0RC' 2018-01-09 09:00:20 +01:00
zotlabs 301e5383c7 this should finish up hubzilla issue #113 2018-01-03 12:16:05 +01:00
zotlabs ce38350e00 this should finish up hubzilla issue #113 2017-12-31 14:45:42 -08:00
zotlabs 4859e6e11a sql compliance issue 2017-12-10 19:43:54 -08:00
zotlabs fda5231a71 default profile assign 2017-11-24 14:55:39 -08:00