| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 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-03 | Allow HTTP caching of json view of public statuses (#6115) | ThibG | |
| * Allow HTTP caching of json view of public statuses HTML views are not cached as they can contain private statuses as well * Disable session cookies for ActivityPub json rendering of public toots | |||
| 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 | |||
| 2018-01-02 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss | |||
| 2018-01-02 | Show mastodon on modal (#6129) | Akihiko Odaki | |
| 2017-12-30 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: app/controllers/auth/confirmations_controller.rb | |||
| 2017-12-30 | keep the same filters and page when doing custom emojo stuff (fixes #6112) ↵ | beatrix | |
| (#6114) | |||
| 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-27 | Make host_meta/webfinger replies cacheable (fixes #6100) (#6101) | ThibG | |
| * Make host_meta/webfinger replies cacheable (fixes #6100) Drop common code for handling users and sessions as webfinger queries are very basic, public APIs. Also explicitly mark results as cacheable with “expires_in”. * Add “Vary: Accept” header for caching since content-negociation is used | |||
| 2017-12-20 | Set packs on 2FA-related pages. Fixes #271. | David Yip | |
| Specifically, this commit: - changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from S::BaseController, because this gives us the necessary actions and packs - prepends set_pack to Auth::SessionsController's action chain so that it takes effect in time for render :two_factor | |||
| 2017-12-15 | Merge branch 'gs-master' into prevent-local-only-federation | David Yip | |
| Conflicts: db/schema.rb | |||
| 2017-12-15 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2017-12-14 | Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026) | Eugen Rochko | |
| 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 | Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983) | Eugen Rochko | |
| 2017-12-11 | change pack to 'auth' | cwm | |
| 2017-12-11 | load pack | cwm | |
| 2017-12-11 | move outbox filtering to Status#permitted_for (as per @ekiru) | Erin | |
| 2017-12-11 | Merge pull request #254 from glitch-soc/new-theme-ux | beatrix | |
| New flavour/skin UX | |||
| 2017-12-11 | Apply a 25x rate limit by IP even to authenticated requests (#5948) | Eugen Rochko | |
| 2017-12-11 | Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController. | David Yip | |
| 2017-12-10 | Moved flavour UI into own prefs tab | kibigo! | |
| 2017-12-10 | filter local-only toots from AP outboxes | Erin | |
| 2017-12-10 | filter local-only statuses from public pages | Erin | |
| 2017-12-10 | pulled master, moved locale entry to new location | cwm | |
| 2017-12-10 | Javascript intl8n flavour support | kibigo! | |
| 2017-12-09 | Remove unused function (#5950) | abcang | |
| 2017-12-09 | add initial components based off of tootsuite pr #1507 | cwm | |
| 2017-12-09 | Rate limit by user instead of IP when API user is authenticated (#5923) | Eugen Rochko | |
| * Fix #668 - Rate limit by user instead of IP when API user is authenticated * Fix code style issue * Use request decorator provided by Doorkeeper | |||
| 2017-12-09 | Keep WebPush settings (#5879) | abcang | |
| 2017-12-09 | Limit users to 50 lists, remove pagination from lists API (#5933) | Eugen Rochko | |
| 2017-12-07 | Skins shouldn't apply to fallback flavours | kibigo! | |
| 2017-12-06 | Fix common packs when other pack also there | kibigo! | |
| 2017-12-06 | Use settings pack for InvitesController (#229) | David Yip | |
| 2017-12-06 | Merge pull request #229 from glitch-soc/glitch-theme | beatrix | |
| Advanced Next-Level Flavours And Skins For Mastodon™ | |||
| 2017-12-06 | Prepend check_enabled_deletion to Settings::DeletesController (#229) | David Yip | |
| The specs for Settings::DeletesController include an example that sets Settings.open_deletion to false and expects the "if deletion is not available, redirect to root" logic to run. However, this spec does not set up a user, which means that the spec (intentionally or otherwise) expects this redirection to work with unauthenticated access. We should preserve that behavior. To do so, we prepend the deletion check to the action chain set up by Settings::BaseController, so that said check occurs before the authenticate_user! check. | |||
| 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 | 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 | Various fixes | kibigo! | |
| 2017-12-04 | Merge branch 'gs-master' into glitch-theme | David Yip | |
| 2017-12-03 | Rename themes -> flavours ? ? | kibigo! | |
| 2017-12-03 | Fixed typos | kibigo! | |
| 2017-12-02 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |