Jenkins
eba1b109db
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-19 20:17:18 +00:00
ThibG
99790407e2
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
c4c87b8ee8
Display content warning in mail notification emails ( #6832 )
2018-03-19 20:12:20 +01:00
Alexander
af08f6042d
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
4fc9827b69
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
720a45e99f
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
9bdedcfa48
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
fd86b58568
Bump version to 2.3.2rc3
2018-03-19 12:20:57 +01:00
David Yip
b0993a5fdf
Merge remote-tracking branch 'origin/master' into gs-master
...
Conflicts:
config/i18n-tasks.yml
2018-03-18 20:21:17 -05:00
David Yip
8b7008f3fa
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
2018-03-18 20:20:08 -05:00
David Yip
8d5abcb749
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
f0bc8e8a89
Ignore media validation when attaching to status during processing ( #6822 )
...
Fix #6821
2018-03-19 01:51:19 +01:00
Eugen Rochko
b95c3ef3ee
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
6d00359015
Fix elephant graphic being draggable and selectable ( #6819 )
2018-03-18 20:32:44 +01:00
Jenkins
047346ce10
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-18 16:17:15 +00:00
Eugen Rochko
77badbc85a
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
cabb197337
Synchronize HTML page cache with sessions ( #6815 )
2018-03-18 15:14:38 +01:00
Jenkins
3d16993fbe
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-17 17:17:21 +00:00
nightpool
2902b97c83
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
a9538ac293
Bump version to 2.3.2rc2
2018-03-17 15:28:52 +01:00
Eugen Rochko
a235678802
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
d35272245e
Revert "Upgrade Paperclip to version 6.0.0" ( #6807 )
...
* Revert "Bump version to 2.3.2rc1"
This reverts commit 64d5c8a512
.
* Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806 )"
This reverts commit 36734278ba
.
* Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782 )"
This reverts commit 8f374100ed
.
* Revert "Correct the reference to user's password in mastodon:add_user task (#6800 )"
This reverts commit 7b247b15f2
.
* Revert "Upgrade Paperclip to version 6.0.0 (#6754 )"
This reverts commit cd6dee83a1
.
2018-03-17 14:20:35 +01:00
Eugen Rochko
64d5c8a512
Bump version to 2.3.2rc1
2018-03-17 14:07:00 +01:00
Eugen Rochko
36734278ba
Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 ( #6806 )
...
Fix 6734
2018-03-17 14:06:25 +01:00
Daniel Hunsaker
8f374100ed
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
7b247b15f2
Correct the reference to user's password in mastodon:add_user task ( #6800 )
2018-03-17 13:27:19 +01:00
Yamagishi Kazutoshi
cd6dee83a1
Upgrade Paperclip to version 6.0.0 ( #6754 )
2018-03-17 12:37:58 +01:00
trwnh
e3984f76a4
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
8b645b5bca
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
354d34a053
[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
1500cac87d
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
9972506493
fix non-notification boosts
2018-03-16 18:36:35 -04:00
Thibaut Girka
b05bebce6d
[Glitch] Federate pinned statuses over ActivityPub
...
Port b1f8dfd3cf
to glitch
2018-03-16 23:16:20 +01:00
Thibaut Girka
b1691c9811
[Glitch] Improve style of web UI account tabs
...
Port of 5ce4b21455
to glitch
2018-03-16 23:16:20 +01:00
Thibaut Girka
ce24c3186b
[Glitch] Add "Toots/Toots with replies/Media" tab below profile header
...
Port ca9d8402c3
to glitch
2018-03-16 23:16:20 +01:00
David Yip
16fa0e15a9
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
b020d451a9
Merge pull request #389 from ThibG/glitch-soc/error-500
...
Fix error 500 page
2018-03-16 16:51:19 -05:00
David Yip
3c05ed5ce6
Merge pull request #386 from ashkitten/compressed-notifs
...
compress boost/fave notifications more
2018-03-16 16:35:15 -05:00
Thibaut Girka
5c8ae1c7f8
Fix error 500 page
2018-03-16 22:31:20 +01:00
Thibaut Girka
f31d4ef2d3
Fix toot text color in the report modal
2018-03-16 15:27:13 +01:00
Thibaut Girka
5ac00cbf1f
Show media on report UI
...
Ports deba74063f
to glitch-soc
2018-03-16 15:27:13 +01:00
Thibaut Girka
8e7394c876
Add close modal icon to report dialog ( #6591 )
...
Port 9769285278
to glitch-soc flavour
2018-03-16 15:27:13 +01:00
Thibaut Girka
15563f8421
Port federated reports UI to glitchsoc
...
Port 0ebd2a1718
to glitch-soc
2018-03-16 15:27:13 +01:00
Jenkins
dd0dafed03
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-03-13 18:17:20 +00:00
Ash Levy
1d27649098
compress boost/fave notifications more
2018-03-13 13:54:57 -04:00
Marcin Mikołajczak
ba9b93b08b
i18n: Update Polish translation ( #6780 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-03-14 02:17:48 +09:00
Renato "Lond" Cerqueira
b83c1d7c5d
Weblate translations (2018-03-13) ( #6777 )
...
* 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/
* Normalize translations
Ran i18n-tasks normalize && yarn manage:translations
2018-03-13 16:16:51 +01:00
Eugen Rochko
61ad11683d
Bump version to 2.3.1
2018-03-13 15:50:15 +01:00
Eugen Rochko
5605b5ad7a
Hide loading bar on status interactions ( #6774 )
2018-03-13 14:30:01 +01:00
Eugen Rochko
3bf841c74e
Bump version to 2.3.1rc3
2018-03-13 09:21:21 +01:00