Commit graph

23738 commits

Author SHA1 Message Date
zotlabs
afdea01517 Merge branch 'dev' 2019-07-22 18:39:16 -07:00
zotlabs
e288e0f35a updates 2019-07-22 18:38:22 -07:00
zotlabs
ba967609c2 Merge branch 'dev' of https://framagit.org/zot/zap into dev 2019-07-22 16:02:04 -07:00
Zot
6b5a3f4e74 Merge branch 'consolidate-rolesettings' into 'dev'
Consolidate role settings

See merge request zot/zap!5
2019-07-22 22:45:52 +02:00
zotlabs
c1fa3fd625 hyperdrive now defaults to off. 2019-07-21 19:24:14 -07:00
zotlabs
27c71dcaa5 cleanup 2019-07-18 20:38:36 -07:00
DM42.Net (Matt Dent)
07f86afa43 Consolidate role settings 2019-07-12 11:52:04 -04:00
zotlabs
c660c77ff6 allow the comment permission limit to be changed at will - no matter what permission role is in play. 2019-07-11 22:54:35 -07:00
zotlabs
cf040dea61 misc fixes 2019-07-11 22:03:17 -07:00
zotlabs
b170e01fa5 cleanup 2019-07-10 18:43:20 -07:00
zotlabs
e523f5eab7 cleanup 2019-07-07 23:35:24 -07:00
zotlabs
7341f0a7fa Merge branch 'dev' of https://framagit.org/zot/zap into dev 2019-07-07 22:41:40 -07:00
Zot
fe2e5600f6 Merge branch 'fix-shortprofile' into 'dev'
Fix widget to use new Libprofile

See merge request zot/zap!4
2019-07-08 07:39:43 +02:00
zotlabs
39668e2752 comment threading 2019-07-07 20:11:37 -07:00
zotlabs
27a03a3a5c misc experimental things (wip) 2019-07-07 16:32:48 -07:00
Mike Macgirvin
a106b58a9d add some larger providers 2019-07-08 09:29:16 +10:00
Mike Macgirvin
51033a406a add oauth2-client via composer 2019-07-08 09:18:20 +10:00
FreeToBe.Social Developer
5e6de8578e Fix widget to use new Libprofile 2019-07-06 11:44:39 -04:00
zotlabs
7e8411c742 more app work 2019-06-30 23:36:03 -07:00
zotlabs
2925aad846 add missing module 2019-06-30 20:11:48 -07:00
zotlabs
6b1f5503a3 add photomap app 2019-06-30 20:11:08 -07:00
zotlabs
18dc941526 directory issue 2019-06-30 19:10:12 -07:00
zotlabs
1933d0f3dd turn tasks into an app 2019-06-29 19:23:31 -07:00
zotlabs
a2a7a22c38 better handling of channel meta 2019-06-29 17:54:48 -07:00
zotlabs
df18f57217 add opengraph meta info to channel page 2019-06-29 16:37:30 -07:00
Zot
57cdc43161 Revert "extend direct message definition to anything with allow_cid but *not* allow_gid"
This reverts commit db2d67de7e
2019-06-28 13:26:01 +02:00
Manuel Jiménez Friaza
8429aa37c7 First Spanish translation
(cherry picked from commit 40b33ed8f6)
2019-06-28 04:22:28 -07:00
zotlabs
db2d67de7e extend direct message definition to anything with allow_cid but *not* allow_gid 2019-06-28 04:04:03 -07:00
Zot
876500c0a2 Merge branch 'es-es' into 'dev'
First Spanish translation

See merge request zot/zap!3
2019-06-28 09:08:05 +02:00
zotlabs
969b8e17a1 extend direct message definition to anything with allow_cid but *not* allow_gid 2019-06-27 18:39:08 -07:00
zotlabs
5f1da81082 Support both zot and zot6 in social graph operations (common friends, suggestions). 2019-06-27 17:02:58 -07:00
Manuel Jiménez Friaza
b57e9463b9 Merge branch 'cherry-pick-40b33ed8' into 'es-es'
First Spanish translation

See merge request mjfriaza/zap!1
2019-06-27 12:58:50 +02:00
Manuel Jiménez Friaza
6fb81b84eb First Spanish translation
(cherry picked from commit 40b33ed8f6)
2019-06-27 12:57:48 +02:00
Manuel Jiménez Friaza
40b33ed8f6 First Spanish translation 2019-06-27 12:54:06 +02:00
zotlabs
0ced43b90d make notes widget fixed height because it still doesn't play well with stickykit and I've wasted too much time trying to bludgeon it into submission. 2019-06-25 16:13:06 -07:00
zotlabs
9a907fe262 make notes widget fixed height because it still doesn't play well with stickykit and I've wasted too much time trying to bludgeon it into submission. 2019-06-25 16:11:22 -07:00
zotlabs
11398d0da7 photos widget issue 2019-06-24 19:00:00 -07:00
zotlabs
8553af4d41 photos widget issue 2019-06-24 18:59:27 -07:00
zotlabs
f1a65bb1c3 strings 2019-06-24 18:46:07 -07:00
zotlabs
c410602c91 rev update 2019-06-24 18:00:22 -07:00
zotlabs
483e41e420 rev update 2019-06-24 17:53:47 -07:00
zotlabs
d229f1b02d Merge branch 'dev' 2019-06-24 17:53:21 -07:00
zotlabs
8cc49657f9 tasks and notes 2019-06-24 17:35:12 -07:00
zotlabs
17599db5c9 cleanup - filter "unsafe" entries from driectory tag cloud 2019-06-20 23:17:04 -07:00
Manuel Jiménez Friaza
5e55d18a67 Merge branch 'dev' of https://framagit.org/zot/zap into dev 2019-06-19 12:22:17 +02:00
zotlabs
5e189cb14e some early dev work for dm support 2019-06-18 19:21:31 -07:00
Mike Macgirvin
1d16263ece composer update 2019-06-18 13:01:39 +10:00
zotlabs
19c60b4d3d cleanup last commit 2019-06-17 19:10:30 -07:00
zotlabs
7d768df7a6 disable hyperdrive over activitypub - that is a legacy remnant of the Osada ActivityPub server and not needed or desired here 2019-06-17 19:04:06 -07:00
zotlabs
f829665047 minor compatibility issue with hyperdrive and traditional zot sources 2019-06-17 18:32:08 -07:00