Commit graph

21371 commits

Author SHA1 Message Date
Mario Vavti
09666ae8e9 Merge remote-tracking branch 'mike/master' into dev 2018-04-26 09:05:47 +02:00
zotlabs
fe724acc3b mod_network: privacy group query returning results when group is empty. Notification that the group is empty was also displayed twice. 2018-04-25 22:53:20 -07:00
zotlabs
4409b2b40a don't load jot autosave content into other document types or edits of other items, but do save these edits in case you need to recover them 2018-04-25 21:32:34 -07:00
zotlabs
33f446fcd0 malformed embeds from gfycat hubzilla issue #1108 2018-04-25 20:47:30 -07:00
Mike Macgirvin
953d02e4b7
Update CHANGELOG
more than oauth2
2018-04-26 13:21:14 +10:00
zotlabs
5f8b093d79 fine tuning 2018-04-25 18:51:30 -07:00
zotlabs
f923d21df3 some tagging work 2018-04-25 18:41:19 -07:00
zotlabs
5a9e9284c2 generating random numbers too large for 32-bit systems 2018-04-25 14:10:11 -07:00
Mario Vavti
d5c3363909 bump version 2018-04-25 14:16:47 +02:00
Mario Vavti
2ede8e3675 drop box-shadow from generic-content-wrapper (it's probably too 90') and use transparent colors for borders to work better with alternate background colors 2018-04-25 14:11:41 +02:00
Mario Vavti
c0bf3c8af1 changelog 2018-04-25 12:48:08 +02:00
Mario Vavti
e9f3095f41 Merge remote-tracking branch 'mike/master' into dev 2018-04-25 11:54:13 +02:00
Mario Vavti
ddb9db188b rename boxy schema to focus-boxy and bs-default to focus-light 2018-04-25 11:31:10 +02:00
zotlabs
63e8f1f36b undo_post_tagging - don't waste a connection query if we're undoing a hashtag and not a mention. 2018-04-25 02:26:37 -07:00
Mario Vavti
a3f77409a4 mark simple_* schemas unmaintained and deprecated 2018-04-25 11:14:45 +02:00
Mario Vavti
1bb2d0b954 more css fixes for bs-default schema 2018-04-25 11:02:14 +02:00
Mario Vavti
0773b9bf92 css fixes for bs-default schema 2018-04-25 10:58:38 +02:00
git-marijus
e77914fe3f
Merge pull request #1112 from galettesaucisse/patch-16
Create /doc/fr/project.bb
2018-04-25 10:33:05 +02:00
Mario Vavti
ed785fbb1b Merge remote-tracking branch 'mike/master' into dev 2018-04-25 09:57:28 +02:00
Mario Vavti
0a51ea1bfa show caret-down on item-photo hover to indicate a dropdown menu 2018-04-25 09:56:21 +02:00
Galette Saucisse
9ffad65b65
Create /doc/fr/project.bb 2018-04-25 09:40:40 +02:00
zotlabs
8face5a66c make tag autocomplete less scary looking in the editor. If this works out we can simplify and get rid of a huge amount of spaghetti tag logic. 2018-04-24 15:32:24 -07:00
Mario Vavti
c5b32032a7 changelog 2018-04-24 22:30:17 +02:00
Mario Vavti
e11e99b2d1 fix regression with forum widget unseen count 2018-04-24 17:09:51 +02:00
Mario Vavti
2ea87b65ca fix php warnings 2018-04-24 15:41:35 +02:00
zotlabs
a6c42e8756 added variable to store the raw json string as received, since this is signed and we may need to forward the signed data. 2018-04-23 21:55:16 -07:00
zotlabs
b688dc3995 minor tweak to utf8 usernames after some testing of the underlying encode/decode funations. This probably isn't critical and I do not have a failure case but just trying to cover all bases. 2018-04-23 19:10:35 -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
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
11624cd83e owa: attempt channel discovery if not found 2018-04-22 19:24:15 -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
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