| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2022-01-19 | Merge pull request #1662 from ClearlyClaire/glitch-soc/merge-upstream | Claire | |
| Merge upstream changes | |||
| 2022-01-19 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2022-01-19 | Fix NameError on ActivityPub::FetchFeaturedCollectionService (#17326) | Jeong Arm | |
| Related: #16954 | |||
| 2022-01-18 | Merge pull request #1660 from ↵ | Claire | |
| ClearlyClaire/glitch-soc/features/themes-multiple-packs Refactor glitch-soc's theme handling | |||
| 2022-01-17 | Please CodeClimate | Claire | |
| 2022-01-17 | Move controller theming code to concern | Claire | |
| 2022-01-17 | Fix `pinned` attribute not being set for private self-posts (#17304) | Claire | |
| 2022-01-17 | [Glitch] Add notifications for statuses deleted by moderators | Eugen Rochko | |
| Port front-end changes from 14f436c457560862fafabd753eb314c8b8a8e674 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> | |||
| 2022-01-17 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `app/views/admin/reports/show.html.haml`: Conflicts due to glitch-soc's theming system. | |||
| 2022-01-17 | Fix `pinned` attribute not being set for private self-posts | Claire | |
| 2022-01-17 | Add notifications for statuses deleted by moderators (#17204) | Eugen Rochko | |
| 2022-01-17 | [Glitch] Add support for private pinned posts | Claire | |
| Port JS changes from d5c9feb7b7fc489afbd0a287431fe07b42451ef0 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> | |||
| 2022-01-17 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `app/controllers/accounts_controller.rb`: Upstream introduced support for private pinned toots, but glitch-soc's query was a bit different as it filtered out local-only toots. Used upstream's query, while adding local-only filtering back. - `app/controllers/activitypub/collections_controller.rb`: Same thing with regards to local-only posts. - `app/validators/status_pin_validator.rb`: Not a real conflict, but the line below was different in glitch-soc due to the configurable pinned toots limit. | |||
| 2022-01-17 | Add support for private pinned posts (#16954) | Claire | |
| * Add support for private pinned toots * Allow local user to pin private toots * Change wording to avoid "direct message" | |||
| 2022-01-16 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2022-01-16 | Fix missing media: 'all' on default skins | Claire | |
| 2022-01-16 | Refactor theming HAML template a bit | Claire | |
| 2022-01-16 | Refactor theme config loading | Claire | |
| 2022-01-16 | Refactor some more | Claire | |
| 2022-01-16 | Refactor glitch-soc's theme handling | Claire | |
| 2022-01-16 | Fix admin interface crash when displaying deleted user (#17301) | Claire | |
| 2022-01-16 | [Glitch] Gradually increase retry waiting for media processing | Jeong Arm | |
| Port bc7a8ae6d6d2c2118e5c49add83539498b9d543b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> | |||
| 2022-01-16 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `README.md`: Upstream added some text, but our README is completely different. Kept our README unchanged. | |||
| 2022-01-16 | Remove IP tracking columns from users table (#16409) | Eugen Rochko | |
| 2022-01-10 | Gradually increase retry waiting for media processing (#17271) | Jeong Arm | |
| 2022-01-07 | [Glitch] Fix media descriptions not being used for client-side filtering | Claire | |
| Port 37e80994f81bdb07e31f1a55cd37c967822a1a2a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> | |||
| 2022-01-07 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-12-30 | Remove custom emojis on domain purge (#17210) | Jeong Arm | |
| 2021-12-28 | Fix media descriptions not being used for client-side filtering (#17206) | Claire | |
| Fix oversight in #13837 | |||
| 2021-12-27 | [Glitch] Fix tag rendering error in hashtag column settings | Rens Groothuijsen | |
| Port e65080181af82c14d3441a0890f2ba0a6fb9cd7e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> | |||
| 2021-12-27 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `README.md`: We have completely different contents. Kept our version. - `package.json`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `streaming/index.js`: Conflict due to code style changes on parts that were modified in glitch-soc to handle local-only toots. Changed style according to upstream. | |||
| 2021-12-27 | Fix warnings on Rails boot (#16946) | Eugen Rochko | |
| 2021-12-26 | Fix tag rendering error in hashtag column settings (#17184) | Rens Groothuijsen | |
| * Flatten tags in configuration to regular array before converting to JSON * Render filter tags using toJS instead of toJSON | |||
| 2021-12-21 | Fix duplicate record on admin/accounts when searching with IP (#17150) | Jeong Arm | |
| 2021-12-18 | [Glitch] Change title of retention chart | Claire | |
| Port 0c17fd91091fd2f230224d5fce218688d480502c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> | |||
| 2021-12-18 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| 2021-12-17 | Add ability for admins to delete canonical email blocks (#16644) | Claire | |
| * Add admin option to remove canonical email blocks from a deleted account * Add tootctl canonical_email_blocks to inspect and remove canonical email blocks | |||
| 2021-12-17 | Add ability to purge undeliverable domains from admin interface (#16686) | Claire | |
| * Add ability to purge undeliverable domains from admin interface * Add tests | |||
| 2021-12-17 | Change title of retention chart (#16909) | Claire | |
| Changes from “Retention” to “User retention rate by month after sign-up”. This should make it much clearer to people not familiar with retention charts what it actually means. | |||
| 2021-12-17 | Change list title input styling (#17092) | Claire | |
| 2021-12-16 | [Glitch] ignore hashtag suggestions if they vary only in case | David Sterry | |
| Port 2aafa5b4e7a83ce8195cd739f1233a52ab060db7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> | |||
| 2021-12-16 | [Glitch] Show correct error message if chosen password is too long | Rens Groothuijsen | |
| Port 66baa629ea1c3890d5c631099d41e6af14974d7e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> | |||
| 2021-12-16 | [Glitch] Add batch suspend for accounts in admin UI | Eugen Rochko | |
| Port SCSS changes from 2aafa5b4e7a83ce8195cd739f1233a52ab060db7 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> | |||
| 2021-12-16 | Merge branch 'main' into glitch-soc/merge-upstream | Claire | |
| Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system. | |||
| 2021-12-15 | ignore hashtag suggestions if they vary only in case (#16460) | David Sterry | |
| * ignore hashtag suggestions if they vary only in case * remove console.logs and unused args * consistently add space when dismissing suggestions * linting | |||
| 2021-12-13 | Fix follow recommendation biased towards older accounts (#17126) | Takeshi Umeda | |
| 2021-12-13 | Change trending hashtags threshold back from 15 to 5 (#17122) | Eugen Rochko | |
| 2021-12-05 | Fix redirection when succeeded WebAuthn (#17098) | heguro | |
| 2021-12-05 | Show correct error message if chosen password is too long (#17082) | Rens Groothuijsen | |
| * Add correct error message for exceeding max length on password confirmation field * Code style fixes | |||
| 2021-12-05 | Add batch suspend for accounts in admin UI (#17009) | Eugen Rochko | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |