| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2018-02-11 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-02-10 | Merge remote-tracking branch 'origin/merge-upstream' | David Yip | |
| 2018-02-10 | Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234. | David Yip | |
| The class helps out with keyword mutes, not just some general concept of "filtering". | |||
| 2018-02-10 | Strip HTML from keyword mute input. #234. | David Yip | |
| 2018-02-09 | Full-text search for authorized statuses (#6423) | Eugen Rochko | |
| * Add full-text search for authorized statuses - Search API will return statuses that match the query - Only for logged in users - Only if you are author of the status, - Or you were mentioned in it - Or you favourited or reblogged it - Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX` - Run `rails chewy:deploy` to create & populate index Fix #5880 Fix #4293 Fix #1152 * Add commented out docker-compose configuration for ES container * Optimize index import, filter search results * Add basic normalization to the index * Add better stemming and normalization to the index * Skip webfinger request if search query includes both @ and a space * Fix code style * Visually separate search result sections * Fix code style issues | |||
| 2018-02-09 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml | |||
| 2018-02-09 | Add preference to always display sensitive media (#6448) | Eugen Rochko | |
| 2018-02-02 | Merge remote-tracking branch 'tootsuite/master' into merge-upstream | David Yip | |
| Conflicts: app/javascript/styles/mastodon/components.scss | |||
| 2018-02-02 | Accept ActivityPub announce from the author of the original note (#6236) | Akihiko Odaki | |
| 2018-01-24 | remove escapes from server-side γaml handler | codl | |
| this matches a change that was made in the client-side equivalent | |||
| 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 | Process mentions and reblogs even from resolved threads (#6299) | ThibG | |
| This may lead to out-of-order notifications, but this is better than not having notifications at all. | |||
| 2018-01-09 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: db/schema.rb | |||
| 2018-01-09 | Skip ActivityPub Announces of non-public objects (#6230) | Eugen Rochko | |
| * Skip ActivityPub Announces of non-public objects * Skip OStatus reblogs of non-public statuses | |||
| 2018-01-09 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-01-09 | Add the author of a status to cc if reblogged (#6226) | puckipedia | |
| This makes slightly more sense, and ensures that the author of a post is always referenced in the audience (which some servers might rely on). And the announce is POSTed to the author's inbox anyways. | |||
| 2018-01-08 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-01-08 | Revert #5772 (#6221) | Eugen Rochko | |
| 2018-01-08 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-01-08 | Fix bad URL schemes being accepted (#6219) | Eugen Rochko | |
| * Fix actors accepting invalid URI schemes or different host between URI and URL * Fix statuses accepting invalid URI scheme or different host to actor * Adjust tests to new requirements * Improve readability of mismatching_origin?/invalid_origin? methods | |||
| 2018-01-08 | Move Article from supported to converted types (#6218) | puckipedia | |
| 2018-01-03 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2018-01-03 | Don't normalize URLs in toots (#6134) | ThibG | |
| * Don't normalize URLs in toots URL normalization is ill-defined and may cause certain links to break. * Change specs since we are not normalizing user-provided URLs | |||
| 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 | [!] Sanitize incoming classlist properly (#6162) | puckipedia | |
| * Sanitize classlist properly * Actually properly sanitize every class after the first * Improve Formatter spec to check for multiple classes and non-space whitespace | |||
| 2018-01-03 | Don't leave behind husk of remotely-deleted profile (#6159) | Eugen Rochko | |
| There's no reason for an Account record to persist after Delete->Actor is received. SuspendAccountService is necessary to make sure deleted toots get sent over streaming API properly and home feeds get cleaned up. By removing Account record, we can ensure that if in the future the account is restored remotely (or username reused), it can start with a clean slate. | |||
| 2018-01-02 | Fix stats expiring too quickly because of variable mistake (#6155) | Eugen Rochko | |
| 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-26 | Merge remote-tracking branch 'origin/master' into merge-upstream | David Yip | |
| Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss | |||
| 2017-12-27 | Fix XML oEmbed support discovery (#6104) | Akihiko Odaki | |
| 2017-12-15 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2017-12-15 | Do not hide statuses from silenced accounts from other silenced accounts (#6030) | Eugen Rochko | |
| 2017-12-13 | Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master | Jenkins | |
| 2017-12-13 | Fix redundant HTTP request in FetchLinkCardService (#6002) | Eugen Rochko | |
| 2017-12-12 | Merge remote-tracking branch 'tootsuite/master' into merge-upstream | David Yip | |
| 2017-12-10 | Screenshot support for themes | kibigo! | |
| 2017-12-10 | pulled master, moved locale entry to new location | cwm | |
| 2017-12-10 | Javascript intl8n flavour support | kibigo! | |
| 2017-12-10 | Save media outside transaction (#5959) | abcang | |
| 2017-12-09 | fixed fav setting change | cwm | |
| 2017-12-09 | added a few more things | cwm | |
| 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-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! | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |