Commit graph

22397 commits

Author SHA1 Message Date
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
a3e3c93902 consistency 2018-09-16 01:17:25 -07:00
zotlabs
c57e8519dc Merge branch 'zap' into dev 2018-09-15 16:44:27 -07:00
zotlabs
ac0020979c Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-15 16:44:06 -07:00
zotlabs
cebfeabc41 logic issue 2018-09-15 16:43:44 -07:00
zotlabs
df7605435f Merge branch 'zap' into dev 2018-09-15 16:21:00 -07:00
zotlabs
34e8a36019 Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-15 16:14:52 -07:00
zotlabs
f58c244ba0 refactor include/follow 2018-09-15 16:13:44 -07:00
zotlabs
d67d26564d bookmark links are deprecated in zap 2018-09-14 16:49:08 -07:00
zotlabs
291f493457 update install guide 2018-09-14 15:23:36 -07:00
zotlabs
cfbb7960c7 revert change to std_version after merging from master 2018-09-14 14:48:29 -07:00
zotlabs
8dd9028654 Merge branch 'master' of https://framagit.org/macgirvin/osada into dev 2018-09-14 14:47:57 -07:00
Mike Macgirvin
771faa04ad Merge branch 'fix-install-from-url' into 'master'
Fix Framagit URLs in INSTALL.txt

See merge request macgirvin/osada!1
2018-09-14 23:45:49 +02:00
M. Dent
cdd7d75459 Update INSTALL.txt 2018-09-14 23:39:19 +02:00
zotlabs
f08195687b Merge branch 'zap' 2018-09-14 14:38:50 -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
aa161b3ebf Merge branch 'dev' 2018-09-14 02:19:57 -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
874f316116 Merge branch 'dev' 2018-09-13 22:40:48 -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
cbef061158 Merge commit 'decf21c' 2018-09-13 20:36:32 -07:00
zotlabs
55d4973439 Merge commit 'decf21c' into dev 2018-09-13 20:36:13 -07:00
zotlabs
b253aa9f9c Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-13 20:35:54 -07:00
zotlabs
decf21c78b add privacy groups link 2018-09-13 20:32:44 -07:00
zotlabs
1b8f8e60ec missing call to actor_store 2018-09-13 18:45:10 -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
b38e52cc23 chanview not redirecting properly for z6 2018-09-13 18:23:53 -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
50f93e848d Merge branch 'master' of https://framagit.org/macgirvin/osada 2018-09-12 22:34:25 -07:00
zotlabs
96b713eb26 version 2018-09-12 22:33:17 -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
363aba90fb Merge branch 'zap' into dev 2018-09-11 18:03:38 -07:00