about summary refs log tree commit diff
path: root/app/javascript/mastodon
AgeCommit message (Collapse)Author
2019-06-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/settings/notifications_controller.rb - app/javascript/packs/public.js - app/views/settings/preferences/show.html.haml - app/views/stream_entries/_simple_status.html.haml - config/locales/simple_form.en.yml - config/locales/simple_form.pl.yml - config/navigation.rb - config/routes.rb
2019-06-10Fix emoji-button appearing above privacy-dropdown (#11027)mayaeh
2019-06-10Update fr.json (#11024)manuelviens
2019-06-09i18n: Update Corsican front-end translation (#11010)Alix Rossi
2019-06-09Run yarn manage:translations (#11008)Eugen Rochko
2019-06-09i18n: Update Catalan translations (#10998)spla
* Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translations * i18n: Update Catalan translation * i18n Update Catalan translation * i18n: Update Catalan translations * i18n: Update Catalan translations
2019-06-08I18n: Update Czech translation 🇨🇿 (#10995)Aditoo17
* I18n: Update Czech translation * Fix * Re-fix * And also this * The real fix now (hopefully)
2019-06-08Put poll options behind content warnings (#10983)ThibG
* Put poll options behind CWs in WebUI * Put polls behind CWs on public pages * Add poll icon to public pages CWs * Revert to not showing an icon in the CW button
2019-06-08Improve light theme (#10992)Eugen Rochko
2019-06-07Fix some React warnings (#10989)Eugen Rochko
2019-06-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/statuses_controller.rb - app/controllers/stream_entries_controller.rb
2019-06-06Fix overlap of emoji button on search popup (#10978)Wenceslao Páez Chávez
2019-06-06Fix not being able to directly switch between list timelines in web UI (#10973)Eugen Rochko
2019-06-06Fix “mark as sensitive” not being used in delete & redraft (#10980)ThibG
2019-06-06Fix emoji picker being always displayed (#10979)Takeshi Umeda
* Fix emoji picker being always displayed * Remove duplicate content with other pull-requests
2019-06-05Scroll to compose form when focus (#10970)Jeong Arm
* Scroll to compose form when focus * Get rid of constructor
2019-06-05Fix refreshing featured toots when the new collection is empty (#10971)ThibG
Fixes #10945
2019-06-04Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstreamThibaut Girka
2019-06-04Add profile directory link to single column navigation panel (#10963)Eugen Rochko
2019-06-04Add missing Korean translations (#10962)Jeong Arm
And change some word.
2019-06-03Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Gemfile.lock - config/webpack/rules/css.js - package.json - yarn.lock
2019-06-02Improvement variable height in single column layout (#10917)Takeshi Umeda
* Improvement variable height of compose and navigation panel in single column layout * Fix wrong quotes and missing commas
2019-05-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-29Change links in right panel to open in the same tab (#10848)Eugen Rochko
For Rambox compatibility
2019-05-29Fix React warning about legacy lifecycle calls and sensitive status ↵ThibG
resetting (#10872)
2019-05-29i18n: Update Corsican front-end translation (#10884)Alix Rossi
2019-05-29Update Japanese translations. (#10875)mayaeh
run yarn manage:translations ja && i18n-tasks add-missing ja
2019-05-29I18n: Update Czech translation (#10874)Aditoo17
2019-05-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-27Refactor footers in web UI into a single component (#10846)Eugen Rochko
2019-05-27Display notifications count on a new single column (#10859)abcang
2019-05-26Fix poll visibility on public pages (#10817)Takeshi Umeda
* Fix poll visibility on public pages * Revert "Fix poll visibility on public pages" This reverts commit 54a9608add6f855bc6337fe3c65eaee7ba13db49. * Revert "Change poll options to alphabetic letters when status text is hidden" This reverts commit c53d67326201b2061990b1874a3547c3647f50d2.
2019-05-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.
2019-05-26Create new click handler for status__expand area in status (#10837)Neil Moore
This click handler only activates on left-click, resolving #10798. This matches behavior in status_content.js, as added in #536
2019-05-26Fix null error in status component when determining showMedia state (#10838)Eugen Rochko
* Fix null error in status component when determining showMedia state Also update the showMedia value if the status passed to the component changes * Refactor media visibility computation into a defaultMediaVisibility function * Fix default media visibility with reblogs
2019-05-26Fix wrong redirect from getting started to home in advanced Web UI (#10839)Hanage999
* update Ruby to 2.5.3 * Link to Getting Started will not redirect to Home in multi-column UI (https://github.com/tootsuite/mastodon/pull/10835)
2019-05-26Improvements to the single column layout (#10835)Eugen Rochko
* Improvements to the single column layout - Add follows and followers link to the right panel - Increase margins around separators in right panel - Add follow requests link with counter when account is locked to right panel * Redirect from getting started to home when navigation panel is visible
2019-05-25Add a keyboard shortcut to hide/show media (#10647)ThibG
* Move control of media visibility to parent component * Add keyboard shortcut to toggle media visibility
2019-05-25Add responsive panels to the single-column layout (#10820)Eugen Rochko
* Add responsive panels to the single-column layout * Fixes * Fix not being able to save the preference * Fix code style issues * Set max-height on the compose textarea and add a link to relationship manager
2019-05-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - streaming/index.js
2019-05-24Improve streaming server security (#10818)ThibG
* Check OAuth token scopes in the streaming API * Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token Inspired by https://github.com/kubevirt/kubevirt/issues/1242
2019-05-23Various improvements to single column layout (#10809)Eugen Rochko
- Add potential side panels to single column layout - Hide FAB on large screens
2019-05-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23Add `forceSingleColumn` prop to `<UI />` (#10807)Eugen Rochko
* Move TabsBar rendering logic from CSS to the ColumnsArea component * Add forceSingleColumn mode * Add unread notifications counter to tabs bar * Add toggle to control `forceSingleColumn` * Increase paddings in mobile layout responsively at large sizes
2019-05-22i18n: Complete frontend Bengali translation (#10800)dxwc
* i18n: Complete frontend Bengali translation * run yarn manage:translations
2019-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-19fix `isSubmitting` prop case (#10785)Hinaloe
2019-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-18Change poll options to alphabetic letters when status text is hidden (#10685)Eugen Rochko
Fix #10569
2019-05-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
generated by cgit-pink (git 2.37.1) at 2024-12-21 08:34:52 +0000