Commit Graph

5493 Commits (e64cc311dd8db5d56b6299e9d40e7060d0c25b7e)
 

Author SHA1 Message Date
David Yip 54148b9a4a
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 764f876953 Use const instead of let for constant (#6106) 7 years ago
Akihiko Odaki 2c1ed5f872 Show mastodon on modal (#6129) 7 years ago
cwm 72b99f6ee4 bug fix (tootsuite pr #6120) 7 years ago
Jenkins fa9b7ece2e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
Branko Kokanovic 7d376e41be Adding Serbian translation (#6133)
* Adding Serbian translation

* i18n-tasks normalize
7 years ago
David Yip d817c0a958
Merge pull request #291 from glitch-soc/merge-upstream
Merge with upstream @ f4b80e6511
7 years ago
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
	app/controllers/auth/confirmations_controller.rb
7 years ago
David Yip e4944d065b
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 513d982f29
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 4ce44ba470 remove unused 'saveSettings' from column_settings_container 7 years ago
cwm 0dce26b82b web push updates (tootsuite PRs #5879, #5941, #6047) 7 years ago
Jeong Arm f4b80e6511 Translate Korean (#6131)
Relates to #6125, #6099
7 years ago
beatrix a56c4742d3 keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114) 7 years ago
Eugen Rochko 38fc1b498d
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 65c87ca0ae
Merge pull request #288 from chriswmartin/fix-gif-avatars
Fix GIF avatars not autoplaying when gif autoplay is enabled
7 years ago
MitarashiDango 511c6f9625 bug fix (WebPush does not work) (#6120) 7 years ago
cwm 832a93e67c Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000) 7 years ago
ThibG 868568d1c1 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 7174d1c955
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 65f30f65a2 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 e0ef7f9d79 Fix XML oEmbed support discovery (#6104) 7 years ago
beatrix 7347bc7334
Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch
Merge various small vanilla updates into glitch
7 years ago
beatrix e6ab869d95
Merge pull request #285 from chriswmartin/detailed-status-actions
Add mute, block, conversation mute actions to detailed status dropdown
7 years ago
cwm 20ad071931 Set direction style to reply indicator (tootsuite pr #6006) 7 years ago
cwm 14243bf80a Reduce motion for boost animation (tootsuite pr #5871) 7 years ago
cwm 337c2e77ee Fix layout for RTL (tootsuite pr #6014, #6018) 7 years ago
cwm 46565ed746 Fix focused background color of favourited direct toot (tootsuite pr #6021) 7 years ago
cwm 815524412b Move dropdown transform origin (tootsuite pr #6091) 7 years ago
cwm 083571915f onMuteNotifications validation (tootsuite pr #6092) 7 years ago
cwm 2bbd22e91c Rename settingKey to settingPath (tootsuite pr #6046 & #6098) 7 years ago
Jenkins 6b85dba8da Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
beatrix 127bfda521 add ruby-progressbar to gemfile (fixes #6110) (#6111) 7 years ago
takayamaki 1494509468 more faster index on notifications table (#6108) 7 years ago
cwm cc6a2ffd0a use 'flavours/glitch/' prefix in new imports 7 years ago
cwm 22818d2a16 Add mute, block, conversation mute actions to detailed status dropdown menu 7 years ago
Jenkins bed13f22e2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
Chris 1e5d1fa5c8 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 a3b369337f Additional prop name change. (#6098) 7 years ago
Yamagishi Kazutoshi 43c37a4768 Add supported Node.js version to package.json (#6096) 7 years ago
Jenkins f77c47d01b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
Eugen Rochko cafe27fb29
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 7e6214b869 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 a8eb0bf44f Reduce motion for boost animation (#5871)
* Reduce motion for boost animation

Fixes #5833

* Fix ternary expression
7 years ago
Akihiko Odaki 35fdf561be 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 081956742c 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 8528fd89d2 Move dropdown transform origin to top edge (#6091) 7 years ago
Jenkins 6d00ca1c71 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 7 years ago
beatrix 4a7782d5c9
Merge pull request #280 from KnzkDev/add-en-ja
i18n: Add en and ja
7 years ago
ncls7615 fb57ec41df
Update and add some translate 7 years ago