about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-04-22Merge pull request #433 from ThibG/glitch-soc/fixes/status-filteringbeatrix
Status filtering fixes from upstream
2018-04-22Merge pull request #435 from ThibG/glitch-soc/features/public-modalsbeatrix
[Glitch] Show media modal on public pages
2018-04-22Merge pull request #436 from unascribed/glitchsoc-pr-better-collapsed-statusesbeatrix
Add fade and margin to collapsed statuses
2018-04-22Add fade and margin to collapsed statusesUna Thompson
2018-04-20[Glitch] Show media modal on public pagesThibaut Girka
Port ff7941e652af1d54d9c991254556e7932a8b183c to glitch-soc
2018-04-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-19Fix webkit scrollbars (#7191)beatrix
* Revert "Make scroll bars wider (#7060)" This reverts commit 11715454d033784bf6176b75a954e5c28b5d79e5. * for real make webkit scrollbar wider
2018-04-19Merge pull request #426 from ThibG/glitch-soc/features/display-focal-pointsDavid Yip
Honor focal points when displaying media
2018-04-19[Glitch] Fix status filtering in contexts reducerThibaut Girka
Port 1a37d7e252aa41fd1c66e780e1a2a1426d8f3545 to glitch-soc
2018-04-19[Glitch] Do not filter the status collection after muting and blockingThibaut Girka
Port fd87e5a53bcaafb886a675c76e9256015e9db897 to glitch-soc
2018-04-19Reports: Merge contents and comment columns (#7189)Emelia Smith
2018-04-19Only compute height dynamically for standalone mediaThibaut Girka
This prevents changing the status' height and triggering jumps in the TL
2018-04-19[Glitch] Make detailed status' media gallery standaloneThibaut Girka
2018-04-19[Glitch] Center thumbnails on focus pointThibaut Girka
Port the display part of the following commits to glitch-soc: * 90f12f2e5a41115a9a756f9dd38054736080d4f9 * b170627ceb8838c358aef1fcca9673ce4aa61ab8 * 11697d68942db7b97a4c7384e4fb4148a97b9122 * 56eb5c3f344f0342ac6f26a05748bc21c585a729
2018-04-19Use javascript to set MediaGallery height automaticallyThibaut Girka
2018-04-19Revert some glitch-specific refactoringThibaut Girka
In order to keep my sanity when porting changes between glitch-soc and upstream.
2018-04-19Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-04-19Fix text color in "show more" link inside boost confirmation modal (#7183)Eugen Rochko
2018-04-18Merge remote-tracking branch 'glitchsoc/master' into gs-masterDavid Yip
2018-04-18db: make schema.rb version subsume bookmarks migration.David Yip
2018-04-18Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: app/controllers/home_controller.rb app/controllers/stream_entries_controller.rb app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json
2018-04-19Rescue SSL errors when processing mentions, remove useless line (#7184)Eugen Rochko
2018-04-19i18n: Update Polish translation (#7181)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-04-18Add color variables of texts for better accesibility (#7125)Lynx Kotoura
* Add variables for text colors * Change variables in sass files * Apply text color variables for recently added colors * Fix text colors of emoji mart anchors * Fix text colors of search__input * Fix text colors of text area of compose-form * Fix icon colors of privacy dropdown and modal * Inverted icon colors by classname * Change variables in boost.scss * Change action-button-color * Fix text colors of pre-header
2018-04-18Fix comparing id (#7180)abcang
2018-04-18Add revealing/hiding statuses button to keyboard shortcuts legend column (#7178)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-04-18Direct messages column (#4514)Kaito Sinclaire
* Added a timeline for Direct statuses * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL * Changes to match other timelines in 2.0
2018-04-18zh-HK translation (#7177)luzi82
* zh-HK translation * zh-HK fix * zh-HK translation * add missing zh-HK translate * fix translate * i18n-tasks normalize
2018-04-18Adds keyboard hotkey for revealing/hiding statuses (#7173)Neil Moore
Resolves #5550
2018-04-17Allow boosting own private toots (#6157)ThibG
* Adjust policy to allow boosting own private toots * Add ability to reblog private toots from dropdown menu
2018-04-17Make scroll bars wider (#7060)Sam Schlinkert
* Set scrollbars to 12 px wide rather than 8px Should overwrite the setting in reset.scss. This is untested at this point. * removes scrollbar height and width specifications from reset.scss and basics.scss
2018-04-17Improve web api protect (#6343)abcang
2018-04-17Feature: add count of account notes to reports (#7130)Emelia Smith
* Reports: Colocate account details with reports * Reports: Add count of account moderation notes Sometimes an account will be left with a note instead of the report, this adds a way to quickly see from a given report if this is the case.
2018-04-17Able to deactivate invites if they aren't expired (#7163)Jennifer Kruse
2018-04-17Fix missing "Administered by" when timeline preview disabled (#7161)Eugen Rochko
2018-04-17Set Referrer-Policy to origin in web UI and public pages of private toots ↵Eugen Rochko
(#7162) Fix #7115
2018-04-17Fix warning about using SQL in order for Account#partitioned (#7159)Eugen Rochko
2018-04-17Fix caret position after inserting emoji (#7167)abcang
2018-04-17Perform processing that does not use the database before connecting to the ↵abcang
database (#7168)
2018-04-17Merge pull request #430 from ThibG/glitch-soc/features/bookmarksThibG
Fix the bookmark column pinning fix…
2018-04-17Fix the bookmark column pinning fix…Thibaut Girka
2018-04-17Update French javascript locale file (#7165)Remi Rampin
Match config/locales/fr.yml: "private" was changed to "followers-only" by 501514960a9de238e23cd607d2e8f4c1ff9f16c1.
2018-04-16Merge pull request #429 from ThibG/glitch-soc/features/bookmarksThibG
Fix pinning the bookmarks column (fixes #428)
2018-04-16Fix pinning the bookmarks column (fixes #428)Thibaut Girka
2018-04-16Merge pull request #424 from ThibG/glitch-soc/features/video-player-improvementsDavid Yip
Backport a few MediaGallery/Video changes from upstream (fixes #423)
2018-04-16Merge pull request #425 from ThibG/glitch-soc/fixes/gifv-modal-sizeDavid Yip
Fix extended video player (gifv) modal size
2018-04-16Fix scrolling behavior (#7151)ThibG
* Update React.JS * Use React's new lifecycles for scrollable lists * Clean up dead code * Make CodeClimate happy
2018-04-16Remove extra spaces from search API queries and public account headers ↵ThibG
(fixes #7129) (#7152)
2018-04-16Fix status filtering in contexts reducer (#7149)Akihiko Odaki
2018-04-16Redirect to account status page for page of status stream entry (#7104)Akihiko Odaki
Commit 519119f657cf97ec187008a28dba00c1125a9292 missed a change for stream entry page. Instead of duplicating the change, redirect to account status page. It would also help crawlers (of search engines, for example) to understand a stream entry URL and its corresponding status URL points to the same page.
generated by cgit-pink (git 2.37.1) at 2024-11-10 03:24:31 +0000