Commit graph

2612 commits

Author SHA1 Message Date
zotlabs
9bbaa17b80 Merge branch 'dev' 2018-09-17 23:41:27 -07:00
zotlabs
0709d0f08e Merge branch 'zap' into dev 2018-09-17 23:41:03 -07:00
zotlabs
ab3d3b029e Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-17 23:40:45 -07:00
zotlabs
9f14cd4b3c missing connect link if no xchan_addr 2018-09-17 23:40:17 -07:00
zotlabs
0b71807ffe don't deliver to non-deliverable hosts 2018-09-17 23:38:50 -07:00
zotlabs
f2d3fd0f1a Merge branch 'zap' into dev 2018-09-17 22:53:51 -07:00
zotlabs
f6c5e9e610 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-17 22:53:38 -07:00
zotlabs
f2c99480f0 generate better photo and event activities 2018-09-17 22:51:27 -07:00
zotlabs
f0b6952585 generate full actor record on follow json 2018-09-17 22:50:06 -07:00
zotlabs
390a570b51 Merge branch 'zap' into dev 2018-09-17 13:00:40 -07:00
zotlabs
926c63ee84 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-17 13:00:02 -07:00
zotlabs
01d38494d9 fix install check 2018-09-17 12:58:05 -07:00
zotlabs
30154b0f0b Merge branch 'zap' into dev 2018-09-16 22:07:35 -07:00
zotlabs
ea2db5d7aa Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-16 22:07:18 -07:00
zotlabs
cf64349379 usort : use class function 2018-09-16 22:04:11 -07:00
zotlabs
0eb1752ed5 duplicate 2018-09-16 21:45:44 -07:00
zotlabs
f0266b4837 Merge branch 'zap' into dev 2018-09-16 21:43:20 -07:00
zotlabs
8d565a8305 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-16 21:43:06 -07:00
zotlabs
943edb4c14 simplify AP discovery 2018-09-16 21:42:41 -07:00
zotlabs
0aaaa882ad simplify activitypub discovery 2018-09-16 21:41:24 -07:00
zotlabs
c3a74b3ece setup and channel sync fixes from upstream 2018-09-16 20:01:53 -07:00
zotlabs
a8f4091551 Merge branch 'zap' into dev 2018-09-16 18:42:07 -07:00
zotlabs
ee8cdafd92 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-16 18:41:56 -07:00
zotlabs
29f4230474 resolve naming dispute over network app 2018-09-16 18:35:43 -07:00
zotlabs
3c3f395d24 Merge branch 'zap' into dev 2018-09-16 17:06:34 -07:00
zotlabs
72f098e1c0 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-16 17:05:54 -07:00
zotlabs
1856d39237 correct owner attribution 2018-09-16 17:05:39 -07:00
zotlabs
ca752cfb1f Merge branch 'zap' into dev 2018-09-14 14:38:23 -07:00
zotlabs
d725f9d97f Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-14 14:38:10 -07:00
zotlabs
3bc079e69e zap issue #3 cannot post to public forum using tag mentions 2018-09-14 14:33:39 -07:00
zotlabs
3bd1df52bf Merge branch 'zap' into dev 2018-09-14 02:19:23 -07:00
zotlabs
097a0e5adc Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-14 02:19:05 -07:00
zotlabs
8505ae4ab2 zot6 import authors in hyperdrive mode 2018-09-14 02:18:07 -07:00
zotlabs
c16fa755a8 Merge branch 'zap' into dev 2018-09-13 22:40:23 -07:00
zotlabs
4b7770f28c Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-13 22:40:11 -07:00
zotlabs
048c5f65e2 old protocol string still showing 2018-09-13 22:39:05 -07:00
zotlabs
26e419e032 hardwire group widget = enabled 2018-09-13 21:25:37 -07:00
zotlabs
2b39a93e0f Merge branch 'zap' into dev 2018-09-13 18:44:24 -07:00
zotlabs
980ccf0876 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-13 18:44:05 -07:00
zotlabs
767d1f9889 missing call to actor_store 2018-09-13 18:42:29 -07:00
zotlabs
5cee677014 Merge branch 'zap' into dev 2018-09-13 18:23:00 -07:00
zotlabs
71cc526f7d Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-13 18:22:43 -07:00
zotlabs
abeb19416e chanview not redirecting properly for z6 2018-09-13 18:19:54 -07:00
zotlabs
1d9c5eb821 Merge branch 'zap' into dev 2018-09-11 22:23:48 -07:00
zotlabs
3fdb9f3cfd Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-11 22:23:32 -07:00
zotlabs
73ae895e5c abook sync issue 2018-09-11 22:21:31 -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
66cd2dc7e4 cleanup 2018-09-11 16:58:26 -07:00