Age | Commit message (Collapse) | Author | |
---|---|---|---|
2019-04-21 | Configrationable repository url (#10600) | Sho Kusano | |
* config: Add GITHUB_REPOSITORY for repository name * config: Add SOURCE_BASE_URL for repository url * Show source_url and repository name on getting started | |||
2019-04-16 | add env var for max length of audio uploads | Izalia Mae | |
2019-04-11 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
2019-04-10 | Bump version to 2.8.0 (#10550) | Eugen Rochko | |
2019-04-10 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
Conflicts: - app/views/admin/pending_accounts/index.html.haml No real conflict, upstream changes too close to glitch-specific theming system changes. - config/navigation.rb Upstream redesigned the settings navigation, took those changes and re-inserted the flavours menu. | |||
2019-04-10 | Bump version to 2.8.0rc3 (#10535) | Eugen Rochko | |
2019-04-09 | Bump version to 2.8.0rc2 (#10501) | Eugen Rochko | |
2019-04-08 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings. | |||
2019-04-08 | Add `tootctl accounts reset-relationships` (#10483) | Takeshi Umeda | |
* Add `tootctl accounts reset` * Rename reset to reset-relationships * Improve command description | |||
2019-04-06 | Fix missing long description on `tootctl statuses remove` (#10482) | Eugen Rochko | |
2019-04-06 | Add `tootctl emoji purge` (#10481) | Eugen Rochko | |
Fix #10441 | |||
2019-04-06 | Add `tootctl accounts approve` (#10480) | Eugen Rochko | |
2019-04-04 | Fix `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-01 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml | |||
2019-04-01 | Simplify culling and fix race condition (#10440) | Jeong Arm | |
2019-03-30 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
2019-03-30 | Bump version to 2.8.0rc1 (#10340) | Eugen Rochko | |
Update AUTHORS.md Update CHANGELOG.md | |||
2019-03-28 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
2019-03-28 | Add `tootctl self-destruct` (#10367) | Eugen Rochko | |
Fix #10305 | |||
2019-03-28 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml | |||
2019-03-28 | Add `tootctl search deploy` to avoid ugly rake task syntax (#10403) | Eugen Rochko | |
2019-03-14 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change. | |||
2019-03-14 | Admission-based registrations mode (#10250) | Eugen Rochko | |
Fix #6856 Fix #6951 | |||
2019-03-11 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
2019-03-11 | Add `tootctl statuses remove` to sweep unreferenced statuses (#10063) | Eugen Rochko | |
Query by @tateisu Fix #1554 | |||
2019-03-05 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns. | |||
2019-03-05 | Bump version to 2.7.4 (#10179) | Eugen Rochko | |
2019-02-26 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut 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-23 | Bump version to 2.7.3 (#10102) | Eugen Rochko | |
2019-02-19 | Merge branch 'master' into glitch-soc/merge-upstream | Thibaut Girka | |
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 |