about summary refs log tree commit diff
path: root/lib
AgeCommit message (Collapse)Author
2019-04-09Bump version to 2.8.0rc2 (#10501)Eugen Rochko
2019-04-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.
2019-04-08Add `tootctl accounts reset-relationships` (#10483)Takeshi Umeda
* Add `tootctl accounts reset` * Rename reset to reset-relationships * Improve command description
2019-04-06Fix missing long description on `tootctl statuses remove` (#10482)Eugen Rochko
2019-04-06Add `tootctl emoji purge` (#10481)Eugen Rochko
Fix #10441
2019-04-06Add `tootctl accounts approve` (#10480)Eugen Rochko
2019-04-04Fix `tootctl accounts cull` (#10460)Ben Lubar
* List the actual accounts that would have been culled during a dry run. Otherwise, the dry run mode is basically useless. * Prevent unreachable domains from inheriting the previous status code. * Update CHANGELOG.md for #10460.
2019-04-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml
2019-04-01Simplify culling and fix race condition (#10440)Jeong Arm
2019-03-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-30Bump version to 2.8.0rc1 (#10340)Eugen Rochko
Update AUTHORS.md Update CHANGELOG.md
2019-03-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-28Add `tootctl self-destruct` (#10367)Eugen Rochko
Fix #10305
2019-03-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml
2019-03-28Add `tootctl search deploy` to avoid ugly rake task syntax (#10403)Eugen Rochko
2019-03-14Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.
2019-03-14Admission-based registrations mode (#10250)Eugen Rochko
Fix #6856 Fix #6951
2019-03-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-11Add `tootctl statuses remove` to sweep unreferenced statuses (#10063)Eugen Rochko
Query by @tateisu Fix #1554
2019-03-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.
2019-03-05Bump version to 2.7.4 (#10179)Eugen Rochko
2019-02-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Dockerfile Took upstream version and reverted f13ebd02c91776ddb88b5178bf9015c6e0f1ca80. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.
2019-02-23Bump version to 2.7.3 (#10102)Eugen Rochko
2019-02-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-02-17Bump version to 2.7.2 (#10067)Eugen Rochko
2019-01-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - README.md: kept our version
2019-01-28Bump version to 2.7.1 (#9932)Eugen Rochko
2019-01-27Fix SUPERUSER postgres command (#9877)Stanislas
2019-01-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-20Fix `tootctl accounts delete` not deleting user record as well (#9874)Eugen Rochko
2019-01-20Bump version to 2.7.0Eugen Rochko
2019-01-19Add translators to AUTHORS.md (#9865)Eugen Rochko
2019-01-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
No conflicts.
2019-01-19Change CHANGELOG.md references from pull requests to authors (#9864)Eugen Rochko
Add `rake repo:changelog` to do that automatically
2019-01-19Bump to 2.7.0rc3Eugen Rochko
2019-01-18Bump version to 2.7.0rc2 (#9836)Eugen Rochko
2019-01-17Add `tootctl --version` (#9835)Eugen Rochko
2019-01-16Fix `tootctl domains crawl` with JSON format output crash (#9820)Eugen Rochko
Fix #9817
2019-01-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/simple_form.pl.yml
2019-01-15Add `tootctl domains crawl` (#9809)Eugen Rochko
2019-01-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut 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-08Bump version to 2.7.0rc1 (#9718)Eugen Rochko
2019-01-02Merge branch 'master' into glitch-soc/merge-upstreamThibaut 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-01Add tootctl accounts follow ACCT (#9414)Eugen Rochko
Fix #9369
2018-12-24Add 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-24Update emoji codepoint mappings to v11.0 (#9618)Eugen Rochko
2018-12-19Override current_user when generating static pagesThibaut Girka
2018-12-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut 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-18Fix 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-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
generated by cgit-pink (git 2.37.1) at 2024-11-30 02:40:33 +0000