| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2019-02-17 | Bump version to 2.7.2 (#10067) | Eugen Rochko | |
| 2019-01-28 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - README.md: kept our version | |||
| 2019-01-28 | Bump version to 2.7.1 (#9932) | Eugen Rochko | |
| 2019-01-27 | Fix SUPERUSER postgres command (#9877) | Stanislas | |
| 2019-01-20 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2019-01-20 | Fix `tootctl accounts delete` not deleting user record as well (#9874) | Eugen Rochko | |
| 2019-01-20 | Bump version to 2.7.0 | Eugen Rochko | |
| 2019-01-19 | Add translators to AUTHORS.md (#9865) | Eugen Rochko | |
| 2019-01-19 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| No conflicts. | |||
| 2019-01-19 | Change CHANGELOG.md references from pull requests to authors (#9864) | Eugen Rochko | |
| Add `rake repo:changelog` to do that automatically | |||
| 2019-01-19 | Bump to 2.7.0rc3 | Eugen Rochko | |
| 2019-01-18 | Bump version to 2.7.0rc2 (#9836) | Eugen Rochko | |
| 2019-01-17 | Add `tootctl --version` (#9835) | Eugen Rochko | |
| 2019-01-16 | Fix `tootctl domains crawl` with JSON format output crash (#9820) | Eugen Rochko | |
| Fix #9817 | |||
| 2019-01-16 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - config/locales/simple_form.pl.yml | |||
| 2019-01-15 | Add `tootctl domains crawl` (#9809) | Eugen Rochko | |
| 2019-01-10 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close. | |||
| 2019-01-08 | Bump version to 2.7.0rc1 (#9718) | Eugen Rochko | |
| 2019-01-02 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock | |||
| 2019-01-01 | Add tootctl accounts follow ACCT (#9414) | Eugen Rochko | |
| Fix #9369 | |||
| 2018-12-24 | Add REST API for creating an account (#9572) | Eugen Rochko | |
| * Add REST API for creating an account The method is available to apps with a token obtained via the client credentials grant. It creates a user and account records, as well as an access token for the app that initiated the request. The user is unconfirmed, and an e-mail is sent as usual. The method returns the access token, which the app should save for later. The REST API is not available to users with unconfirmed accounts, so the app must be smart to wait for the user to click a link in their e-mail inbox. The method is rate-limited by IP to 5 requests per 30 minutes. * Redirect users back to app from confirmation if they were created with an app * Add tests * Return 403 on the method if registrations are not open * Require agreement param to be true in the API when creating an account | |||
| 2018-12-24 | Update emoji codepoint mappings to v11.0 (#9618) | Eugen Rochko | |
| 2018-12-19 | Override current_user when generating static pages | Thibaut Girka | |
| 2018-12-18 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/controllers/admin/base_controller.rb Some refactoring made upstream, no real conflict. - app/javascript/mastodon/features/compose/components/compose_form.js Updated using upstream's code but using maxChars instead of the hardcoded length of 500 characters per toot. - app/javascript/styles/mastodon/components.scss Upstream redesigned the onboarding modal. Not sure why we had a conflict there. | |||
| 2018-12-18 | Fix tootctl accounts rotate not updating public keys (#9556) | Eugen Rochko | |
| This allowed you to brick your system when running that command, because the accounts would continue to advertise the old public key, but sign things with the new one | |||
| 2018-12-06 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-12-03 | Improve account suspension speed and completeness (#9290) | Eugen Rochko | |
| - Some associations were missing from the clean-up - Some attributes were not reset on suspension - Skip federation and streaming deletes when purging a dead domain - Move account association definitions to concern | |||
| 2018-12-02 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-12-02 | Bump version to 2.6.5 (#9413) | Eugen Rochko | |
| 2018-12-02 | Preload common JSON-LD contexts (#9412) | ThibG | |
| Fixes #9411 | |||
| 2018-12-01 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-11-30 | Bump version to 2.6.4 (#9402) | Eugen Rochko | |
| 2018-11-30 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-11-30 | Bump version to 2.6.3 (#9391) | Eugen Rochko | |
| 2018-11-27 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-11-27 | Bump version to 2.6.2 (#9370) | Eugen Rochko | |
| 2018-11-27 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other). | |||
| 2018-11-20 | Touch account on successful response, change char shown when culled (#9293) | Renato "Lond" Cerqueira | |
| Just the color is not enough change since not everyone uses colored terminals. Touching the account makes it so that the account is not in the threshold window in case of running again | |||
| 2018-11-16 | Fix "tootctl media remove" can't count the file size (#9288) | mayaeh | |
| * Fixed an issue where "tootctl media remove" can not count the file size. * Fixed the problem pointed out by codeclimate. | |||
| 2018-11-09 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-11-08 | Fix nil error regression from #9229 in tootctl media remove (#9239) | Eugen Rochko | |
| Fix #9237 | |||
| 2018-11-08 | Display amount of freed disk space in tootctl media remove (#9229) | Eugen Rochko | |
| * Display amount of freed disk space in tootctl media remove Fix #9213 * Fix code style issue | |||
| 2018-10-31 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-10-31 | Bump version to 2.6.1 (#9172) | Eugen Rochko | |
| 2018-10-30 | Bump version to 2.6.0 (#9149) | Eugen Rochko | |
| * Bump version to 2.6.0 * Update CHANGELOG.md | |||
| 2018-10-30 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream. | |||
| 2018-10-30 | Bump version to 2.6.0rc4 (#9164) | Eugen Rochko | |
| * Bump version to 2.6.0rc4 * Update CHANGELOG.md | |||
| 2018-10-29 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
| 2018-10-29 | Bump version to 2.6.0rc3 (#9142) | Eugen Rochko | |
| * Bump version to 2.6.0rc3 * Update CHANGELOG.md | |||
| 2018-10-28 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |