UnionRoom
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,194 Commits
1 Branch
0 Tags
210 MiB
Commit Graph

6194 Commits (95a892accdb6a081447117f49c66431dc7e032fb)

Author SHA1 Message Date
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.

* Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)"

This reverts commit 0074cad44f.

* Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)"

This reverts commit 4a0a19fe54.

* Revert "Correct the reference to user's password in mastodon:add_user task (#6800)"

This reverts commit 338bff8b93.

* Revert "Upgrade Paperclip to version 6.0.0 (#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 to glitch
 2018-03-16 23:16:20 +01:00
Thibaut Girka cd73af3bd0 [Glitch] Improve style of web UI account tabs 
Port of 38b9af76a2 to glitch
 2018-03-16 23:16:20 +01:00
Thibaut Girka f00af46d70 [Glitch] Add "Toots/Toots with replies/Media" tab below profile header 
Port 5131012505 to glitch
 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
Thibaut Girka cf754e6a91 Fix error 500 page 2018-03-16 22:31:20 +01:00
Thibaut Girka 9c40a5f3c8 Fix toot text color in the report modal 2018-03-16 15:27:13 +01:00
Thibaut Girka 19f7bd1582 Show media on report UI 
Ports 219aac7800 to glitch-soc
 2018-03-16 15:27:13 +01:00
Thibaut Girka 22870985da Add close modal icon to report dialog (#6591) 
Port 379cdfaac5 to glitch-soc flavour
 2018-03-16 15:27:13 +01:00
Thibaut Girka 9cf574d0d2 Port federated reports UI to glitchsoc 
Port 41a01bec23 to glitch-soc
 2018-03-16 15:27:13 +01:00
Jenkins d75a6054a0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-03-13 18:17:20 +00:00
Ash Levy 9317f6853e compress boost/fave notifications more 2018-03-13 13:54:57 -04:00
Marcin Mikołajczak fd385e256d 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 03119c857b 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 2ef1ce1182
Bump version to 2.3.1 2018-03-13 15:50:15 +01:00
Eugen Rochko eb2425b53b
Hide loading bar on status interactions (#6774) 2018-03-13 14:30:01 +01:00
Eugen Rochko 79d3a8553f
Bump version to 2.3.1rc3 2018-03-13 09:21:21 +01:00
Eugen Rochko 7709556673 Merge branch 'kagucho-spoiler' 2018-03-13 09:18:27 +01:00
Eugen Rochko f0ae6b4cc5 Merge branch 'spoiler' of git://github.com/kagucho/mastodon into kagucho-spoiler 2018-03-13 09:18:11 +01:00
Eugen Rochko 9e3a6d6784
Log BackupWorker backtrace, delete Backup if retries exhausted (#6769) 2018-03-13 08:15:24 +01:00
Eugen Rochko 8bf3e750ab
Fix #6757: Adjust RTL styles for landing page (#6768) 2018-03-13 08:14:08 +01:00
Akihiko Odaki 18241ccbe1 Change the title of sensitive button by state (#6771) 
Icon showing the state may be confusing. (does the slahed eye icon mean
the state that it is sensitive, or to mark it as sensitive?) Moreover, it
may not help for blind people.

The title will give the precise representation of the current state.
 2018-03-13 08:10:12 +01:00
Akihiko Odaki 0dccb398bd Change the title of spoiler button by state 
The title will give the precise representation of the current state. It
would be helpful for blind people.
 2018-03-13 15:58:55 +09:00
Eugen Rochko 386365090c
Fix #6762: Do not overwrite some status attributes in reducer (#6767) 2018-03-13 07:16:43 +01:00
Daniel Hunsaker d9500c8a3b [Nanobox] Fix DB backup task (#6766) 
Not sure how I missed that it had been using the wrong evar this entire time...
 2018-03-13 06:07:02 +01:00
Akihiko Odaki f7c1668bf6 Do not run lint in Travis CI (#6763) 
Lint is done by codeclimate
 2018-03-13 06:06:14 +01:00
David Yip f8e934f955
Merge remote-tracking branch 'origin/master' into merge-upstream 
Conflicts:
	README.md
 2018-03-12 17:52:19 -05:00
Ushitora Anqou 051b649628 Detailed SMTP setup (#6759) 
* add detailed SMTP settings setup in mastodon:setup

* add localhost SMTP settings setup in mastodon:setup

* SMTP settings setup should exit after successful delivery of test mail
 2018-03-12 21:41:26 +01:00
Gô Shoemake 22f2750578
Merge pull request #384 from ThibG/glitch-soc/features/no-media-url 
Remove text requirement when media attached from statuses (fixes #381)
 2018-03-12 13:09:42 -07:00
Gô Shoemake 2395a4c313
Merge pull request #344 from chriswmartin/getting-started-badge-merge 
merge tootsuite pr #6313 into glitch & move getting_started dispatch stuff to mapDispatchToProps
 2018-03-12 13:07:59 -07:00
Thibaut Girka 841ef606a9 Remove text requirement when media attached from statuses (fixes #381) 
Ports cfa9b6e13a to glitchsoc
 2018-03-12 18:39:07 +01:00
艮 鮟鱇 f5f165a5eb set SAFETY_ASSURED=1 of db:setup in mastodon:setup (#6758) 2018-03-12 16:21:48 +01:00
Eugen Rochko f89ff65ec7
Bump version to 2.3.1rc2 2018-03-12 12:48:49 +01:00
Akihiko Odaki 48b940d5c6 Insert space before shortcode if necessary (#6751) 2018-03-12 12:47:51 +01:00