about summary refs log tree commit diff
path: root/lib
AgeCommit message (Collapse)Author
2019-05-21Add support for standard GIFs (under 200 KB)multiple creatures
2019-05-21Handle more audio formats, only converting formats not supported by HTML5 audiomultiple creatures
2019-05-21Plain AAC audio uploads live again. -DTmultiple creatures
2019-05-15Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-14Record account suspend/silence time and keep track of domain blocks (#10660)ThibG
* Record account suspend/silence time and keep track of domain blocks * Also unblock users who were suspended/silenced before dates were recorded * Add tests * Keep track of suspending date for users suspended through the CLI * Show accurate number of accounts that would be affected by unsuspending an instance * Change migration to set silenced_at and suspended_at * Revert "Also unblock users who were suspended/silenced before dates were recorded" This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c. * Switch from using suspended and silenced to suspended_at and silenced_at * Add post-deployment migration script to remove `suspended` and `silenced` columns * Use Account#silence! and Account#suspend! instead of updating the underlying property * Add silenced_at and suspended_at migration to post-migration * Change account fabricator to translate suspended and silenced attributes * Minor fixes * Make unblocking domains always retroactive
2019-05-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/controllers/statuses_controller.rb minor conflict because of glitch-soc's theming system - app/controllers/stream_entries_controller.rb minor conflict because of glitch-soc's theming system
2019-05-09Remove custom emojis on "tootctl domains purge" (#10721)Jeong Arm
* Remove custom emojis on domains purge * Change message "Removing" to "Removed"
2019-05-05Bump version to 2.8.2 (#10703)Eugen Rochko
2019-05-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-04Add SOURCE_TAG to show source repository's tag (#10698)Ushitora Anqou
2019-05-04Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/media_attachment.rb
2019-05-04Add `tootctl cache clear` (#10689)Eugen Rochko
2019-05-04Bump version to 2.8.1 (#10687)Eugen Rochko
2019-05-03Fix accounts created through tootctl not being always pre-approved (#10684)Eugen Rochko
Add `--approve` option to `tootctl accounts modify`
2019-04-27Add blurhash (#10630)Eugen Rochko
* Add blurhash * Use fallback color for spoiler when blurhash missing * Federate the blurhash and accept it as long as it's at most 5x5 * Display unknown media attachments as blurhash placeholders * Improve style of embed actions and spoiler button * Change blurhash resolution from 3x3 to 4x4 * Improve dependency definitions * Fix code style issues
2019-04-22Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/javascript/mastodon/features/compose/components/compose_form.js Upstream cleaned up a bit, including on lines in which we replaced the hardcoded 500 character limit with a maxChar constant. Applied the changes while keeping maxChar instead of 500. - app/javascript/packs/public.js Moved upstream's new animated avatar hover handling in app/javascript/core/public.js - app/javascript/styles/fonts/montserrat.scss Upstream fixed local font name, applied those changes. - app/javascript/styles/fonts/roboto.scss Upstream fixed local font name, applied those changes. - lib/mastodon/version.rb Upstream made repo URL configurable, did the same, but default to glitch-soc
2019-04-21Configrationable 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-16add env var for max length of audio uploadsIzalia Mae
2019-04-11Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-04-10Bump version to 2.8.0 (#10550)Eugen Rochko
2019-04-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut 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-10Bump version to 2.8.0rc3 (#10535)Eugen Rochko
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
generated by cgit-pink (git 2.37.1) at 2024-11-23 17:34:32 +0000