about summary refs log tree commit diff
path: root/app/javascript
AgeCommit message (Collapse)Author
2018-04-10Place composer dropdown menus top if they are closer to the bottom of the ↵Thibaut Girka
viewport
2018-04-04Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: spec/views/about/show.html.haml_spec.rb
2018-04-04Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-04-04Merge pull request #412 from ThibG/glitch-soc/cleanupbeatrix
Remove duplicate message entries (minor code cleanup)
2018-04-04Update accounts SCSS for public pagesThibaut Girka
2018-04-04Remove duplicate message entriesThibaut Girka
2018-04-04Revert "Add double-tap zoom functionary to `ZoomableImage` (#6944)" (#7035)Emelia Smith
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 5021c4e9ca78881f5379a18185a46e580b8f2c34.
2018-04-04Add contact account to landing page ("Administered by") (#6984)Eugen Rochko
2018-04-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-03i18n: Add Japanese translations for #7000 (#7022)mayaeh
* run yarn manage:translations. * run i18n-tasks add-missing ja. * Update Japanese translations.
2018-04-02[Glitch] Fix: Prevent submission using same logic as submit button disabling.Thibaut Girka
Port 6a895e1ab3d69cd018423460518a1e16307999ad to glitch-soc
2018-04-02 Add missing rejection handling for Promises (#7008)unarist
* 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-02Fix issues with sending direct messages from user profile (#6999)Emelia Smith
* 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-02Weblate translations (2018-04-02) (#7007)Yamagishi Kazutoshi
* 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-02Russian language updated (#7005)Evgeny Petrov
* Russian language updated * Small fixes for RU language * bundle exec i18n-tasks normalize
2018-04-02i18n: update zh-HK translation (#7004)luzi82
* i18n: update zh-HK translation * i18n: update zh-HK translation * i18n-tasks normalize
2018-04-01Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
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-01Fix: Prevent submission using same logic as submit button disabling. (#6993)Emelia Smith
This prevents submission through ctrl/cmd+enter when the submit button is disabled.
2018-04-01i18n: Update Polish translation (#6985)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-03-31i18n: Add Japanese translations for domain blocks (#6979)mayaeh
* run yarn manage:translations * Update Japanese translations for domain blocks.
2018-03-31Ignore AbortError when cancelled sharing (#6978)unarist
`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-30Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-30Merge pull request #380 from ThibG/glitch-soc/features/domain-block-uibeatrix
Port #6628 to glitch-soc flavour
2018-03-30[Glitch] Remove pointer events on the entire UI when a dropdown menu is openThibaut Girka
Port 913a38111ff5b0cb7f412bec93e8314859c88855 to glitch-soc
2018-03-30Add some UI for user-defined domain blocks (#6628)ThibG
* 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[Glitch] Place dropdown menu top if it is closer to the bottom of the viewportThibaut Girka
Port f6a8d835d30f61628ca731462ecfe4f6005e6a9e to glitch-soc
2018-03-30Add the domain blocks UI to Getting Started MiscThibaut Girka
2018-03-30Add basic domain block UIThibaut Girka
2018-03-30Keep list of blocked domainsThibaut Girka
Might be overkill, but I'm trying to follow the same logic as for blocked users
2018-03-30Update all known users' domain_blocking relationship instead of just one'sThibaut Girka
2018-03-30Fix undefined URL in `fetchDomainBlocks`Thibaut Girka
2018-03-30update ja locale (#6965)takayamaki
related https://github.com/tootsuite/mastodon/pull/6956
2018-03-29Feature: Direct message from menu (#6956)Emelia Smith
* 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[Glitch] Display unfollow button even if account movedThibaut Girka
Backport 3987bd18a4bfaee49ea9a3439fc51610aeca6c2c to glitch-soc
2018-03-29[Glitch] Profile redirect notesThibaut Girka
Port WebUI changes from 58cede4808baa4db6cc143b80ef23e8179a8415b
2018-03-29Fix ReferenceError when Cache API is missing (#6953)unarist
Cache API is not supported on Safari 11.0 / iOS 11. Since those caching is optional, this patch simply ignores it.
2018-03-29Fix TypeError on follow notification (#6950)unarist
`notification.status` may not be present, e.g. follow notification.
2018-03-28Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contentsDavid Yip
Render toots with empty contents
2018-03-28Fix attachment listsThibaut Girka
2018-03-28Render toots with empty contentsThibaut Girka
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-28Add double-tap zoom functionary to `ZoomableImage` (#6944)Yuto Tokunaga
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-27Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-03-27Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb
2018-03-27Fix LoadMore on account media gallery (#6933)unarist
max_id in the fetch request should be a status id, but media attachment id was used.
2018-03-27[Glitch] Display AttachmentList in notificationsThibaut Girka
Port 77406d3a092db48250a85984dde2f2cc81386146 to glitch-soc
2018-03-27[Glitch] Display AttachmentList in timelines in compact style when media missingThibaut Girka
Port 86a9de6753fc425b247699c7822bc8a5d49af043 to glitch-soc
2018-03-27Clone response before put it to the cache (#6932)unarist
`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-27Add missing null handling in notification reducer (#6930)unarist
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-27Cache media (#6902)Akihiko Odaki
2018-03-27fix #6846 (#6914)Yuto Tokunaga