about summary refs log tree commit diff
path: root/app/javascript
AgeCommit message (Collapse)Author
2018-10-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-26RTL: fix column-back-button__icon margins/content (#9112)Masoud Abkenar
* RTL: fix column-back-button__icon margins/content * Update rtl.scss * Update rtl.scss
2018-10-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.
2018-10-26Remove character counter from edit profile (#9100)Eugen Rochko
* Remove display name and bio counter hint, simply limit input * Remove now redundant translations * Fix code style issue
2018-10-26Fix direct messages column not loading more items on scroll (#9102)Eugen Rochko
Fix #9097
2018-10-26Fix conversations not being marked read on click (#9103)Eugen Rochko
Fix #9096
2018-10-24Fix RTL layout of status display names (#9075)Eugen Rochko
Fix #2350
2018-10-24Show upload options on click as well as hover (#9074)Eugen Rochko
Fix #8918
2018-10-24Fix JS error when posting from page without router context (#9073)Eugen Rochko
Fix #9057
2018-10-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-23Fix public timelines not instantly updating on compose (#9050)Eugen Rochko
Fix #9034
2018-10-23Show suggested follows on search screen in mobile layout (#9010)Eugen Rochko
Reminder: Suggestions were added in #7918 and are based on who you interact with who you do not follow. E.g. if you boost someone a lot from seeing other people's boosts of that person, it makes sense you might be interested in following the original source; or if you reply to someone a lot, maybe you'd want to follow them Each suggestion can be dismissed
2018-10-22Revert "RTL: remove blank character inside bdi (#9038)" (#9056)Eugen Rochko
This reverts commit c7e9f9ff1ed1def7f14f6ca4ac2836005eeefa47.
2018-10-22[Glitch] Surround mid-text display names with bdi tagsThibaut Girka
Port 7861c5f108a8f8cb0450f3b1ef865b1177c706fc to glitch-soc
2018-10-22[Glitch] fix: initial state of PrivacyDropdown is should not be nullThibaut Girka
Port bebe8ec887ba67c51353e09d7758819b117bf62d to glitch-soc
2018-10-22[Glitch] RTL: fix cardbar margins and alignmentThibaut Girka
Port c73864c1373330f2ef75006d639f90a1debcce6d to glitch-soc
2018-10-22[Glitch] RTL: fix admin account avatar margin in about pageThibaut Girka
Port 3a157210c87e6fe034f70d922cf7fc70fb533ad1 to glitch-soc
2018-10-22[Glitch] RTL: fix column settings toggle labelThibaut Girka
Port bf58461d365b5cee0d8a80a019a64e84c841f32f to glitch-soc
2018-10-22[Glitch] Fix domain label position and colorThibaut Girka
Port 25f9ead041a3087993059a1398f37dfa21a62610 to glitch-soc
2018-10-22[Glitch] RTL: fix preferences layoutThibaut Girka
Port 029943d59b222e96a2f7839390a5628888249bf6 to glitch-soc
2018-10-22[Glitch] Fix admin account avatar marginThibaut Girka
Port 065b39e7a460e088fd5afcd48dfc425d0006fee9 to glitch-soc
2018-10-22[Glitch] RTL: fix user stats in about pageThibaut Girka
Port 301cbcc9802ed85c519e67a01133968bc074c8af to glitch-soc
2018-10-22[Glitch] RTL: fix domain append at signup formThibaut Girka
Port 65b3804a6ccd40d359616b6157682ff88f85462f to glitch-soc
2018-10-22[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog"Thibaut Girka
Port d35801aaa2ad9d06345efa45cf524113469fdd02 to glitch-soc
2018-10-22[Glitch] RTL: fix admin account margins in about pageThibaut Girka
Port f8c1b325410369806eb77a5c8d259971a87a6852 to glitch-soc
2018-10-22[Glitch] undo part of PR 8202 to fix RTLThibaut Girka
Port efd09e2ebba7e9f0135bd47c44a77e2fc421aa67 to glitch-soc
2018-10-22[Glitch] Improve style of notice/alert messagesThibaut Girka
Port b972478812316da2f5c0d24c60386d408e027424 to glitch-soc
2018-10-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
2018-10-22RTL: remove blank character inside bdi (#9038)Masoud Abkenar
* RTL: remove blank character inside bdi * Update app/javascript/mastodon/components/display_name.js Co-Authored-By: mabkenar <ampbox@gmail.com>
2018-10-21RTL: fix cardbar margins and alignment (#9044)Masoud Abkenar
2018-10-21RTL: fix admin account avatar margin in about page (#9039)Masoud Abkenar
* RTL: fix admin account avatar margin in about page * fix code style
2018-10-21Attempt at fixing inline video playerThibaut Girka
2018-10-21Update mediaGallery component's width when opening CWsThibaut Girka
2018-10-21RTL: fix column settings toggle label (#9037)Masoud Abkenar
2018-10-21Fix domain label position and color (#9033)kedama
* Fix position of the domain label * Fix position of the domain label for RTL - Fix color mismatch of linear gradient which assigned to "::after" pseudo class
2018-10-20Force sensitive content flag when posting a toot with a CWThibaut Girka
Indeed, when the “Always enable the Content Warning field” setting is enabled, sending a content-less toot with a CW would move the CW to the toot's content and leave the toot not marked as sensitive.
2018-10-20Focus the UI when pressing Escape in the CW fieldThibaut Girka
2018-10-20Add option to block reports from domain (#8830)Eugen Rochko
2018-10-20Redesign direct messages column (#9022)Eugen Rochko
2018-10-20RTL: fix preferences layout (#9021)Masoud Abkenar
2018-10-19Fix admin account avatar margin (#9020)bsky
2018-10-19RTL: fix user stats in about page (#9018)Masoud Abkenar
2018-10-19Add unread indicator to conversations (#9009)Eugen Rochko
2018-10-19fix: initial state of PrivacyDropdown is should not be null (#9008)takayamaki
2018-10-18RTL: fix domain append at signup form (#9007)Masoud Abkenar
2018-10-18Fix fav/boosts hotkeys not working on detailed statuses (#9006)ThibG
2018-10-18Fix fav/boosts hotkeys not working on detailed statusesThibaut Girka
2018-10-18RTL: fix admin account margins in about page (#9005)Masoud Abkenar
2018-10-17Handle global hotkeys even when no element has focus (#8998)ThibG
This fixes hotkeys not working when pressing the column “back” button, for instance.
2018-10-15Fixes 8987 broken alignment at "Remote interaction dialog" (#8988)Masoud Abkenar
generated by cgit-pink (git 2.37.1) at 2024-11-03 06:40:15 +0000