about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-05-07Merge pull request #467 from ThibG/glitch-soc/fixes/fix-boost-colorbeatrix
Fix color of disabled boost buttons (fixes #466)
2018-05-07Fix color of disabled boost buttons (fixes #466)Thibaut Girka
2018-05-06Merge pull request #465 from ThibG/glitch-soc/rollback-scroll-changesDavid Yip
Glitch soc/rollback scroll changes
2018-05-06Merge pull request #464 from ThibG/glitch-soc/fixes/high-contrast-colorsDavid Yip
Fix glitch high-contrast skin text colors
2018-05-06Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it"Thibaut Girka
This reverts commit 553cc2824040ba0b745644eb4633840129ffc13b.
2018-05-06Revert "[Glitch] Do not re-position scroll when loading more (inserting ↵Thibaut Girka
items from below)" This reverts commit 32974a58dcf5a8db39a9c0378f923a40d787cad3.
2018-05-06Fix glitch high-contrast skin text colorsThibaut Girka
Port from 3c5006ec7fa98ec53df619b0e6e52b3bbdb6f046
2018-05-06Merge pull request #462 from ThibG/glitch-soc/features/dropdowns-accessibilitybeatrix
Improve accessibility of toot dropdown menu
2018-05-06Merge pull request #461 from ThibG/glitch-soc/fixes/emoji-picker-placementbeatrix
[Glitch] Place emoji picker top if it is closer to the bottom of the viewport
2018-05-06Merge pull request #460 from ↵beatrix
ThibG/glitch-soc/features/do-not-scroll-when-mouse-over Prevent timeline from moving when cursor is hovering over it
2018-05-06Merge pull request #459 from ThibG/glitch-soc/features/text-color-variablesbeatrix
Add text color variables + minor SCSS fixes + high contrast skin
2018-05-06Merge pull request #458 from ↵beatrix
monsterpit-daggertooth/glitch-fix-escape-metachars-in-mutes Escape regex metachars in keyword mutes
2018-05-06Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-itemsbeatrix
Support upstream bio items / custom account fields
2018-05-06Fix color of status icons in glitch-soc high contrast skinThibaut Girka
2018-05-06Merge pull request #457 from m4sk1n/glitch-lightThibG
Add a light theme by @Sylvhem
2018-05-05minor fixThibaut Girka
2018-05-05[Glitch] Add high-contrast themeThibaut Girka
2018-05-05Move attachment-lists out of lists.scssThibaut Girka
2018-05-05[Glitch] Fix text color in "show more" link inside boost confirmation modalThibaut Girka
Port ba917e15f66c7848fe943e571d1ec5eeb549b59d to glitch-soc
2018-05-05Fix link colors in report modalThibaut Girka
2018-05-05[Glitch] Add color variables of texts for better accesibilityThibaut Girka
Port 74dae9458d118b066cd74b16aab2aa9cafbf3fba and related to glitch-soc
2018-05-05[Glitch] Update SCSS of admin and setting pagesThibaut Girka
Port the SCSS changes from cb74c0cfe4aa89f9656c054253665ef4965b41df to glitch-soc
2018-05-05[Glitch] Improve styling of closed registrations messageThibaut Girka
Port SCSS changes from 5acd5315f23b4472f31c4a0bb612b7356032defc to glitch-soc
2018-05-05[Glitch] Do not re-position scroll when loading more (inserting items from ↵Thibaut Girka
below) Port 8c601b54ccf530bd193b4500fee439aa4e9162d0 to glitch-soc
2018-05-05[Glitch] Prevent timeline from moving when cursor is hovering over itThibaut Girka
Port 58852695c8ec490239ed3812f82971f8c1e6c172 to glitch-soc
2018-05-05Improve accessibility of toot dropdown menuThibaut Girka
* Prevent Enter keypresses from triggering dropdown display toggle twice * Give focus to first/selected item of dropdown menus * Implement keyboard navigation in generic dropdown menus Partial port from ef7d64c80109074b39983b50cc8cf701c337cdcc to glitch-soc
2018-05-05[Glitch] Place emoji picker top if it is closer to the bottom of the viewportThibaut Girka
Port ad5d3134e406c2bcfceca6a1b7dd3dceb6ec1061 to glitch-soc
2018-05-04Escape metachars in keywordsDaggertooth
2018-05-04Add a light themeMarcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-05-04Better pagination for ActivityPub outbox (#7356)Eugen Rochko
2018-05-04Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: CONTRIBUTING.md
2018-05-04Merge branch 'merge-upstream' into gs-masterDavid Yip
2018-05-04Merge pull request #456 from m4sk1n/glitch-contrastDavid Yip
“Enable” high contrast theme
2018-05-04Improve “how to translate” (#7358)Marcin Mikołajczak
2018-05-04Add translate guide to CONTRIBUTING.md (#7355)Yamagishi Kazutoshi
2018-05-04“Enable” high contrast themeMarcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-04Remove duplicate posix-spawn entry from Gemfile.David Yip
2018-05-04Make posix-spawn spec in Gemfile match what's in Gemfile.lock.David Yip
2018-05-04Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: Gemfile.lock
2018-05-04Show remote reports in admin UI as coming from domain rather than user (#7347)Eugen Rochko
Fix #6994
2018-05-04Marginally improve convert/ffmpeg calls performance with posix-spawn (#7346)Eugen Rochko
2018-05-04Merge remote-tracking branch 'glitchsoc/master' into gs-masterDavid Yip
2018-05-04Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-05-04Merge pull request #453 from ThibG/glitch-soc/features/short-dateDavid Yip
[Glitch] Improve relative timestamps in web UI
2018-05-04Remove unused translations.David Yip
2018-05-04Remove unnecessary code from MediaAttachment#set_type_and_extension.David Yip
Well, it seems unnecessary, anyway.
2018-05-04Fix 2fa description in Japanese (#7349)Shuhei Kitagawa
2018-05-03Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml
2018-05-03Fixes/do not override timestamps (#7336)ThibG
* Revert "Fixes/do not override timestamps (#7331)" This reverts commit 581a5c9d29ef2a12f46b67a1097a9ad6df1c6953. * Document Snowflake ID corner-case a bit more Snowflake IDs are used for two purposes: making object identifiers harder to guess and ensuring they are in chronological order. For this reason, they are based on the `created_at` attribute of the object. Unfortunately, inserting items with older snowflakes IDs will break the assumption of consumers of the paging APIs that new items will always have a greater identifier than the last seen one. * Add `override_timestamps` virtual attribute to not correlate snowflake ID with created_at