Commit graph

2688 commits

Author SHA1 Message Date
zotlabs
0460814158 channel signing issue 2018-09-25 20:41:06 -07:00
zotlabs
290b8b58ec rename groups and group_members tables 2018-09-25 17:50:59 -07:00
zotlabs
6f6d54d378 cleanup 2018-09-25 17:50:12 -07:00
zotlabs
cd8150f20d push version 2018-09-23 18:23:28 -07:00
zotlabs
f1ed64efe4 fixes 2018-09-23 17:03:10 -07:00
zotlabs
54bfc4a88d delivery issues 2018-09-21 16:29:13 -07:00
zotlabs
382551e4b4 strip bbcode from event titles 2018-09-20 22:50:12 -07:00
zotlabs
6221d2b1bb php warning 2018-09-20 17:17:41 -07:00
zotlabs
1a3d9ca91b better handling of masto approve 2018-09-19 23:53:26 -07:00
zotlabs
d69b88e793 Merge branch 'zap' into dev 2018-09-19 22:50:47 -07:00
zotlabs
8b123f57ad Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 22:47:25 -07:00
zotlabs
e76d2201bf better handling of media objects 2018-09-19 22:47:03 -07:00
zotlabs
7d8cbb01bb Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 22:01:11 -07:00
zotlabs
8e4f5007b4 button to add conversation mentions in comments 2018-09-19 22:00:29 -07:00
zotlabs
3b688d678e typo 2018-09-19 21:42:54 -07:00
zotlabs
551314201c Merge branch 'zap' into dev 2018-09-19 20:48:14 -07:00
zotlabs
202c96eb77 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 20:48:00 -07:00
zotlabs
14ad70c587 thread author mentioning (begin) 2018-09-19 20:47:31 -07:00
Mike Macgirvin
529171de8f Merge branch 'dev' of https://framagit.org/macgirvin/zap into dev 2018-09-20 12:36:29 +10:00
zotlabs
92b2d17297 Merge branch 'zap' into dev 2018-09-19 17:55:15 -07:00
zotlabs
b95f41571c Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 17:54:07 -07:00
zotlabs
45ece3c6c5 item fix 2018-09-19 17:53:49 -07:00
zotlabs
e98ca4af20 fix item, setup 2018-09-19 17:52:21 -07:00
zotlabs
9725e55eb9 Merge branch 'dev' 2018-09-19 16:29:29 -07:00
zotlabs
0bc76e85e4 Merge branch 'zap' into dev 2018-09-19 16:26:36 -07:00
zotlabs
fd0de5fc12 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-19 16:26:05 -07:00
zotlabs
c0f8940b60 indicate cached records 2018-09-19 16:25:05 -07:00
zotlabs
d3b28b718c Merge branch 'red' into dev 2018-09-18 20:51:38 -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
6667554916 missing connect link if no xchan_addr 2018-09-17 23:34:33 -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
b16e5716b7 Merge branch '1.0' 2018-09-17 22:53:19 -07:00
zotlabs
5c21236dc1 Merge branch 'dev' into 1.0 2018-09-17 22:53:04 -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
dfdf11d461 Merge branch 'dev' 2018-09-17 19:38:40 -07:00
zotlabs
cc5ef57843 fix listeners table create and expire federation had a syntax error 2018-09-17 18:40:49 -07:00
zotlabs
fdc89d1b89 pdo install check requires namespacing 2018-09-17 13:03:17 -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
79af06d6e1 Merge branch 'dev' 2018-09-17 12:58:54 -07:00
zotlabs
fcc7358a44 Merge branch 'dev' into 1.0 2018-09-17 12:58:41 -07:00
zotlabs
01d38494d9 fix install check 2018-09-17 12:58:05 -07:00
Mario Vavti
1455fa6bc3 Merge branch 'dev' of https://framagit.org/hubzilla/core into dev 2018-09-17 11:36:25 +02:00
Mario Vavti
a9853e6033 seperate settings for mod network 2018-09-17 11:36:11 +02:00
Mario
3019d8341d Merge branch 'app-list-hook' into 'dev'
Add hook to allow addons to filter the list returned by app_list

See merge request hubzilla/core!1276
2018-09-17 10:55:47 +02:00
Mario Vavti
dcacfc1124 Merge remote-tracking branch 'mike/master' into dev 2018-09-17 10:31:13 +02:00