Commit graph

23296 commits

Author SHA1 Message Date
zotlabs
fa9bef00fe remove pixelate - it doesn't really work for what we need 2019-07-31 21:49:04 -07:00
zotlabs
57a2fe9dd6 fix image censoring 2019-07-31 21:46:19 -07:00
zotlabs
0de97b2fc0 revert image pixelation, but provide a framework for re-implementing it in the future 2019-07-31 18:15:38 -07:00
zotlabs
5aea720a71 file ignored 2019-07-31 16:53:56 -07:00
zotlabs
e163ece9e0 add 'safe mode' over-ride to connection image pixelation 2019-07-30 22:37:55 -07:00
zotlabs
717587762b Revert "pixelate: respond to touch events"
This reverts commit 52502148ca.
2019-07-30 21:36:06 -07:00
zotlabs
52502148ca pixelate: respond to touch events 2019-07-30 19:15:43 -07:00
zotlabs
3bc243ea46 image censoring per connection 2019-07-30 17:56:35 -07:00
Zot
7a068d29d0 Merge branch 'fix-engr-units' into 'dev'
Fix missing engr_units_to_bytes

See merge request zot/zap!6
2019-07-30 05:45:37 +02:00
zotlabs
4e87935fda affinity tool -> friend zoom; alter xchan_query to return results in hubloc_primary desc order; as hublocs have been seen in the wild with no primary 2019-07-29 19:33:36 -07:00
DM42.Net Zap Dev
dd24484383 Fix missing engr_units_to_bytes 2019-07-29 21:32:57 -04:00
zotlabs
c741420bb8 update readme 2019-07-29 16:03:00 -07:00
zotlabs
ea13cb2dcf fix imported taxonomy 2019-07-28 20:19:16 -07:00
zotlabs
75d3914223 misc fixes 2019-07-28 19:34:42 -07:00
zotlabs
2bcb3e662e use forkawesome from composer 2019-07-25 21:13:42 -07:00
zotlabs
b082bc8932 Merge branch 'dev' of https://framagit.org/zot/zap into dev 2019-07-25 21:10:35 -07:00
Mike Macgirvin
fe047c2ba5 use fork-awesome via composer 2019-07-26 14:08:48 +10:00
zotlabs
6e7d144789 bug fixes 2019-07-25 18:48:35 -07:00
zotlabs
d8ce899bb9 cleanup 2019-07-25 17:12:48 -07:00
zotlabs
0bec651416 rev 2019-07-22 18:39:51 -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
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
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