| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2018-06-21 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields | |||
| 2018-06-17 | Allow selecting default posting language instead of auto-detect (#7828) | Eugen Rochko | |
| * Allow selecting default posting language instead of auto-detect * Enable default language setting in credentials API * Fix form saving | |||
| 2018-06-17 | Change language opt-out to language opt-in (#7823) | Eugen Rochko | |
| * Switch filtered_languages to chosen_languages * Adjust interface * Remove unused translations | |||
| 2018-06-15 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though… | |||
| 2018-06-15 | Add autofollow option to invites (#7805) | Eugen Rochko | |
| * Add autofollow option to invites * Trigger CodeClimate rebuild | |||
| 2018-06-12 | Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions | David Yip | |
| 2018-06-12 | Merge remote-tracking branch 'glitchsoc/master' into ↵ | David Yip | |
| 454-allow-keyword-mutes-to-skip-mentions Conflicts: app/models/glitch/keyword_mute.rb | |||
| 2018-06-12 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-06-09 | Merge pull request #506 from ThibG/glitch-soc/fixes/static-500 | David Yip | |
| Hardcode default skin/theme in error layout (fixes #373) | |||
| 2018-06-07 | Add "Edit profile" link to public profile page, increase bottom padding (#7754) | Eugen Rochko | |
| 2018-06-07 | Merge remote-tracking branch 'tootsuite/master' into merge-upstream | David Yip | |
| Conflicts: app/models/status.rb The conflict in the Status model was due to https://github.com/tootsuite/mastodon/commit/5bf500338478f819a65d25636a0af61a482972d3. It was resolved by accepting tootsuite's changes. | |||
| 2018-06-04 | Remove unnecessary underline on accounts table (#7728) | Yamagishi Kazutoshi | |
| 2018-06-04 | Add apply-to-mentions option to keyword mute UI. #454. | David Yip | |
| 2018-05-31 | Hardcode default skin/theme in error layout (fixes #373) | Thibaut Girka | |
| This is a bit hackish. The best way would simply to somehow use Mastodon's ApplicationController with `use_pack 'error'` from the Rake task, but I'm not sure how to do that. | |||
| 2018-05-21 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-05-21 | Display only domain of report account if remote under comment (#7574) | Eugen Rochko | |
| 2018-05-19 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: config/locales/simple_form.ja.yml | |||
| 2018-05-19 | Disables autocorrect/autocapitalize on remote username field. (#7549) | Ash Furrow | |
| 2018-05-19 | In footer, replace text "Mastodon" with logo (#7545) | Eugen Rochko | |
| 2018-05-18 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml | |||
| 2018-05-18 | Add preference to hide following/followers lists (#7532) | Eugen Rochko | |
| * Add preference to hide following/followers lists - Public pages - ActivityPub collections (does not return pages but does give total) - REST API (unless it's your own) (does not federate) Fix #6901 * Add preference * Add delegation * Fix issue * Fix issue | |||
| 2018-05-14 | Merge branch 'master' into glitch-soc/merge | Thibaut Girka | |
| 2018-05-12 | Merge pull request #480 from ThibG/glitch-soc/fixes/glitch-soc-bio-escape | ThibG | |
| Fix glitch-style bio fields incorrect HTML escaping in public profiles | |||
| 2018-05-12 | Fix glitch-style bio fields incorrect HTML escaping in public profiles | Thibaut Girka | |
| 2018-05-12 | Improvements to toots display in admin view (#7452) | ThibG | |
| * Distinguish boosts from original statuses in the admin panel (fixes #7449) * Show the “show more” button in admin view to make CWs clearer (fixes #7451) * Make content warnings swag | |||
| 2018-05-11 | Merge branch 'master' into glitch-soc/merge | Thibaut Girka | |
| Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml | |||
| 2018-05-10 | Strip tags from og:description on public tag page (#7437) | Yamagishi Kazutoshi | |
| 2018-05-10 | Add alternate for RSS (#7436) | Yamagishi Kazutoshi | |
| 2018-05-10 | Merge branch 'master' into glitch-soc/master | Thibaut Girka | |
| Conflicts: app/models/account.rb app/views/accounts/_header.html.haml | |||
| 2018-05-08 | Show media modal on public timeline (#7413) | Yamagishi Kazutoshi | |
| 2018-05-07 | Bot nameplates (#7391) | Eugen Rochko | |
| * Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues | |||
| 2018-05-06 | Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items | beatrix | |
| Support upstream bio items / custom account fields | |||
| 2018-05-06 | Enable custom emojis in profiles (notes, field values, display names) (#7374) | Eugen Rochko | |
| Follow-up to #6124 | |||
| 2018-05-06 | Add resend confirmation for admin (#7378) | Shuhei Kitagawa | |
| * Add confirmations_controller#resend * Add tests for confirmations_controller#resend * Add translations | |||
| 2018-05-06 | Add hint about 7 day cooldown for archive takeout (#7375) | Eugen Rochko | |
| 2018-05-06 | Add contact e-mail hint to 2FA login form (#7376) | Eugen Rochko | |
| 2018-05-05 | Improve admin UI for accounts (#7360) | Eugen Rochko | |
| * Improve design of account statuses admin UI (consistent with reports) * Make account moderation notes look consistent with report notes * i18n-tasks remove-unused * Fix code style issues * Fix tests | |||
| 2018-05-05 | Improve rendering of bio fields (#7353) | Eugen Rochko | |
| Fix #7335 | |||
| 2018-05-04 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: Gemfile.lock | |||
| 2018-05-04 | Show remote reports in admin UI as coming from domain rather than user (#7347) | Eugen Rochko | |
| Fix #6994 | |||
| 2018-05-03 | Merge remote-tracking branch 'origin/master' into gs-master | David 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-02 | Serialize webfinger XML with Ox instead of Nokogiri (#7319) | Eugen Rochko | |
| 25ms -> 0.5ms | |||
| 2018-04-30 | Fix "Show more" URL on paginated threads for remote statuses (#7285) | Eugen Rochko | |
| * Fix URL of "Show more" link in paginated threads (ancestors side) Increase item limits in threads Fix #7268 * Fix "Show more" link in paginated threads (descendants side) | |||
| 2018-04-29 | Implement tootsuite-style account fields | Thibaut Girka | |
| glitch-soc-style still in backup, both sharing the same SCSS style | |||
| 2018-04-23 | Paginate descendant statuses in public page (#7148) | Akihiko Odaki | |
| 2018-04-20 | Improve report layout (#7188) | Eugen Rochko | |
| * Use table for statuses in report * Display reported account and reporter in the same table * Split accounts and general report info into two tables again * Redesign report statuses table, notes, merge notes and action log * Remove unused translations * Fix code style issue * Fix code style issue * Fix code style issue | |||
| 2018-04-20 | Replace preload link tag to Rails helper (#7192) | Yamagishi Kazutoshi | |
| 2018-04-19 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-04-19 | Reports: Merge contents and comment columns (#7189) | Emelia Smith | |
| 2018-04-18 | Merge remote-tracking branch 'origin/master' into gs-master | David 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 | |||
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |