about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-01-21Merge branch 'master' into productionpluralcafe-docker
2019-01-21Merge branch 'glitch'pluralcafe-docker
2019-01-20Merge pull request #888 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-01-20[Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width ↵Thibaut Girka
compensation Port 3b3a4d8a1709b8f4a9ffe67d21707117c75f9fe8 to glitch-soc
2019-01-20[Glitch] Hide floating action button on search and getting started pagesThibaut Girka
Port 30af4ee65ff43c17d6f7b1b64d6bf1d8699f37c8 to glitch-soc
2019-01-20Allow event defaults on index for text data transfer (#9840)tmm576
2019-01-20[Glitch] Fix new hashtag page's items not being full-width on mobileThibaut Girka
Port b506ce119766bb3308f934e2d3de143b3ac6f5ad to glitch-soc
2019-01-20[Glitch] Add information about how to opt-in to the directory on the directoryThibaut Girka
Port SCSS changes from a492a9bcd355d4f0998990905177ac4f9699cc3c to glitch-soc
2019-01-20Fix slightly cropped font on settings page dropdowns when using system font ↵Mélanie Chauvel (ariasuni)
(#9839)
2019-01-20[Glitch] Improve the public hashtag pageThibaut Girka
Port 8b1990355974543542544e56d2046bc0c9c8716b to glitch-soc
2019-01-20[Glitch] Redesign public hashtag page to use a masonry layoutThibaut Girka
Port bc642ac24b49c14dca382e7aabbc16130293d2f4 to glitch flavour
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-18Fix missing account association in tombstone model (#9857)Eugen Rochko
2019-01-18Bump version to 2.7.0rc2 (#9836)Eugen Rochko
2019-01-18Use the bundled Capistrano version (#9855)Alexander Mankuta
2019-01-18Fix new hashtag page's items not being full-width on mobile (#9852)Eugen Rochko
Fix #9845
2019-01-18Fix REST API showing non-public reblogs for a given status (#9850)Eugen Rochko
2019-01-18Bump json-ld from 2.2.1 to 3.0.2 (#8804)dependabot[bot]
Bumps [json-ld](https://github.com/ruby-rdf/json-ld) from 2.2.1 to 3.0.2. - [Release notes](https://github.com/ruby-rdf/json-ld/releases) - [Commits](https://github.com/ruby-rdf/json-ld/compare/2.2.1...3.0.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-18Bump brakeman from 4.3.1 to 4.4.0 (#9848)dependabot[bot]
Bumps [brakeman](https://github.com/presidentbeef/brakeman) from 4.3.1 to 4.4.0. - [Release notes](https://github.com/presidentbeef/brakeman/releases) - [Changelog](https://github.com/presidentbeef/brakeman/blob/master/CHANGES.md) - [Commits](https://github.com/presidentbeef/brakeman/compare/v4.3.1...v4.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-18Reject existing Follow in addition to sending a Block (#9811)ThibG
Mastodon expects remote servers to remove follow relationships upon receiving a Block. However, the spec only evokes Block activities in a C2S context, never in a S2S context. This PR, in addition to federating the Block, explicitly sends a Reject for any affected follow relationship, which makes a bit more sense with regards to the spec.
2019-01-18Add tombstones for remote statuses (#9830)ThibG
* Add Tombstone model to remember object deletion * Do not recreate a status if it has been deleted * Record Tombstone for remote deleted items Also, only record deleted items from same-host actors * Clear an user's tombstones when their key change
2019-01-18Add support for non-public reblogs from ActivityPub (#9841)Eugen Rochko
Fix #9838
2019-01-18Bump bundler-audit from 0.6.0 to 0.6.1 (#9847)dependabot[bot]
Bumps [bundler-audit](https://github.com/postmodern/bundler-audit) from 0.6.0 to 0.6.1. - [Release notes](https://github.com/postmodern/bundler-audit/releases) - [Changelog](https://github.com/rubysec/bundler-audit/blob/master/ChangeLog.md) - [Commits](https://github.com/postmodern/bundler-audit/compare/v0.6.0...v0.6.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-18Add information about how to opt-in to the directory on the directory (#9834)Eugen Rochko
Fix #9833
2019-01-18Add timeouts for S3 (#9842)Eugen Rochko
2019-01-18Fix code style of regeneration-related code (#9843)Eugen Rochko
2019-01-18Weblate translations (2019-01-17) (#9844)Eugen Rochko
* Translated using Weblate (Welsh) Currently translated at 94.7% (337 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Czech) Currently translated at 99.9% (751 of 752 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Romanian) Currently translated at 99.2% (353 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ * Translated using Weblate (Romanian) Currently translated at 11.8% (89 of 752 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ro/ * Translated using Weblate (German) Currently translated at 99.9% (751 of 752 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 99.9% (751 of 752 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Serbian) Currently translated at 96.8% (61 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Serbian) Currently translated at 74.8% (80 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Serbian) Currently translated at 98.4% (62 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/ нисам сигуран за ово "и не направите нову". слијед ријечи ми је мало чудан? * Translated using Weblate (Serbian) Currently translated at 75.7% (81 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ преподешавања за ПРЕСЕТ * Translated using Weblate (Catalan) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Serbian) Currently translated at 80.4% (86 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * i18n-tasks normalize * yarn manage:translations
2019-01-17Fix slightly cropped font on settings page dropdowns when using system font ↵Mélanie Chauvel (ariasuni)
(#9839)
2019-01-17Allow event defaults on index for text data transfer (#9840)tmm576
2019-01-17Add `tootctl --version` (#9835)Eugen Rochko
2019-01-17Update Dockerfile (#9796)ashleyhull-versent
2019-01-17Bump rubocop from 0.62.0 to 0.63.0 (#9827)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.62.0 to 0.63.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.62.0...v0.63.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-17Bump oj from 3.7.6 to 3.7.7 (#9828)dependabot[bot]
Bumps [oj](https://github.com/ohler55/oj) from 3.7.6 to 3.7.7. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/master/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.7.6...v3.7.7) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-01-17Improve the public hashtag page (#9831)Eugen Rochko
- Fix height not updating when clicking show more on public hashtag page - Add header to the public hashtag page - Change text size and margins on the public hashtag page
2019-01-17Hide floating action button on search and getting started pages (#9826)tmm576
2019-01-16Merge branch 'master' into productionpluralcafe-docker
2019-01-16Merge branch 'glitch'pluralcafe-docker
2019-01-16Fix public hashtag timeline width on mobile, fix scrollbar width ↵ThibG
compensation (#9824) * Fix hashtag timeline width being potentially larger than window width * Add automatic computation of scrollbar width
2019-01-16I18n: Update Czech translation (#9814)Aditoo17
* I18n: Update Czech translation * I18n: Update Czech translation * I18n: Update Czech translation Small fix
2019-01-16Redesign public hashtag page to use a masonry layout (#9822)Eugen Rochko
2019-01-16Use summary as summary for converted ActivityPub objects (#9823)Eugen Rochko
Fix #8609
2019-01-16Merge pull request #887 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-01-16Fix `tootctl domains crawl` with JSON format output crash (#9820)Eugen Rochko
Fix #9817
2019-01-16Reduce chances of race conditions when processing deleted toots (#9815)ThibG
* Reduce chances of race conditions when processing deleted toots * Prevent race condition when processing deleted toots
2019-01-16[Glitch] make draggingOver state off correctlyThibaut Girka
Port d6433b393162bcfd7c6cfaf18abb9d6b6f6aef11 to glitch-soc
2019-01-16[Glitch] Make hashtag search results link to the hashtag URLThibaut Girka
Port 6cfb357940b3855ce53f6d1dfd87b1b32840a302 to glitch-soc
2019-01-16[Glitch] Fix hashtag timeline on mobileThibaut Girka
Port c5b8824a3e5fa43470d12c4ef96eda3e62e10436 to glitch-soc
2019-01-16Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - config/locales/simple_form.pl.yml
generated by cgit-pink (git 2.37.1) at 2025-01-01 08:51:08 +0000