mastodon

Commit Graph

Author	SHA1	Message	Date
David Yip	e502d066ef	Merge pull request #424 from ThibG/glitch-soc/features/video-player-improvements Backport a few MediaGallery/Video changes from upstream (fixes #423)	2018-04-16 14:41:36 -05:00
David Yip	3079de3f7e	Merge pull request #425 from ThibG/glitch-soc/fixes/gifv-modal-size Fix extended video player (gifv) modal size	2018-04-16 14:41:18 -05:00
ThibG	ec135f2603	Fix scrolling behavior (#7151 ) * Update React.JS * Use React's new lifecycles for scrollable lists * Clean up dead code * Make CodeClimate happy	2018-04-16 21:04:24 +02:00
ThibG	60d86501b5	Remove extra spaces from search API queries and public account headers (fixes #7129 ) (#7152 )	2018-04-16 17:19:04 +02:00
Akihiko Odaki	899cca061b	Fix status filtering in contexts reducer (#7149 )	2018-04-16 11:34:34 +02:00
Akihiko Odaki	540d2ddfe4	Redirect to account status page for page of status stream entry (#7104 ) Commit `6c2344d4dd` missed a change for stream entry page. Instead of duplicating the change, redirect to account status page. It would also help crawlers (of search engines, for example) to understand a stream entry URL and its corresponding status URL points to the same page.	2018-04-16 10:04:31 +02:00
Yamagishi Kazutoshi	da5142618f	Weblate translations (2018-04-15) (#7141 ) * Translated using Weblate (Galician) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 76.4% (449 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 98.9% (581 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (585 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * 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 (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * 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 (Chinese (Traditional)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Arabic) Currently translated at 76.6% (450 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 92.6% (544 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 98.6% (74 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Slovak) Currently translated at 93.6% (550 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.4% (560 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * 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 (Indonesian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Korean) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.2% (278 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 87.3% (513 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.6% (279 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * 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 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 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Finnish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Arabic) Currently translated at 88.0% (517 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * 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 (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 (Spanish) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * 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 (Finnish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fi/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Slovak) Currently translated at 95.4% (560 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * 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 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Finnish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fi/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Finnish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fi/ * Translated using Weblate (Finnish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fi/ * 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 (Finnish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Finnish) Currently translated at 25.8% (152 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Finnish) Currently translated at 25.8% (152 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Finnish) Currently translated at 33.0% (194 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Finnish) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Slovak) Currently translated at 95.5% (561 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * 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 (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Galician) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * yarn manage:translations	2018-04-15 16:56:03 +02:00
YMHuang	a2f21215b0	Add and revise Traditional Chinese (zh-TW) translation for serveral strings (#7002 ) * Translation: add and revise Traditional Chinese translation for serveral strings * Translation: polish zh-TW locale * Translation: polish zh-TW locale	2018-04-15 14:00:32 +02:00
Marcin Mikołajczak	3774cbce91	Change icon for domain blocks (#7139 ) * Change icon for domain blocks Both domain blocks and user blocks uses the same icon… * Update index.js	2018-04-15 13:58:47 +02:00
Marcin Mikołajczak	1921384e08	i18n: Update Polish translation (#7131 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-15 14:12:41 +09:00
Thibaut Girka	aac3d4b481	Fix extended video player (gifv) modal size It was currently full-size	2018-04-14 21:47:56 +02:00
Thibaut Girka	9a3fd77c72	[Glitch] Responsively enforce 16:9 ratio on video thumbnails in web UI Port the video-player part of `8c85fd26bb` to glitch-soc. MediaGallery part ignored since it has diverged quite a bit. This fixes #423	2018-04-14 17:35:45 +02:00
David Yip	9697c6d9f0	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: db/schema.rb	2018-04-14 09:12:50 -05:00
Eugen Rochko	466442b764	Add bio fields (#6645 ) * Add bio fields - Fix #3211 - Fix #232 - Fix #121 * Display bio fields in web UI * Fix output of links and missing fields * Federate bio fields over ActivityPub as PropertyValue * Improve how the fields are stored, add to Edit profile form * Add rel=me to links in fields Fix #121	2018-04-14 12:41:08 +02:00
Thibaut Girka	6153d6a6dc	[Glitch] Fix media button type Port `6cb5d71e5f` to glitch-soc	2018-04-14 12:30:55 +02:00
Thibaut Girka	4b1909612a	[Glitch] Handle preference to always display sensitive media Port the UI part of `219b28e172` to glitch-soc	2018-04-14 12:27:14 +02:00
Jenkins	a1894cbc13	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-14 09:17:23 +00:00
David Yip	26f770cf72	Merge remote-tracking branch 'glitchsoc/master' into gs-master Conflicts: db/schema.rb	2018-04-14 03:50:31 -05:00
imncls	fe3a9f5ea4	Add missing Japanese translation	2018-04-14 07:53:56 +09:00
David Yip	605016368d	Merge pull request #419 from ThibG/glitch-soc/features/bookmarks Bookmarks	2018-04-13 16:38:15 -05:00
David Yip	fd98bfd108	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock config/application.rb	2018-04-13 16:36:46 -05:00
mayaeh	a35aeefe0a	i18n: Add Japanese translations for privacy policy and more (#7049 ) * Update Japanese translations. * Update Japanese translations. * Update Japanese translations. * Update Japanese translations. * Add Japanese translations for #6984, #7040, #7072. Update Japanese translations for privacy policy. * Add Japanese translations for #7032, #7074, #7089. * Proofreading Japanese translations for privacy policy.	2018-04-13 20:11:26 +09:00
Eugen Rochko	1343b9f329	Ensure SynchronizeFeaturedCollectionWorker is unique and clean up (#7043 ) * Ensure SynchronizeFeaturedCollectionWorker is unique and clean up Fix #7041 * Fix code style issue	2018-04-13 01:27:22 +02:00
Eugen Rochko	4923646361	When notification type filtered, ignore live updates for it (#7101 ) Fix #5625	2018-04-13 01:20:04 +02:00
Renato "Lond" Cerqueira	a4732040f0	Allow more than the max pins if account is not local (#7105 ) Sidekiq sometimes throws errors for users that have more pinned items than the allowed by the local instance. It should only validate the number of pins for local accounts.	2018-04-12 20:36:02 +02:00
Yamagishi Kazutoshi	9761b940ac	Upgrade Rails to version 5.2.0 (#5898 )	2018-04-12 14:45:17 +02:00
David Yip	ac1ac20ee9	Merge remote-tracking branch 'tootsuite/master' Conflicts: app/controllers/statuses_controller.rb	2018-04-12 03:30:57 -05:00
David Yip	f42e335e19	Merge pull request #418 from ThibG/glitch-soc/fixes/composer-dropdowns Place composer dropdown menus top if they are closer to the bottom of the viewport	2018-04-12 03:28:22 -05:00
David Yip	ef678ae350	Merge pull request #416 from ThibG/glitch-soc/features/media-modal Port various media modal improvements to glitch-soc	2018-04-12 00:20:19 -05:00
Thibaut Girka	8b3d03067b	Add glitch-soc front-end support for bookmarks Unlike boosts and like, there is no confirmation dialog as misclicking can be recovered without another user seeing it.	2018-04-11 21:05:34 +02:00
ThibG	47cb9587b7	Place privacy dropdown menu top if it is closer to the bottom of the viewport (#7106 )	2018-04-11 20:42:50 +02:00
Thibaut Girka	12f8473561	Add backend support for bookmarks Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter.	2018-04-11 20:40:29 +02:00
Thibaut Girka	9b6e579c76	Update glitch-soc style to match changes to reports UI Port style changes from `5a166a19a7`	2018-04-11 19:15:42 +02:00
Akihiko Odaki	6c2344d4dd	Paginate ancestor statuses in public page (#7102 ) This also limits the statuses returned by API, but pagination is not implemented in Web API yet. I still expect it brings user experience better than making a user wait to fetch all ancestor statuses and flooding the column with them.	2018-04-11 12:35:09 +02:00
Jenkins	e4e0aa5d21	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-11 00:50:09 +00:00
Thibaut Girka	d1bfe4cdad	Place composer dropdown menus top if they are closer to the bottom of the viewport	2018-04-10 20:52:31 +02:00
Emelia Smith	5a166a19a7	Feature: Improve reports ui (#7032 ) * Further improvements to Reports UI - Clean up notes display - Clean up add new note form - Simplify controller - Allow reopening a report with a note - Show created at date for reports - Fix report details table formatting * Show history of report using Admin::ActionLog beneath the report * Fix incorrect log message when reopening a report * Implement fetching of all ActionLog items that could be related to the report * Ensure adding a report_note updates the report's updated_at * Limit Report History to actions that happened between the report being created and the report being resolved * Fix linting issues * Improve report history builder Thanks @gargron for the improvements	2018-04-10 20:27:59 +02:00
Eugen Rochko	93a1afb66c	Improve load gap styling in web UI (#7100 )	2018-04-10 17:12:10 +02:00
Paul Woolcock	ed21e48ad6	Change custom emoji search to `ILIKE` instead of `=` (#7099 )	2018-04-10 15:46:27 +02:00
Emelia Smith	765bfd0cf5	Feature: Allow staff to change user emails (#7074 ) * Admin: Show unconfirmed email address on account page * Admin: Allow staff to change user email addresses * ActionLog: On change_email, log current email address and new unconfirmed email address	2018-04-10 09:16:06 +02:00
MIYAGI Hikaru	62c6b71866	Fix GIFV encoding params (#7098 ) - Explicitly specify video codec. When ffmpeg isn't compiled with libx264 but openh264, mpeg4 is selected as video codec. - Swap avarage bitrate and max bitrate.	2018-04-10 09:11:55 +02:00
Renato "Lond" Cerqueira	ddbc1572f2	When creating status, if no sensitive status is given, use default (#7057 ) Clients using the API that do not provide the sensitive flag are always posting with false sensitive option.	2018-04-09 23:02:42 +02:00
Emelia Smith	7a06bd7085	Feature: Direct message from Statuses (#7089 ) * Fix: Switching between composing direct message and mention from menus Previously clicking "direct message" followed by "mention" resulted in the composed status staying as "direct", along with weird spacing of items in the text area. This attempts to fix that. * Fix: Add missing proptype check for onMention in Status component * Add the ability to send a direct message to a user from the menu on Statuses * Add space between "Embed" and "Mention" on expanded statuses menu	2018-04-09 17:09:11 +02:00
Marcin Mikołajczak	33671bcc50	i18n: Update Polish translation (#7085 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-09 17:28:53 +09:00
Akihiko Odaki	31e1667933	Exclude status itself from context query (#7083 ) ancestor_statuses and descendant_statuses used to include the root status itself, but the behavior is confusing because the root status is not an ancestor nor descendant.	2018-04-09 09:58:53 +02:00
David Yip	337fc136fd	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/serializers/initial_state_serializer.rb The glitch flavour isn't yet pulling custom emoji data on its own (see https://github.com/tootsuite/mastodon/pull/7047). Once that gets into the glitch flavour, we can eliminate the custom_emojis load.	2018-04-08 19:05:02 -05:00
Thibaut Girka	d8dea31e0c	[Glitch] Fix video player height Port `5eea3f9877` to glitch-soc	2018-04-09 01:08:51 +02:00
Thibaut Girka	c2b7080a6e	[Glitch] Refactor scss Port `480131a376` to glitch-soc	2018-04-09 01:08:50 +02:00
Thibaut Girka	27ad9247a3	Fix video modal	2018-04-09 00:11:10 +02:00
Thibaut Girka	9a5a49f17c	[Glitch] Avoid using JS to set height in MediaModal Port `010c71f19c` to glitch-soc	2018-04-08 23:18:24 +02:00
Thibaut Girka	89f5ae00a5	[Glitch] Improved media modal Port `d6e88e29e2` to glitch-soc	2018-04-08 23:15:25 +02:00
Thibaut Girka	a5a305feb5	[Glitch] Allow to open a modal for embedded photo Port `16a49799cf` to glitch-soc	2018-04-08 23:06:33 +02:00
Emelia Smith	f48902e6e6	Hide search from Compose on mobile devices (#7077 ) * Hide search from Compose on mobile devices We're presently seeing large numbers of users accidentally tooting what they're trying to search for. This PR hides the search form from the Compose view, now that we have a dedicated "search" tab on mobile. * Don't "showSearch" on mobile if we're not currently searching (isSearchPage)	2018-04-08 18:25:08 +02:00
Emelia Smith	0e5e60a84b	Add search item to tab bar for mobile devices (#7072 ) * Add search item to tab bar for mobile devices * Fix missing prop validation	2018-04-08 14:26:58 +02:00
Levi Bard	6828abc1d7	Enable updating additional account information from user preferences via rest api (#6789 ) * Enable updating additional account information from user preferences via rest api Resolves #6553 * Pacify rubocop * Decoerce incoming settings in UserSettingsDecorator * Create user preferences hash directly from incoming credentials instead of going through ActionController::Parameters * Clean up user preferences update * Use ActiveModel::Type::Boolean instead of manually checking stringified number equivalence	2018-04-08 13:43:10 +02:00
ThibG	a91acd2010	Fix follow/unfollow buttons on public profile (fixes #7036 ) (#7040 ) * Fix follow/unfollow buttons on public profile - Present non-logged users with web+mastodon:// URLs for remote accounts - Present logged-in users with appropriate links (authorize_follows and remote_unfollows) for remote accounts * Do not cache rendered cards if user is logged in	2018-04-08 13:40:22 +02:00
Akihiko Odaki	fb8768a469	Free stroage if it is exceeding disk quota (#7061 )	2018-04-08 13:32:39 +02:00
Thibaut Girka	2a4785a250	Fix video playback in glitch-soc detailed statuses	2018-04-08 12:22:12 +02:00
Eugen Rochko	a814aa8e4d	Add a circuit breaker for ActivityPub deliveries (#7053 )	2018-04-07 21:36:58 +02:00
Hisham Muhammad	835a974a2a	i18n: improve "Welcome" translation in Portuguese (#7068 ) * i18n: update gender-neutral language for pt and pt-BR Instead of using "bem-vindo(a)" (a masculine form of "Welcome" with a "(a)" in the end to mean "bem-vinda" for the feminine form), use "boas-vindas", which is a gender-neutral form of "Welcome"). There is already precedent for using "boas-vindas" in the Brazilian Portuguese localization, in `config/locales/pt-BR.yml`. European Portuguese dictionary Priberam also registers it as a valid form: https://www.priberam.pt/dlpo/boas-vindas * i18n: pt-BR minor orthography fix The form "a bordo" does not take an accent. http://oredator.com.br/curso-de-redacao/uncategorized/a-bordo-ou-a-bordo	2018-04-07 21:36:03 +02:00
Alda Marteau-Hardi	17f77e51f2	Prevent admins and moderators eavesdropping in private and direct toots (#7067 ) Fix #6986	2018-04-07 21:33:01 +02:00
Eugen Rochko	608b4096ea	Forward deletes on the same path as reply forwarding (#7058 ) * Forward deletes on the same path as reply forwarding * Remove trailing whitespace	2018-04-07 18:54:46 +02:00
Harmon	f7c306596f	Remove duplicate frequently used emojis (#7064 )	2018-04-07 14:53:11 +02:00
Isatis	f3db0d6ecc	retrieve custom emoji list via API instead of before page load (#7047 )	2018-04-04 22:25:34 +02:00
Eugen Rochko	e54b79a777	Adjust privacy policy (#6666 ) * Adjust privacy policy to be more specific to Mastodon Fix #6613 * Change data retention of IP addresses from 5 years to 1 year * Add even more information * Remove all (now invalid) translations of the privacy policy * Add information about archive takeout, remove pointless consent section * Emphasis on DM privacy * Improve wording * Add line about data use for moderation purposes	2018-04-04 21:47:39 +02:00
David Yip	a60a600a10	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: spec/views/about/show.html.haml_spec.rb	2018-04-04 13:56:58 -05:00
David Yip	19001dd3dd	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-04-04 13:55:42 -05:00
beatrix	f5dfd3fae5	Merge pull request #412 from ThibG/glitch-soc/cleanup Remove duplicate message entries (minor code cleanup)	2018-04-04 11:36:54 -04:00
Thibaut Girka	e57ed1cb27	Update accounts SCSS for public pages	2018-04-04 15:40:59 +02:00
Thibaut Girka	7518a4b9d7	Remove duplicate message entries	2018-04-04 12:19:00 +02:00
Emelia Smith	07ffc4fa11	Revert "Add double-tap zoom functionary to `ZoomableImage` (#6944 )" (#7035 ) Unfortunately the new hammer.js functionality wasn't correctly tested and didn't work across devices and browsers, as such, it's best to revert PR #6944 until we can revisit this functionality and make it work across all devices and browsers that are supported by Mastodon. This reverts commit `7551951094`.	2018-04-04 11:58:15 +02:00
Eugen Rochko	7f1e924fa9	Add contact account to landing page ("Administered by") (#6984 )	2018-04-04 01:11:26 +02:00
Jenkins	62ce70f28c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-04-03 19:17:20 +00:00
Nolan Lawson	3e30ac6b7d	Fix nil account issue in ProcessAccountService (#7019 )	2018-04-03 13:08:11 +02:00
Emelia Smith	078aa8b5ae	Improve require_admin! and require_staff! filters (#7018 ) Previously these returns 302 redirects instead of 403s, which meant posting links to admin pages in slack caused them to unfurl, rather than stay as a link. Additionally, require_admin! doesn't appear to be actively used, on require_staff!	2018-04-03 13:07:32 +02:00
mayaeh	b505eec7e5	i18n: Add Japanese translations for #7000 (#7022 ) * run yarn manage:translations. * run i18n-tasks add-missing ja. * Update Japanese translations.	2018-04-03 18:21:33 +09:00
Emelia Smith	5373b138e8	Feature: Report improvements (#6967 ) (#7000 ) * Implement Assignment of Reports (#6967) * Change translation of admin.report.comment.label to "Report Comment" for clarity As we'll soon add the ability for reports to have comments on them, this clarification makes sense. * Implement notes for Reports This enables moderators to leave comments about a report whilst they work on it * Fix display of report moderation notes * Allow reports to be reopened / marked as unresolved * Redirect to reports listing upon resolution of report * Implement "resolve with note" functionality * Add inverse relationship for report notes * Remove additional database querying when loading report notes * Fix tests for reports * Fix localisations for report notes / reports	2018-04-02 22:04:14 +02:00
Thibaut Girka	e1e4a53496	[Glitch] Fix: Prevent submission using same logic as submit button disabling. Port `7d791f494b` to glitch-soc	2018-04-02 20:04:18 +02:00
unarist	d88504ec84	Add missing rejection handling for Promises (#7008 ) * Add eslint-plugin-promise to detect uncaught rejections * Move alert generation for errors to actions/alert * Add missing rejection handling for Promises * Use catch() instead of onReject on then() Then it will catches rejection from onFulfilled. This detection can be disabled by `allowThen` option, though.	2018-04-02 14:51:02 +02:00
Emelia Smith	0408944627	Implement the ability for an Administrator or Moderator to remove an account avatar (#6998 )	2018-04-02 13:45:07 +02:00
Emelia Smith	4be5383b91	Fix issues with sending direct messages from user profile (#6999 ) * Clear compose textarea when starting a new direct message Previous behaviour resulted in potentially misdirected direct messages. * Hide search when starting to compose a direct message	2018-04-02 13:44:19 +02:00
Yamagishi Kazutoshi	21fa7b6520	Weblate translations (2018-04-02) (#7007 ) * Translated using Weblate (Galician) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 76.4% (449 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 98.9% (581 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (585 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Persian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * 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 (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * 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 (Chinese (Traditional)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/zh_Hant/ * Translated using Weblate (Arabic) Currently translated at 76.6% (450 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 92.6% (544 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 98.6% (74 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Slovak) Currently translated at 93.6% (550 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.4% (560 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * 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 (Indonesian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Korean) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Arabic) Currently translated at 82.9% (487 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.2% (278 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 87.3% (513 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.6% (279 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * bundle exec i18n-tasks normalize && yarn manage:translations * revert	2018-04-02 13:43:30 +02:00
Evgeny Petrov	2964c7a7b8	Russian language updated (#7005 ) * Russian language updated * Small fixes for RU language * bundle exec i18n-tasks normalize	2018-04-02 19:49:06 +09:00
luzi82	89d3bc36a3	i18n: update zh-HK translation (#7004 ) * i18n: update zh-HK translation * i18n: update zh-HK translation * i18n-tasks normalize	2018-04-02 19:11:37 +09:00
David Yip	21394c5462	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml	2018-04-01 20:24:50 -05:00
Eugen Rochko	40afedc030	Support all ActivityPub actor types (#6997 ) Fix #6973	2018-04-02 02:10:53 +02:00
Eugen Rochko	10fc551576	Fix unpermitted parameters warning when generating pagination URLs (#6995 )	2018-04-02 02:09:50 +02:00
David Underwood	44274257de	[WIP] Enable custom emoji on account pages and in the sidebar (#6124 ) Federate custom emojis with accounts	2018-04-01 23:55:42 +02:00
Emelia Smith	7d791f494b	Fix: Prevent submission using same logic as submit button disabling. (#6993 ) This prevents submission through ctrl/cmd+enter when the submit button is disabled.	2018-04-01 22:19:43 +02:00
Marcin Mikołajczak	9458e263d5	i18n: Update Polish translation (#6985 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-04-01 10:31:38 +02:00
mayaeh	e0046b2c13	i18n: Add Japanese translations for domain blocks (#6979 ) * run yarn manage:translations * Update Japanese translations for domain blocks.	2018-03-31 21:09:39 +09:00
unarist	11fb748041	Ignore AbortError when cancelled sharing (#6978 ) `navigator.share()` rejects Promise if user cancelled sharing, and it may print it as an error on JavaScript console. This patch ignores it and prints other errors on the console.	2018-03-31 13:16:38 +02:00
Jenkins	658440838b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-30 19:17:17 +00:00
beatrix	a7cd93032e	Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js Add “public” pack to admin controller, as it is included in upstream …	2018-03-30 14:50:19 -04:00
beatrix	766a008931	Merge pull request #380 from ThibG/glitch-soc/features/domain-block-ui Port #6628 to glitch-soc flavour	2018-03-30 14:50:02 -04:00
David Yip	0f8f4969bd	Merge pull request #406 from ThibG/glitch-soc/fixes/menu-fixes Backport dropdown menu fixes from Mastodon	2018-03-30 11:29:26 -05:00
Thibaut Girka	e282d19700	Add “public” pack to admin controller, as it is included in upstream admin layout Fixes CW unfolding in moderation	2018-03-30 18:16:47 +02:00
ThibG	1cda8b247a	Fix compatibility with PeerTube (#6968 ) * Support fetching objects of convertible types by URL (fixes #6924) * Ignore invalid hashtags	2018-03-30 15:44:54 +02:00
Thibaut Girka	f7d23998c8	Fix migration page style	2018-03-30 15:26:12 +02:00
Thibaut Girka	769c536db4	[Glitch] Remove pointer events on the entire UI when a dropdown menu is open Port `95fce1bca0` to glitch-soc	2018-03-30 12:45:23 +02:00
ThibG	aa4a16c94f	Add some UI for user-defined domain blocks (#6628 ) * Keep list of blocked domains Might be overkill, but I'm trying to follow the same logic as for blocked users * Add basic domain block UI * Add the domain blocks UI to Getting Started * Fix undefined URL in `fetchDomainBlocks` * Update all known users' domain_blocking relationship instead of just one's	2018-03-30 12:38:00 +02:00
Thibaut Girka	caa6611877	[Glitch] Place dropdown menu top if it is closer to the bottom of the viewport Port `27b532cc98` to glitch-soc	2018-03-30 12:31:29 +02:00
Thibaut Girka	957d5c36c7	Add the domain blocks UI to Getting Started Misc	2018-03-30 10:07:33 +02:00
Thibaut Girka	d2b9747a50	Add basic domain block UI	2018-03-30 10:07:33 +02:00
Thibaut Girka	38feef43ad	Keep list of blocked domains Might be overkill, but I'm trying to follow the same logic as for blocked users	2018-03-30 10:07:33 +02:00
Thibaut Girka	e47593cac8	Update all known users' domain_blocking relationship instead of just one's	2018-03-30 10:07:33 +02:00
Thibaut Girka	876cc5c02b	Fix undefined URL in `fetchDomainBlocks`	2018-03-30 10:07:33 +02:00
takayamaki	43ab4a3985	update ja locale (#6965 ) related https://github.com/tootsuite/mastodon/pull/6956	2018-03-30 10:04:04 +09:00
Emelia Smith	df62fc20bf	Feature: Direct message from menu (#6956 ) * Implement ability to send direct messages from the user menu * Implement message warning users that direct messages are visible to all mentioned users * Update locales	2018-03-29 19:08:34 +02:00
Thibaut Girka	32ede640af	[Glitch] Display unfollow button even if account moved Backport `1a90ef9c25` to glitch-soc	2018-03-29 14:59:20 +02:00
Thibaut Girka	f63450c7ec	[Glitch] Profile redirect notes Port WebUI changes from `b89f614bd7`	2018-03-29 14:59:20 +02:00
unarist	2974df3c2f	Fix ReferenceError when Cache API is missing (#6953 ) Cache API is not supported on Safari 11.0 / iOS 11. Since those caching is optional, this patch simply ignores it.	2018-03-29 14:57:02 +02:00
unarist	5a9c8aeb42	Fix TypeError on follow notification (#6950 ) `notification.status` may not be present, e.g. follow notification.	2018-03-29 12:59:12 +02:00
ThibG	f7a96189b6	Do not ignore unknown media attachments, only skip them (#6948 ) That way, they are displayed in a list below the corresponding toot.	2018-03-29 00:52:24 +02:00
David Yip	299cfa4bc7	Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents Render toots with empty contents	2018-03-28 16:39:12 -05:00
Thibaut Girka	166fe6e6dd	Fix attachment lists	2018-03-28 22:19:36 +02:00
Thibaut Girka	4975cee02f	Render toots with empty contents This is necessary to display toots with media but otherwise no contents, as glitch-soc displays the media as a child of StatusContent, unlike Mastodon.	2018-03-28 21:13:45 +02:00
Yuto Tokunaga	7551951094	Add double-tap zoom functionary to `ZoomableImage` (#6944 ) add <div.zoomable-image__margin/> to keep margin of the image on zooming move setting `scrollLeft` and `scrollTop` of container from callback of `setState` to `componentDidUpdate` add 'hammerjs' package for touch gesture detection rewrite `ZoomableImage` using 'hammerjs'	2018-03-28 20:40:51 +02:00
David Yip	e6e537d002	Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter Remove ignored 'u' parameter on regexp (#392)	2018-03-27 13:06:28 -05:00
David Yip	2567d0a704	Merge remote-tracking branch 'origin/master' into gs-master	2018-03-27 10:44:12 -05:00
Rey Tucker	b65fc60334	Remove ignored 'u' parameter on regexp (#392 )	2018-03-27 11:30:49 -04:00
David Yip	7cdf2b05b6	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb	2018-03-27 10:26:47 -05:00
unarist	2111defbbf	Fix LoadMore on account media gallery (#6933 ) max_id in the fetch request should be a status id, but media attachment id was used.	2018-03-27 16:53:52 +02:00
Thibaut Girka	8fc7f85356	[Glitch] Display AttachmentList in notifications Port `2cb19bf443` to glitch-soc	2018-03-27 16:09:33 +02:00
Thibaut Girka	9454cfc0ad	[Glitch] Display AttachmentList in timelines in compact style when media missing Port `5079c1e322` to glitch-soc	2018-03-27 16:09:27 +02:00
unarist	cfd1fe74c9	Clone response before put it to the cache (#6932 ) `Response.prototype.clone()` must be called before the response used. This fixes an error from ServiceWorker and failing to load image when the image is not cached.	2018-03-27 15:18:35 +02:00
unarist	9487e8a4c0	Add missing null handling in notification reducer (#6930 ) This patch adds null item (i.e. gap) handling on below functions to avoid TypeError. * `filterNotifications` called on user mute/block * `deleteByStatus` called on status deletion	2018-03-27 13:05:59 +02:00
Akihiko Odaki	e829c21cc6	Cache media (#6902 )	2018-03-27 12:32:30 +02:00
Yuto Tokunaga	5eea3f9877	fix #6846 (#6914 )	2018-03-27 12:30:28 +02:00
Eugen Rochko	ebba6fb7f5	Fix UniqueUsernameValidator comparison (#6926 ) Comparison was downcasing only one side, therefore if previously existing account had a non-lowercase spelling, it would be ignored when checking for duplicates. New rake task `mastodon:maintenance:find_duplicate_usernames` will help find constraint violations that might have occured from the presence of this bug. Bump version to 2.3.3	2018-03-27 04:33:57 +02:00
Akihiko Odaki	acece7a2e6	Validate HTTP response length while receiving (#6891 ) to_s method of HTTP::Response keeps blocking while it receives the whole content, no matter how it is big. This means it may waste time to receive unacceptably large files. It may also consume memory and disk in the process. This solves the inefficency by checking response length while receiving.	2018-03-26 14:02:10 +02:00
Stephen Burgess	f9e88856e3	feat(ShowMore): Add classname to show more/show less button (#6904 )	2018-03-26 13:59:44 +02:00
Yuto Tokunaga	480131a376	Refactor scss (#6913 ) * Refactoring scss introduce scss variables for the media modal fix css block structure corresponding to react components fix flex layouts remove background image of the loaded image on the media modal * Fix typo	2018-03-26 13:59:21 +02:00
unarist	351203118c	Fix moved account handling in IndexedDB feature (#6915 ) * Fix stack overflow on importFetchedAccounts When the account has moved property, it should process destination account instead of source account itself. * Set account id instead of account object for moved property This restores "foo has moved to" indication on account view, and fixes `reblog` index on `accounts` object store.	2018-03-26 12:48:01 +02:00
Jenkins	ae55717f50	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-25 15:17:21 +00:00
Marcin Mikołajczak	29dfe740f6	i18n: Update Polish translation (#6903 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-03-25 23:33:07 +09:00
Akihiko Odaki	9eaa47845c	Allow clients to fetch notifications made while they were offline (#6886 )	2018-03-24 22:07:23 +01:00
Akihiko Odaki	34cb1a5461	Allow clients to fetch statuses made while they were offline (#6876 )	2018-03-24 15:25:15 +01:00
Akihiko Odaki	42786040d1	Rename variables to have semantic meanings in notifications reducer (#6890 )	2018-03-24 13:36:44 +01:00
Akihiko Odaki	43f2b0281d	Store objects to IndexedDB (#6826 )	2018-03-24 13:06:27 +01:00
Akihiko Odaki	47d2277ef1	Show media modal on public pages (#6801 )	2018-03-24 12:52:26 +01:00
Marcin Mikołajczak	3386112fb1	Change “Toots with replies” to “Toots and replies” (#6875 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-03-24 12:51:51 +01:00
Akihiko Odaki	472fba6771	Change columns in notifications nonnullable (#6764 )	2018-03-24 12:51:28 +01:00
Akihiko Odaki	9125608145	Note if the user is already following the target when authorizing follow (#6325 )	2018-03-24 12:50:41 +01:00
Jeroen	0bedd0bb45	Invites: Add '1 week' as expire option (#6872 ) * Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Update en.yml	2018-03-24 12:50:14 +01:00
Akihiko Odaki	11c19f6cc9	Close http connection in perform method of Request class (#6889 ) HTTP connections must be explicitly closed in many cases, and letting perform method close connections makes its callers less redundant and prevent them from forgetting to close connections.	2018-03-24 12:49:54 +01:00
Akihiko Odaki	e8a1d0b4d4	Internationalize unexpected error message (#6887 )	2018-03-24 10:54:19 +01:00
Yamagishi Kazutoshi	ed074766aa	Weblate translations (2018-03-23) (#6874 ) * Translated using Weblate (Galician) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 76.4% (449 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 98.9% (581 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (585 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * bundle exec i18n-tasks normalize && yarn manage:translations	2018-03-24 01:04:02 +01:00
David Yip	5a833423e2	Merge pull request #398 from ashkitten/compressed-notifs make expanded notifications show like default	2018-03-23 11:57:12 -05:00
Jenkins	60eafb173f	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-23 10:17:18 +00:00
Quentí	a8c2ce486f	[i18n] Occitan update (#6869 ) * Update oc.yml * Update simple_form.oc.yml * Update oc.json * Update oc.yml * bundle exec i18n-tasks normalize	2018-03-23 18:52:25 +09:00
Ash Levy	21e374356a	expanded notifications show like default	2018-03-22 10:20:36 -04:00
Eugen Rochko	6383580e6f	Do not re-query mentions from serializers (#6858 ) Fix performance regression from #6836	2018-03-22 11:31:17 +01:00
Eugen Rochko	f4e8e39c99	Restore username validation to disallow dots, for now (#6863 ) Usernames with dots in them do not work with routes, because the dot usually separates the desired page format (e.g. json). I don't want to mess with changing route constraints for this patch release.	2018-03-22 11:30:22 +01:00
ThibG	7d7a725e82	Fix MENTION_RE to not match nil usernames (#6862 )	2018-03-22 10:45:48 +01:00
Eugen Rochko	692d03239b	Hide floating action button on thread views (#6859 )	2018-03-22 09:33:14 +01:00
Jenkins	a9bcd383b8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-21 17:17:20 +00:00
Eugen Rochko	53b1100144	Permit dots in usernames with conditions (#6844 ) * Permit dots in usernames with conditions - Dot cannot be the start or end of username - a.lice and al.ice are considered the same during sign-up * Fix regex mixin flags	2018-03-21 10:26:53 +01:00
Eugen Rochko	ab96a9ff11	Use username/domain to match existing accounts in ActivityPub (#6842 ) See also: #6837, #6667	2018-03-20 14:57:46 +01:00
Thibaut Girka	5857c632ef	[Glitch] Cancel outdated pending compose suggestions Port 08f49bdb0d9ea03b1290bc1b6f1beaa37a6308e2 to the glitch flavour	2018-03-20 14:20:17 +01:00
ThibG	ca370217ad	Cancel outdated pending compose suggestions (#6838 )	2018-03-20 12:40:12 +01:00
Rey Tucker	4c91be94d3	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	db7e974589	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-03-19 15:41:59 -05:00
David Yip	bdeaef116e	Merge pull request #394 from ashkitten/compressed-notifs fix compressed notifications again (#393)	2018-03-19 15:41:09 -05:00
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	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
Ash Lea	4b0f6c677e	fix .status__info__icons layout	2018-03-19 07:13:18 -04: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
Ash Levy	59c1accd4b	fix compressed notifications again (#393 )	2018-03-18 13:42:28 -04: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
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
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
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	3c05ed5ce6	Merge pull request #386 from ashkitten/compressed-notifs compress boost/fave notifications more	2018-03-16 16:35:15 -05: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

... 2 3 4 5 6 ...

4476 Commits (8abac3dcb828398bb1a066c32c8765ae35ab9ae4)