about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-01-02More ../ -> ~.David Yip
2018-01-02Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss
2018-01-02Use const instead of let for constant (#6106)Akihiko Odaki
2018-01-02Show mastodon on modal (#6129)Akihiko Odaki
2017-12-31Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-31Adding Serbian translation (#6133)Branko Kokanovic
* Adding Serbian translation * i18n-tasks normalize
2017-12-30Merge pull request #291 from glitch-soc/merge-upstreamDavid Yip
Merge with upstream @ f4b80e6511f21b60f71ed182bb66ca6ef0ba9f66
2017-12-30Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/controllers/auth/confirmations_controller.rb
2017-12-30Switch to tootsuite's elephant friend for the drawerDavid Yip
This version has a transparent background, which works better with the wave.
2017-12-30Use ~ notation in components for image referencesDavid Yip
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).
2017-12-30Translate Korean (#6131)Jeong Arm
Relates to #6125, #6099
2017-12-30keep the same filters and page when doing custom emojo stuff (fixes #6112) ↵beatrix
(#6114)
2017-12-29Add more instance stats APIs (#6125)Eugen Rochko
* 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
2017-12-28Merge pull request #288 from chriswmartin/fix-gif-avatarsDavid Yip
Fix GIF avatars not autoplaying when gif autoplay is enabled
2017-12-28bug fix (WebPush does not work) (#6120)MitarashiDango
2017-12-28Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000)cwm
2017-12-27Make host_meta/webfinger replies cacheable (fixes #6100) (#6101)ThibG
* 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
2017-12-26Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss
2017-12-27Move the mastodon on Getting Started column to drawer column (#6109)Akihiko Odaki
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.
2017-12-27Fix XML oEmbed support discovery (#6104)Akihiko Odaki
2017-12-26Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitchbeatrix
Merge various small vanilla updates into glitch
2017-12-26Merge pull request #285 from chriswmartin/detailed-status-actionsbeatrix
Add mute, block, conversation mute actions to detailed status dropdown
2017-12-26Set direction style to reply indicator (tootsuite pr #6006)cwm
2017-12-26Reduce motion for boost animation (tootsuite pr #5871)cwm
2017-12-26Fix layout for RTL (tootsuite pr #6014, #6018)cwm
2017-12-26Fix focused background color of favourited direct toot (tootsuite pr #6021)cwm
2017-12-26Move dropdown transform origin (tootsuite pr #6091)cwm
2017-12-26onMuteNotifications validation (tootsuite pr #6092)cwm
2017-12-26Rename settingKey to settingPath (tootsuite pr #6046 & #6098)cwm
2017-12-26Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-26add ruby-progressbar to gemfile (fixes #6110) (#6111)beatrix
2017-12-26more faster index on notifications table (#6108)takayamaki
2017-12-26use 'flavours/glitch/' prefix in new importscwm
2017-12-26Add mute, block, conversation mute actions to detailed status dropdown menucwm
2017-12-25Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-25Add mute, block, conversation mute actions to detailed status dropdown menu ↵Chris
(#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
2017-12-26Additional prop name change. (#6098)MitarashiDango
2017-12-25Add supported Node.js version to package.json (#6096)Yamagishi Kazutoshi
2017-12-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-24Add rake task to check and purge accounts that are missing in origin (#6085)Eugen Rochko
* 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
2017-12-24Add validation for onMuteNotifications (#6092)Neetshin
* 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
2017-12-24Reduce motion for boost animation (#5871)Nolan Lawson
* Reduce motion for boost animation Fixes #5833 * Fix ternary expression
2017-12-24Refactor web_push_subscription (#6047)Akihiko Odaki
* Remove onSave method in mapped properties for column_settings * Make web_push_subscription.register an action
2017-12-24removed references to hideOnMobile in column_link and getting_started (#6082)Chris
* removed references to hideOnMobile in column_link and getting_started * move keyboard shortcuts back below blocked users
2017-12-24Move dropdown transform origin to top edge (#6091)cpsdqs
2017-12-22Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-21Merge pull request #280 from KnzkDev/add-en-jabeatrix
i18n: Add en and ja
2017-12-22Update and add some translatencls7615
2017-12-22Add more en and jancls7615
2017-12-22Add en and jancls7615