Jenkins
e8aeec4fea
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-20 19:17:20 +00:00
Eugen Rochko
ac49c7932d
Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env ( #6845 )
...
Fix #6816 , fix #6790
2018-03-20 19:41:51 +01:00
David Yip
2649cce3a0
Merge pull request #396 from ThibG/glitch-soc/fixes/compose-suggestions
...
[Glitch] Cancel outdated pending compose suggestions
2018-03-20 10:48:33 -05:00
Akihiko Odaki
61dcb686a8
Fix i18n fallback configuration conflicts with environment configurations ( #6843 )
2018-03-20 16:36:20 +01:00
Eugen Rochko
9381a7d9d5
Use username/domain to match existing accounts in ActivityPub ( #6842 )
...
See also: #6837 , #6667
2018-03-20 14:57:46 +01:00
Thibaut Girka
12b0ea0667
[Glitch] Cancel outdated pending compose suggestions
...
Port 08f49bdb0d9ea03b1290bc1b6f1beaa37a6308e2 to the glitch flavour
2018-03-20 14:20:17 +01:00
ThibG
a5c6c748e0
Cancel outdated pending compose suggestions ( #6838 )
2018-03-20 12:40:12 +01:00
Rey Tucker
36b5703796
request: in the event of failure, try other IPs ( #6761 ) ( #6813 )
...
* request: in the event of failure, try other IPs (#6761 )
In the case where a name has multiple A/AAAA records, we should
try subsequent records instead of immediately failing when we have a
failure on the first IP address.
This significantly improves delivery success when there are network
connectivity problems affecting only IPv4 or IPv6.
* fix method call style
* request_spec: adjust test case to use Addrinfo
* request: Request/open: move private addr check to within begin/rescue
* request_spec: add case to test failover, fix exception check
* Double Addrinfo.foreach so that it correctly yields instances
2018-03-20 09:06:08 +01:00
David Yip
0fa0836e63
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-03-19 15:41:59 -05:00
David Yip
c074b226b6
Merge pull request #394 from ashkitten/compressed-notifs
...
fix compressed notifications again (#393 )
2018-03-19 15:41:09 -05:00
Jenkins
df70571bfe
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-19 20:17:18 +00:00
ThibG
ff6b8a6443
Serialize mentions in the order they are added ( #6836 )
...
Up until now, the order seemed to be in the *opposite* order,
which caused the WebUI to populate mentions in reversed order
when replying to toots local to one's instance.
2018-03-19 20:19:35 +01:00
ThibG
6b76a6212d
Display content warning in mail notification emails ( #6832 )
2018-03-19 20:12:20 +01:00
Alexander
33ee347c99
rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) ( #6833 )
2018-03-19 20:09:26 +01:00
Alexander
0306e3e9be
bugfixes and gem update ( #6831 )
...
* update to new version of devise_pam_authenticatable2
* fix behaviour if suffix is nil, fix environment loading, fix user email creation
* code cleanup/fix linter warning
2018-03-19 20:08:56 +01:00
ThibG
357f9298bd
Fix e-mail changed notification ( fixes #6778 ) ( #6835 )
...
In Devise::Mailer#email_changed, the new email might be in the email attr.
See: https://github.com/plataformatec/devise/blob/master/app/views/devise/mailer/email_changed.html.erb
2018-03-19 20:07:47 +01:00
Renato "Lond" Cerqueira
f7c46fc113
Weblate translations 20180319 ( #6827 )
...
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/
* Translated using Weblate (Spanish)
Currently translated at 99.6% (579 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/
* Translated using Weblate (Japanese)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/
* Translated using Weblate (French)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (58 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/
* Translated using Weblate (Indonesian)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/
* Translated using Weblate (Indonesian)
Currently translated at 94.6% (71 of 75 strings)
Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/
* Translated using Weblate (Indonesian)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (62 of 62 strings)
Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/
* Translated using Weblate (Indonesian)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Arabic)
Currently translated at 75.5% (439 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Arabic)
Currently translated at 76.2% (443 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Russian)
Currently translated at 95.8% (557 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/
* Translated using Weblate (Finnish)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Slovak)
Currently translated at 91.7% (533 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Dutch)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/
* Translated using Weblate (Spanish)
Currently translated at 99.8% (580 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/
* Translated using Weblate (Finnish)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/
* Translated using Weblate (Slovak)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/
* Translated using Weblate (Spanish)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/
* Translated using Weblate (Swedish)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/
* Translated using Weblate (Finnish)
Currently translated at 93.1% (54 of 58 strings)
Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/
* Translated using Weblate (Arabic)
Currently translated at 76.7% (446 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/
* Translated using Weblate (Slovak)
Currently translated at 93.2% (542 of 581 strings)
Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/
* Translated using Weblate (Arabic)
Currently translated at 100.0% (280 of 280 strings)
Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/
* Normalize translations
Ran i18n-tasks normalize && yarn manage:translations
2018-03-19 15:12:06 +01:00
Eugen Rochko
74c39fada0
Bump version to 2.3.2rc3
2018-03-19 12:20:57 +01:00
Ash Lea
5b00b8f0da
fix .status__info__icons layout
2018-03-19 07:13:18 -04:00
David Yip
ab04be2f84
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
config/i18n-tasks.yml
2018-03-18 20:21:17 -05:00
David Yip
6a6f680d98
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-03-18 20:20:08 -05:00
David Yip
a387f99659
Merge pull request #388 from ThibG/glitch-soc/federated-pinned-toots
...
Port WebUI toots/with reply/media tabs and pinned toots to glitch
2018-03-18 20:17:15 -05:00
Eugen Rochko
f02411da40
Ignore media validation when attaching to status during processing ( #6822 )
...
Fix #6821
2018-03-19 01:51:19 +01:00
Eugen Rochko
a568e3ca8e
Revert #6479 , hide sensitive text/images from OpenGraph previews ( #6818 )
...
Display summary of attachments in description, and mark up content
warning if present, e.g.:
Attached: 3 images · Content warning: Dota 2
When text is not supposed to be hidden, it looks more like:
Attached: 3 images
Here is the text of the toot
With #6817 , multilinguagility should be assured...
2018-03-18 20:33:07 +01:00
Eugen Rochko
3b440bd5af
Fix elephant graphic being draggable and selectable ( #6819 )
2018-03-18 20:32:44 +01:00
Ash Levy
c68c1466ac
fix compressed notifications again ( #393 )
2018-03-18 13:42:28 -04:00
Jenkins
f2a9a13b32
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-18 16:17:15 +00:00
Eugen Rochko
39f27b6cf3
If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale ( #6817 )
...
Fix #6784
2018-03-18 16:57:04 +01:00
Akihiko Odaki
721234230c
Synchronize HTML page cache with sessions ( #6815 )
2018-03-18 15:14:38 +01:00
Jenkins
9341b982b6
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-17 17:17:21 +00:00
nightpool
566ace2d64
Add entropy to download filenames ( #6811 )
...
pretty quick fix, and with the 1 week expiration i don't think we need to be too worried about the existing files
closes #6798
2018-03-17 17:39:28 +01:00
Eugen Rochko
092f1df9d0
Bump version to 2.3.2rc2
2018-03-17 15:28:52 +01:00
Eugen Rochko
844616e950
Re-add git and nodejs-npm to Dockerfile ( #6810 )
...
Fix #6809
I don't know why, either
2018-03-17 15:28:09 +01:00
Eugen Rochko
40871caa4b
Revert "Upgrade Paperclip to version 6.0.0" ( #6807 )
...
* Revert "Bump version to 2.3.2rc1"
This reverts commit cdf8b92fea#6806 )"
This reverts commit 0074cad44f#6782 )"
This reverts commit 4a0a19fe54#6800 )"
This reverts commit 338bff8b93#6754 )"
This reverts commit b88fcd53f7
2018-03-17 14:20:35 +01:00
Eugen Rochko
cdf8b92fea
Bump version to 2.3.2rc1
2018-03-17 14:07:00 +01:00
Eugen Rochko
0074cad44f
Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 ( #6806 )
...
Fix 6734
2018-03-17 14:06:25 +01:00
Daniel Hunsaker
4a0a19fe54
Handle Mastodon::HostValidationError when pulling remoteable assets ( #6782 )
...
This will prevent, for example, `rake mastodon:redownload_avatars` from crashing when an instance is no longer responding to connection attempts, instead silently continuing as expected.
2018-03-17 13:27:50 +01:00
Akihiko Odaki
338bff8b93
Correct the reference to user's password in mastodon:add_user task ( #6800 )
2018-03-17 13:27:19 +01:00
Yamagishi Kazutoshi
b88fcd53f7
Upgrade Paperclip to version 6.0.0 ( #6754 )
2018-03-17 12:37:58 +01:00
trwnh
ca7e6a6d2e
Properly center .nothing-here ( #6787 ) ( #6788 )
...
Apply "margin: 0 auto;" at line 443 to fix issue #6787
2018-03-17 12:35:35 +01:00
Akihiko Odaki
f0cd957c7a
Cache HTML page with Service Worker ( #6802 )
...
This is the first step to make Mastodon work offline. It is also required
by Chromium to trigger Web Manifest automated install prompt.
2018-03-17 12:35:13 +01:00
Daniel Hunsaker
64fc8d2b07
[Nanobox] Stream backups to the warehouse ( #6799 )
...
The `curl` docs are terrible. Use `-X POST -T` instead of `--data-binary`, to avoid loading entire backups into memory _before_ transferring to the warehouse, and just stream the data across as it comes in.
2018-03-17 08:39:14 +01:00
David Yip
fe17446af0
Merge pull request #391 from ashkitten/compressed-notifs
...
fix non-notification boosts for compressed notifications
2018-03-16 18:15:59 -05:00
Ash Levy
33d5fe889a
fix non-notification boosts
2018-03-16 18:36:35 -04:00
Thibaut Girka
6f0e50f9a0
[Glitch] Federate pinned statuses over ActivityPub
...
Port 9110db41c5
2018-03-16 23:16:20 +01:00
Thibaut Girka
cd73af3bd0
[Glitch] Improve style of web UI account tabs
...
Port of 38b9af76a2
2018-03-16 23:16:20 +01:00
Thibaut Girka
f00af46d70
[Glitch] Add "Toots/Toots with replies/Media" tab below profile header
...
Port 5131012505
2018-03-16 23:16:20 +01:00
David Yip
50f56ba375
Merge pull request #385 from ThibG/glitch-soc/features/port-reports-ui-changes
...
Port reports ui changes to glitch-soc flavour
2018-03-16 17:13:09 -05:00
David Yip
8383f777fb
Merge pull request #389 from ThibG/glitch-soc/error-500
...
Fix error 500 page
2018-03-16 16:51:19 -05:00
David Yip
a3c86d8cb9
Merge pull request #386 from ashkitten/compressed-notifs
...
compress boost/fave notifications more
2018-03-16 16:35:15 -05:00
