Commit graph

22569 commits

Author SHA1 Message Date
zotlabs
097a0e5adc Merge branch 'dev' of /home/macgirvin/zap.macgirvin.com into zap 2018-09-14 02:19:05 -07:00
zotlabs
2542617471 zot6 import authors in hyperdrive mode 2018-09-14 02:18:17 -07:00
zotlabs
8505ae4ab2 zot6 import authors in hyperdrive mode 2018-09-14 02:18:07 -07:00
zotlabs
273a9b12f0 zot6 import authors in hyperdrive mode 2018-09-14 02:16:42 -07:00
Mario
ab611e9ef3 Merge branch 'patch-2' into 'dev'
php2po.php unify quote/unquote

See merge request hubzilla/core!1272
2018-09-14 10:48:03 +02: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
f2c7e7bb01 Merge branch 'dev' 2018-09-13 22:39:44 -07:00
zotlabs
edcfc6ef60 Merge branch 'dev' into 1.0 2018-09-13 22:39:31 -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
0b2f7f08c8 Merge commit 'decf21c' into 1.0 2018-09-13 20:34:26 -07:00
zotlabs
abbd2a9c52 Merge commit 'decf21c' 2018-09-13 20:33:39 -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
57d7c81c31 missing call to actor_store 2018-09-13 18:43:23 -07:00
zotlabs
8f6fd36df3 missing call to actor_store 2018-09-13 18:43:07 -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
9febf8643e chanview not redirecting properly for z6 2018-09-13 18:20:59 -07:00
zotlabs
b8ed6547cf chanview not redirecting properly for z6 2018-09-13 18:20:51 -07:00
zotlabs
abeb19416e chanview not redirecting properly for z6 2018-09-13 18:19:54 -07:00
Max Kostikov
240d4704aa php2po.php unify quote/unquote 2018-09-13 21:28:15 +02:00
Mario Vavti
f9d43479f2 css issues 2018-09-13 15:14:46 +02:00
Mario Vavti
c2f6f87cae add activity_filter and activity_order .bb files 2018-09-13 11:55:37 +02:00
Mario Vavti
869534fafa remove network_tabs() which has been deprecated and replaced by activity_{order, filters} widgets 2018-09-13 11:53:59 +02:00
Mario Vavti
56f88f2e30 move chat from feature to apps 2018-09-13 11:32:43 +02:00
Mario Vavti
a1d5ce3716 remove profile_tabs() which has been deprecated and replaced by channel_apps() 2018-09-13 10:59:37 +02: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
4a8de535e2 Merge branch 'master' of https://framagit.org/macgirvin/zap 2018-09-12 22:29:29 -07:00
zotlabs
3bf479ac68 version 2018-09-12 22:21:43 -07:00
Mario
78dc679a72 Merge branch 'patch-1' into 'dev'
z_fetch_url with case insensitive headers

See merge request hubzilla/core!1271
2018-09-12 21:11:47 +02:00
Mario Vavti
57e3ee47ee more feature to app transition 2018-09-12 20:52:55 +02:00
Mario Vavti
184928204a Fix PHP Warning: DOMDocument::loadHTML(): htmlParseEntityRef: no name in Entity 2018-09-12 11:14:49 +02:00
Mario Vavti
2651eae663 mpre feature to app transition 2018-09-12 11:08:53 +02: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
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