zotlabs
|
bd079166d7
|
Merge branch 'master' into zapp
|
2018-04-23 18:22:44 -07:00 |
|
zotlabs
|
5ed994ded3
|
convert keys on discovery
|
2018-04-23 18:21:50 -07:00 |
|
zotlabs
|
59ac3d04eb
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-04-23 18:15:18 -07:00 |
|
zotlabs
|
97308ad2fb
|
provide a short term compatibility mapping between social_party and social_federation
|
2018-04-23 16:05:55 -07:00 |
|
Mario Vavti
|
2dff10564c
|
possible fix for issue #1101
|
2018-04-23 21:13:09 +02:00 |
|
Mario Vavti
|
9ac67b44e4
|
strings update
|
2018-04-23 11:37:39 +02:00 |
|
Mario Vavti
|
bc4a1ee500
|
reverse f325c29b48 - this needs discussion. there is a link to source in the item menu. we might consider linking the timestamp to the source item (like some of the federated networks do) but then remove it from the item dropdown (having things double proved to confuse people). imo the link in the dropdown menu should be sufficient though.
|
2018-04-23 11:24:13 +02:00 |
|
git-marijus
|
78816f2f74
|
Merge pull request #1094 from mrjive/dev
Adding link to post source
|
2018-04-23 11:11:16 +02:00 |
|
Mario Vavti
|
fedb5fbcf5
|
update zot.php to fix php warning invalid argument supplied for foreach()
- this is taken from pr #1085 which was against wrong branch
|
2018-04-23 10:47:35 +02:00 |
|
Mario Vavti
|
bb61e672b0
|
Proposed fix for issue #1091 - mod-help.css
- this is taken from pr #1098 which was against wrong branch
|
2018-04-23 10:39:46 +02:00 |
|
git-marijus
|
de6f07ec89
|
Merge pull request #1097 from galettesaucisse/patch-13
Proposed fix for issue #1091 - mod-help.js
|
2018-04-23 10:28:50 +02:00 |
|
git-marijus
|
d0dc8c1e4c
|
Merge pull request #1093 from mjfriaza/dev
Updated Spanish translation
|
2018-04-23 10:28:09 +02:00 |
|
git-marijus
|
5ec2e28802
|
Merge pull request #1090 from galettesaucisse/patch-12
Create /doc/fr/toc.html
|
2018-04-23 10:27:50 +02:00 |
|
git-marijus
|
391020fd1b
|
Merge pull request #1089 from galettesaucisse/patch-11
delete /doc/fr/about.bb
|
2018-04-23 10:27:31 +02:00 |
|
git-marijus
|
e46874149d
|
Merge pull request #1088 from galettesaucisse/patch-10
create new file /doc/fr/about/about.bb
|
2018-04-23 10:27:04 +02:00 |
|
git-marijus
|
7f49f6a45c
|
Merge pull request #1084 from galettesaucisse/patch-9
Update French hmessages.po from Transifex
|
2018-04-23 10:26:42 +02:00 |
|
git-marijus
|
901b0ac146
|
Merge pull request #1083 from galettesaucisse/patch-8
Update French hstrings.php from Transifex
|
2018-04-23 10:26:12 +02:00 |
|
Mario Vavti
|
28bc4089d0
|
fix permission role test
|
2018-04-23 10:03:39 +02:00 |
|
Mario Vavti
|
2bca612a92
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
|
2018-04-23 09:49:47 +02:00 |
|
zotlabs
|
2e43a93e93
|
more z6 basics
|
2018-04-22 23:48:49 -07:00 |
|
zotlabs
|
f6751ef402
|
more fine tuning of the zotinfo packet
|
2018-04-22 23:10:36 -07:00 |
|
zotlabs
|
c5fde34192
|
start to implement the zotinfo detail for zot6
|
2018-04-22 22:58:28 -07:00 |
|
zotlabs
|
66d72d9870
|
as_fetch depends on the pubcrawl plugin, but is referenced in core. Ensure that it doesn't chuck a wobbly if the function isn't found. This is undergoing significant revision for zot6 so this action is considered a short-term workaround until that work work stabilises.
|
2018-04-22 22:10:15 -07:00 |
|
zotlabs
|
b1690a93d2
|
site discovery
|
2018-04-22 21:30:14 -07:00 |
|
zotlabs
|
b794be3902
|
Merge branch 'master' into denim
|
2018-04-22 19:51:08 -07:00 |
|
zotlabs
|
5eff476469
|
verify the sig
|
2018-04-22 19:49:26 -07:00 |
|
zotlabs
|
11624cd83e
|
owa: attempt channel discovery if not found
|
2018-04-22 19:24:15 -07:00 |
|
zotlabs
|
a4146de34a
|
Merge branch 'master' into denim
|
2018-04-22 18:53:05 -07:00 |
|
zotlabs
|
83856293a0
|
z6 work
|
2018-04-22 18:51:46 -07:00 |
|
zotlabs
|
55b7182136
|
use consistent naming for 'Channel role and privacy'
|
2018-04-22 18:48:48 -07:00 |
|
zotlabs
|
55dc6fbc1c
|
imagemagick preserves exif when scaling. GD does not. We do not want to preserve exif on thumbnails which we have rotated, as a browser reading the exif information could rotate them yet again. This checkin adds an abstract function to the generic photo driver which makes the behaviour consistent by stripping EXIF from imagick processed images. However, we will attempt to preserve any ICC colour profiles. See http://php.net/manual/en/imagick.stripimage.php
|
2018-04-22 18:12:16 -07:00 |
|
zotlabs
|
9ecb2d68d6
|
prepare webfinger for z6
|
2018-04-22 16:54:13 -07:00 |
|
Jeroen
|
c446ffb814
|
back to only nickname
|
2018-04-22 20:16:04 +02:00 |
|
mrjive
|
51c533536f
|
Merge pull request #10 from redmatrix/dev
Dev
|
2018-04-22 10:54:41 +02:00 |
|
Mike Macgirvin
|
5a736d338b
|
Merge pull request #1099 from zotlabs/dev
This is important
|
2018-04-21 19:09:27 +10:00 |
|
zotlabs
|
95059f2bfd
|
fix permissionlimitstest after recent changes
|
2018-04-21 00:37:04 -07:00 |
|
zotlabs
|
1bb67f63e3
|
anonymous comments shouldn't be allowed in StdLimits
|
2018-04-20 18:58:21 -07:00 |
|
zotlabs
|
b12d254427
|
fix any misconfigured channel permission limits
|
2018-04-20 18:58:21 -07:00 |
|
zotlabs
|
af909f66a7
|
fix any misconfigured channel permission limits
|
2018-04-20 15:03:16 -07:00 |
|
zotlabs
|
e05f41630b
|
anonymous comments shouldn't be allowed in StdLimits
|
2018-04-20 14:38:15 -07:00 |
|
Galette Saucisse
|
ba8f8c3403
|
Proposed fix for issue #1091
|
2018-04-20 19:17:52 +02:00 |
|
mrjive
|
84e2bdcf76
|
updated Italian translation
|
2018-04-20 06:25:40 -07:00 |
|
Manuel Jiménez Friaza
|
a211c16b73
|
Updated Spanish translation
|
2018-04-20 11:36:13 +02:00 |
|
mrjive
|
f325c29b48
|
adding link to post source
|
2018-04-20 02:29:57 -07:00 |
|
zotlabs
|
d5c451c4a8
|
This fix needs to go deeper in the code. PermissionLimits::Get is called in a lot of places. If we have no stored setting for a particular permission, return 0 - which is basically no permission except to self.
|
2018-04-19 23:44:22 -07:00 |
|
zotlabs
|
8d0cbeab38
|
better fix to permisisons.php - just cast to int. That's exactly what we want.
|
2018-04-19 23:37:47 -07:00 |
|
zotlabs
|
636fb95e24
|
permissions php error applying bit compare operation on a (presumed) boolean
|
2018-04-19 23:35:24 -07:00 |
|
zotlabs
|
2f1ad15645
|
fix navbar contact autocomplete 'undefined' hovertip
|
2018-04-19 22:19:52 -07:00 |
|
zotlabs
|
b1ed79f239
|
fix link to renamed permission roles doc subsection
|
2018-04-19 19:32:48 -07:00 |
|
zotlabs
|
aea61bf034
|
rename social - party to social - federation. Cleanup some of the documentation surrounding channels. This checkin contains translatable string changes.
|
2018-04-19 19:05:13 -07:00 |
|