Age | Commit message (Collapse) | Author | |
---|---|---|---|
2018-01-23 | Fix #6331 (#6341) | Eugen Rochko | |
UserTrackingConcern is circumvented by SessionsController#create because it calls warden, which calls the User#update_tracked_fields! method directly. Move returning user logic to that method. | |||
2018-01-22 | Rename ResolveRemoteAccountService to ResolveAccountService (#6327) | Akihiko Odaki | |
The service used to be named ResolveRemoteAccountService resolves local accounts as well. | |||
2018-01-19 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss | |||
2018-01-19 | Change belongs_to_required_by_default to true (#5888) | Yamagishi Kazutoshi | |
2018-01-18 | Replace tutorial modal with welcome e-mail (#6273) | Eugen Rochko | |
* Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations | |||
2018-01-15 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
2018-01-15 | Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252) | Eugen Rochko | |
2018-01-08 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
2018-01-08 | Revert #5772 (#6221) | Eugen Rochko | |
2018-01-04 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
2018-01-05 | Fix email confirmation link not updating email (#6187) | Patrick Figel | |
A change introduced in #6125 prevents `Devise::Models::Confirmable#confirm` from being called for existing users, which in turn leads to `email` not being set to `unconfirmed_email`, breaking email updates. This also adds a test that would've caught this issue. | |||
2018-01-03 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
2018-01-03 | Allow to dereference Follow object for ActivityPub (#5772) | Akihiko Odaki | |
* Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity | |||
2018-01-03 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
2018-01-02 | Add confirmation step for email changes (#6071) | Patrick Figel | |
* Add confirmation step for email changes This adds a confirmation step for email changes of existing users. Like the initial account confirmation, a confirmation link is sent to the new address. Additionally, a notification is sent to the existing address when the change is initiated. This message includes instruction to reset the password immediately or to contact the instance admin if the change was not initiated by the account owner. Fixes #3871 * Add review fixes | |||
2017-12-30 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
Conflicts: app/controllers/auth/confirmations_controller.rb | |||
2017-12-29 | Add more instance stats APIs (#6125) | Eugen Rochko | |
* Add GET /api/v1/instance/peers API to reveal known domains * Add GET /api/v1/instance/activity API * Make new APIs disableable, exclude private statuses from activity stats * Fix code style issue * Fix week timestamps | |||
2017-12-15 | Merge branch 'gs-master' into prevent-local-only-federation | David Yip | |
Conflicts: db/schema.rb | |||
2017-12-14 | Examples for Status#set_locality and .as_tag_timeline. | David Yip | |
This commit also: - exposes the local-only emoji so that it can be used in examples - allows local_only to be set explicitly, i.e. for timeline filtering specs | |||
2017-12-13 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
2017-12-13 | Add filters to admin UI for custom emojis (#6003) | Eugen Rochko | |
2017-12-13 | Clean up admin UI for accounts (#6004) | Eugen Rochko | |
* Add staff filter to admin UI for accounts, remove obsolete columns * Only display OStatus section in admin UI for accounts when OStatus data | |||
2017-12-12 | Merge remote-tracking branch 'tootsuite/master' into merge-upstream | David Yip | |
2017-12-12 | Change account_id non-nullable in lists (#5979) | Akihiko Odaki | |
2017-12-12 | Exclude moved accounts from search results (#5984) | Eugen Rochko | |
2017-12-11 | move outbox filtering to Status#permitted_for (as per @ekiru) | Erin | |
2017-12-10 | set local_only in a before_create callback instead of status service | Erin | |
2017-12-10 | remove vestigial Status#local_only? definition | Erin | |
2017-12-10 | Status#not_local_only scope should match nils too | Erin | |
2017-12-10 | filter local-only statuses from public pages | Erin | |
2017-12-10 | status: stub local_only?, add scope, add marked_local_only? | Erin | |
2017-12-10 | add a local_only column to the statuses table | Erin | |
2017-12-10 | Fix account and tag searches with leading/trailing spaces (#5965) | Andrea Scarpino | |
* Strip leading & trailing spaces from account query * Strip leading & trailing spaces from tag search | |||
2017-12-09 | add initial components based off of tootsuite pr #1507 | cwm | |
2017-12-09 | Limit users to 50 lists, remove pagination from lists API (#5933) | Eugen Rochko | |
2017-12-09 | Ensure link thumbnails are not stretched to super low quality (#5932) | Eugen Rochko | |
2017-12-07 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
2017-12-07 | Remove duplicate annotate (#5910) | Yamagishi Kazutoshi | |
* Remove duplicate annotate * Remove blank line | |||
2017-12-07 | Add embed_url to preview cards (#5775) | Akihiko Odaki | |
2017-12-06 | Merge pull request #229 from glitch-soc/glitch-theme | beatrix | |
Advanced Next-Level Flavours And Skins For Mastodon™ | |||
2017-12-06 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
2017-12-06 | Using double splat operator (#5859) | Yamagishi Kazutoshi | |
2017-12-06 | Remove rabl dependency (#5894) | Eugen Rochko | |
* Remove rabl dependency * Replicate old Oj configuration | |||
2017-12-05 | Lists redis clean-up (#5886) | Eugen Rochko | |
* When list is deleted, remove feed from redis * Clean up list feeds of inactive users | |||
2017-12-05 | Add list of lists component to web UI (#5811) | Eugen Rochko | |
* Add list of lists component to web UI * Add list adding * Add list removing * List editor modal * Add API account search limited by following=true relation * Rework list editor modal * Remove mandatory pagination of GET /api/v1/lists/:id/accounts * Adjust search input placeholder * Fix rspec (#5890) * i18n: (zh-CN) Add missing translations for #5811 (#5891) * i18n: (zh-CN) yarn manage:translations -- zh-CN * i18n: (zh-CN) Add missing translations for #5811 * Fix some issues - Display loading/missing state for list timelines - Order lists alphabetically in overview - Fix async list editor reset - Redirect to /lists after deleting unpinned list - Redirect to / after pinning a list * Remove dead list columns when a list is deleted or fetch returns 404 | |||
2017-12-04 | Merge branch 'gs-master' into glitch-theme | David Yip | |
2017-12-03 | Rename themes -> flavours ? ? | kibigo! | |
2017-12-02 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
2017-12-01 | Add invite filter (#5862) | Yamagishi Kazutoshi | |
2017-11-30 | Skins support | kibigo! | |