6143 Commits (a5a305feb557f41e352adb506eafcd46658dc13c)

 

All Branches   

Search

Author	SHA1	Message	Date
David Yip	ed572490c1	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	7 years ago
Akihiko Odaki	7549f264e6	Use const instead of let for constant (#6106)	7 years ago
Akihiko Odaki	616b6867a0	Show mastodon on modal (#6129)	7 years ago
cwm	d5770ef7ac	bug fix (tootsuite pr #6120)	7 years ago
Jenkins	5975446002	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Branko Kokanovic	34a90dc266	Adding Serbian translation (#6133) ... * Adding Serbian translation * i18n-tasks normalize	7 years ago
David Yip	08ecfe990d	Merge pull request #291 from glitch-soc/merge-upstream ... Merge with upstream @ fc8c2c9b4a	7 years ago
David Yip	01f91695f5	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb	7 years ago
David Yip	f19b436c83	Switch to tootsuite's elephant friend for the drawer ... This version has a transparent background, which works better with the wave.	7 years ago
David Yip	5ec1a9b484	Use ~ notation in components for image references ... This uses (more or less) absolute references to external assets, which allows imported stylesheets (like components.scss) to work from other locations that may not have the expected path structure (e.g. the win95 theme).	7 years ago
cwm	a4ae9c4109	remove unused 'saveSettings' from column_settings_container	7 years ago
cwm	093c27fe46	web push updates (tootsuite PRs #5879, #5941, #6047)	7 years ago
Jeong Arm	fc8c2c9b4a	Translate Korean (#6131) ... Relates to #6125, #6099	7 years ago
beatrix	d9c2806048	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	7 years ago
Eugen Rochko	9427823d5c	Add more instance stats APIs (#6125) ... * Add GET /api/v1/instance/peers API to reveal known domains * Add GET /api/v1/instance/activity API * Make new APIs disableable, exclude private statuses from activity stats * Fix code style issue * Fix week timestamps	7 years ago
David Yip	95180cb27c	Merge pull request #288 from chriswmartin/fix-gif-avatars ... Fix GIF avatars not autoplaying when gif autoplay is enabled	7 years ago
MitarashiDango	a52820a7fd	bug fix (WebPush does not work) (#6120)	7 years ago
cwm	485dbbb9b7	Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000)	7 years ago
ThibG	3df85a843c	Make host_meta/webfinger replies cacheable (fixes #6100) (#6101) ... * Make host_meta/webfinger replies cacheable (fixes #6100) Drop common code for handling users and sessions as webfinger queries are very basic, public APIs. Also explicitly mark results as cacheable with “expires_in”. * Add “Vary: Accept” header for caching since content-negociation is used	7 years ago
David Yip	f722fcb5a6	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss	7 years ago
Akihiko Odaki	093af89c43	Move the mastodon on Getting Started column to drawer column (#6109) ... Getting Started column obtained many links, and it became much taller. Because of its height, Getting Started column required long scrolling on devices with small screen, such as 4 inch phones and 10 inch laptops. This change moves the mastodon which took large space on the column to drawer column. The drawer column has only the compose form and has more space.	7 years ago
Akihiko Odaki	d8a0c19166	Fix XML oEmbed support discovery (#6104)	7 years ago
beatrix	dde1db7efb	Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch ... Merge various small vanilla updates into glitch	7 years ago
beatrix	f54cd50e4c	Merge pull request #285 from chriswmartin/detailed-status-actions ... Add mute, block, conversation mute actions to detailed status dropdown	7 years ago
cwm	4d2ca09ae8	Set direction style to reply indicator (tootsuite pr #6006)	7 years ago
cwm	c670d2cadd	Reduce motion for boost animation (tootsuite pr #5871)	7 years ago
cwm	ccc14ad59b	Fix layout for RTL (tootsuite pr #6014, #6018)	7 years ago
cwm	44d1b30dfb	Fix focused background color of favourited direct toot (tootsuite pr #6021)	7 years ago
cwm	f9863df926	Move dropdown transform origin (tootsuite pr #6091)	7 years ago
cwm	4a0dd0efea	onMuteNotifications validation (tootsuite pr #6092)	7 years ago
cwm	ab81f8414d	Rename settingKey to settingPath (tootsuite pr #6046 & #6098)	7 years ago
Jenkins	0a2cc2361c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
beatrix	e2ccf65789	add ruby-progressbar to gemfile (fixes #6110) (#6111)	7 years ago
takayamaki	2a2ac6c744	more faster index on notifications table (#6108)	7 years ago
cwm	15796d0b5f	use 'flavours/glitch/' prefix in new imports	7 years ago
cwm	61aa7a385b	Add mute, block, conversation mute actions to detailed status dropdown menu	7 years ago
Jenkins	2bd6532e63	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Chris	1f0ae8d173	Add mute, block, conversation mute actions to detailed status dropdown menu (#6099) ... * removed references to hideOnMobile in column_link and getting_started * add mute, block, conversationMute actions to detailed status dropdown (fixes #1226) * remove unused withDismiss in detailed status	7 years ago
MitarashiDango	b4047027d4	Additional prop name change. (#6098)	7 years ago
Yamagishi Kazutoshi	4d91c45ce1	Add supported Node.js version to package.json (#6096)	7 years ago
Jenkins	503e7fb4d8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	50f2d69780	Add rake task to check and purge accounts that are missing in origin (#6085) ... * Add rake task to check and purge accounts that are missing in origin * Add progress bar and --force options to mastodon:maintenance:purge_removed_accounts	7 years ago
Neetshin	fad20b7830	Add validation for onMuteNotifications (#6092) ... * Add aria-autocomplete='list' in Textaria ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete * Make detect empty string brefore assign upload description * Change code elements in keyboard-shortcuts component to kbd * Add validation for onMuteNotifications	7 years ago
Nolan Lawson	59a50e6489	Reduce motion for boost animation (#5871) ... * Reduce motion for boost animation Fixes #5833 * Fix ternary expression	7 years ago
Akihiko Odaki	3f52d12a4c	Refactor web_push_subscription (#6047) ... * Remove onSave method in mapped properties for column_settings * Make web_push_subscription.register an action	7 years ago
Chris	65cabbe8ef	removed references to hideOnMobile in column_link and getting_started (#6082) ... * removed references to hideOnMobile in column_link and getting_started * move keyboard shortcuts back below blocked users	7 years ago
cpsdqs	7f1828166d	Move dropdown transform origin to top edge (#6091)	7 years ago
Jenkins	9ccad78647	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
beatrix	30f0615be2	Merge pull request #280 from KnzkDev/add-en-ja ... i18n: Add en and ja	7 years ago
ncls7615	33f2976c84	Update and add some translate	7 years ago