| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2018-06-24 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-06-24 | Add tests for remote_unfollows_controller (#7879) | Shuhei Kitagawa | |
| 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-21 | Add missing tests for confirmations controller (#7866) | Shuhei Kitagawa | |
| 2018-06-18 | Add tests for shares_controller (#7835) | Shuhei Kitagawa | |
| 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-14 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-06-14 | Add tests for following accounts controller (#7800) | Shuhei Kitagawa | |
| 2018-06-13 | Add tests for followers_accounts_controller (#7794) | Shuhei Kitagawa | |
| 2018-06-12 | Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions | David Yip | |
| 2018-06-12 | keyword mute: Add missing scope for regex escape test | David Yip | |
| 2018-06-12 | keyword mute: use mentions scope in home feed filtering (#454) | David Yip | |
| If a status shows up in mentions because all keyword mutes that might apply to it are marked as "don't apply to mentions", then it ought to show up in the home feed also. | |||
| 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-12 | Add missing tests for admin/accounts_controller (#7791) | Shuhei Kitagawa | |
| 2018-06-09 | Add tests for intents_controller (#7763) | Shuhei Kitagawa | |
| 2018-06-09 | Fix domain hiding logic (#7765) | Eugen Rochko | |
| * Send rejections to followers when user hides domain they're on * Use account domain blocks for "authorized followers" action Replace soft-blocking (block & unblock) behaviour with follow rejection * Split sync and async work of account domain blocking Do not create domain block when removing followers by domain, that is probably unexpected from the user's perspective. * Adjust confirmation message for domain block * yarn manage:translations | |||
| 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-06 | Add missing tests for sessions controller (#7744) | Shuhei Kitagawa | |
| 2018-06-05 | Escape metacharacters in non-whole-word keyword mutes. Fixes #533. | David Yip | |
| Also addresses #463. | |||
| 2018-06-03 | Add a FeedManager example demonstrating non-mention keywords. #454. | David Yip | |
| 2018-06-03 | Fix spacing in some FeedManager examples. | David Yip | |
| 2018-06-03 | Thread scopes through #matches?. #454. | David Yip | |
| Also add an apply_to_mentions attribute on Glitch::KeywordMute, which is used to calculate scope. Next up: additions to the test suite to demonstrate how scoping works. | |||
| 2018-06-04 | Add tests for embeds controller (#7719) | Shuhei Kitagawa | |
| * Small refactoring of status_finder_spec * Add tests for embeds_controller | |||
| 2018-06-02 | Merge remote-tracking branch 'origin/master' into gs-master | David Yip | |
| Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours. | |||
| 2018-06-02 | Add tests for migrations_controller (#7707) | Shuhei Kitagawa | |
| 2018-05-31 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-05-30 | Improve counter caches on Status and Account (#7644) | Eugen Rochko | |
| Do not touch statuses_count on accounts table when mass-destroying statuses to reduce load when removing accounts, same for reblogs_count and favourites_count Do not count statuses with direct visibility in statuses_count Fix #828 | |||
| 2018-05-29 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-05-28 | Add a test for emojis_controller (#7652) | Shuhei Kitagawa | |
| 2018-05-28 | optimize direct timeline (#7614) | tateisu | |
| * optimize direct timeline * fix typo in class name * change filter condition for direct timeline * fix codestyle issue * revoke index_accounts_not_silenced because direct timeline does not use it. * revoke index_accounts_not_silenced because direct timeline does not use it. * fix rspec test condition. * fix rspec test condition. * fix rspec test condition. * revoke adding column and partial index * (direct timeline) move merging logic to model * fix pagination parameter * add method arguments that switches return array of status or cache_ids * fix order by * returns ActiveRecord.Relation in default behavor * fix codestyle issue | |||
| 2018-05-23 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-05-23 | Fix tests for invites controller (regression from ↵ | Yamagishi Kazutoshi | |
| 4d81809f36fcbfe787e23d490f2cb0ad943ab32c) (#7597) | |||
| 2018-05-22 | Add tests for report notes controller (#7589) | Shuhei Kitagawa | |
| 2018-05-19 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: config/locales/simple_form.ja.yml | |||
| 2018-05-19 | Ensure push subscription is immediately removed when application is revoked ↵ | Eugen Rochko | |
| (#7548) * Ensure push subscription is immediately removed when application is revoked * When token is revoked from app, unsubscribe too | |||
| 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 | Resolve unknown status from Add activity, skip Remove if unknown (#7526) | Eugen Rochko | |
| Fix #7518 | |||
| 2018-05-17 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-05-17 | Add tests for account_moderation_notes_controller (#7524) | Shuhei Kitagawa | |
| 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-11 | Add tests for invites controller (#7441) | Shuhei Kitagawa | |
| * Add tests for invites controller * Small refactoring and fix for invites controller | |||
| 2018-05-11 | Add REST API for Web Push Notifications subscriptions (#7445) | Eugen Rochko | |
| - POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods) | |||
| 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-09 | Disable simplecov on CircleCI (#7416) | Yamagishi Kazutoshi | |
| * Disable simplecov on CircleCI * Remove --format progress | |||
| 2018-05-09 | Add tests for admin/roles_controller (#7421) | Shuhei Kitagawa | |
| 2018-05-09 | Add tests for admin/invites_controller (#7412) | Shuhei Kitagawa | |
| 2018-05-08 | Take the first recognized actor_type. (#7410) | Surinna Curtis | |
| 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 | Port travis_retry for CI (#7379) | Yamagishi Kazutoshi | |
| * Port travis_retry for CI * Add license | |||
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |