Commit graph

7689 commits

Author SHA1 Message Date
zotlabs
363aba90fb Merge branch 'zap' into dev 2018-09-11 18:03:38 -07:00
zotlabs
8500c2fb21 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-11 18:03:16 -07:00
zotlabs
acec460c1c remove linkid for the time being 2018-09-11 18:02:25 -07:00
zotlabs
fda9a36505 Merge branch 'zap' into dev 2018-09-11 17:41:22 -07:00
zotlabs
eb3a5349db Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-11 17:37:54 -07:00
zotlabs
f9b344ac4d runtime errors 2018-09-11 17:35:31 -07:00
zotlabs
67ae00ae2f it's alive 2018-09-11 03:36:31 -07:00
zotlabs
44df4d785e Merge branch 'zap' into dev 2018-09-09 23:23:42 -07:00
zotlabs
ddb50b8de4 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-09 23:17:23 -07:00
zotlabs
44af74af3b tweaks 2018-09-09 23:16:58 -07:00
zotlabs
c4dc8b9cca hyperdrive stuff 2018-09-09 23:15:59 -07:00
zotlabs
b837f0b8fc Merge branch 'red' into dev 2018-09-09 20:59:13 -07:00
zotlabs
be3b630474 important hyperdrive component 2018-09-09 20:53:20 -07:00
zotlabs
e1b0570690 assorted fixes 2018-09-09 18:28:13 -07:00
zotlabs
017f1a3c79 optimise 2018-09-06 21:27:09 -07:00
zotlabs
667f8ed920 delivery optimisations 2018-09-06 21:24:56 -07:00
zotlabs
75ecacd88c use uuid4 2018-09-06 20:21:52 -07:00
zotlabs
176fd2339d use uuid4, not uuid5 2018-09-06 20:19:44 -07:00
zotlabs
4005c484c1 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-06 17:42:01 -07:00
zotlabs
3ff96239f6 typo 2018-09-06 17:00:42 -07:00
zotlabs
2640c49c0e add federated forum role 2018-09-05 23:13:55 -07:00
zotlabs
b38625aef6 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into dev 2018-09-05 21:23:49 -07:00
zotlabs
44ca674937 Merge branch 'red' into dev 2018-09-05 21:18:14 -07:00
zotlabs
c5bc4fe245 Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge 2018-09-05 21:02:06 -07:00
zotlabs
bc4a92b702 detect and automatically repair duplicate plugin hook scenarios. 2018-09-05 19:43:07 -07:00
zotlabs
efab473ee2 add comment_policy 2018-09-05 16:30:46 -07:00
zotlabs
46c3a2f196 Merge branch 'zap' 2018-09-04 23:44:56 -07:00
zotlabs
cd429d343e Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-04 23:44:43 -07:00
zotlabs
ccf0df2602 set the default profile photo before fetching one, in case the process gets killed. 2018-09-04 23:42:06 -07:00
zotlabs
8c75aa8dc4 Merge branch 'zap' 2018-09-04 21:00:13 -07:00
zotlabs
9f54a2ab16 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-04 20:59:58 -07:00
zotlabs
7354b30068 convert message-id to uuid 2018-09-04 20:59:11 -07:00
zotlabs
d155ded7c3 Merge branch 'zap' 2018-09-04 19:16:42 -07:00
zotlabs
c201a13269 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-04 19:16:31 -07:00
zotlabs
2b472cf7eb reshare theme changes 2018-09-04 19:15:13 -07: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
Mario
1b7781a159 Merge branch 'add-delivery-status-info' into 'dev'
Fix: Authors unable to comment on posts they authored when under owned by others…

See merge request hubzilla/core!1268
2018-09-02 09:17:29 +02:00
zotlabs
9b2ae5396e Merge branch 'zap' 2018-09-01 15:56:15 -07:00
zotlabs
b3ef8d355a Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-01 15:53:09 -07:00
zotlabs
0954afb321 compatibility fixes 2018-09-01 15:51:44 -07: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
zotlabs
c13c713e19 follow issue 2018-08-30 22:30:58 -07:00
zotlabs
9282a6a40b Merge branch 'zap' 2018-08-30 21:30:46 -07:00
zotlabs
fc6f5fc320 Merge branch 'master' of /home/macgirvin/zap.macgirvin.com into zap 2018-08-30 21:29:21 -07:00
zotlabs
d00648f3e1 Merge branch 'red' 2018-08-30 21:27:20 -07:00
Mario
c5ce9b0699 Merge branch 'call-hooks-optimization' into 'dev'
Micro-optimization to call_hooks()

See merge request hubzilla/core!1267
2018-08-30 10:09:00 +02:00
Mario
c74a7ce4fc Merge branch 'add-delivery-status-info' into 'dev'
Add dreport_process hook

See merge request hubzilla/core!1266
2018-08-30 10:07:18 +02:00
zotlabs
c48aae55af more debugging 2018-08-29 22:22:06 -07:00
zotlabs
89d1be0343 better format of like/dislike text, grab object['id'] if inreplyto missing for these activities 2018-08-29 20:02:27 -07:00