about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-12-09Merge pull request #849 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-12-09Fix directory controller in glitch-socThibaut Girka
2018-12-09[Glitch] Fix various things in the directoryThibaut Girka
Port ecd303c097bf20aa971628ba8420a9f17f3dd1f7 to glitch-soc
2018-12-09Port directory CSS changes from upstreamThibaut Girka
Port 73be8f38c115c279e3d3961b98bd2b82b9706b05 to glitch-soc
2018-12-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.
2018-12-09Add setting to not aggregate reblogs (#9248)ThibG
* Add setting to not aggregate reblogs Fixes #9222 * Handle cases where user is nil in add_to_home and add_to_list * Add hint for setting_aggregate_reblogs option * Reword setting_aggregate_reblogs label
2018-12-08Cache hashtag sample accounts, and exclude ineligible ones (#9465)Eugen Rochko
2018-12-08Make notification time smaller and reduce contrast (#9464)Eugen Rochko
2018-12-07i18n: Update Polish translation (#9459)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-12-07Remove pending spec (#9453)ysksn
2018-12-07Bump rubocop from 0.61.0 to 0.61.1 (#9451)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.61.0 to 0.61.1. - [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.61.0...v0.61.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-07Escape HTML in profile name preview in profile settings (#9446)Paweł Ngei
* fix non-escaped html in the profile settings * provide a default profile text in case if there's no custom one * update haml syntax * simplify default profile name to username * sanitize user-input html but display emojified icons
2018-12-07Add specs for ActivityPub::InboxesController (#9456)ysksn
2018-12-07Add specs for Admin::AccountModerationNotesHelper (#9455)ysksn
2018-12-07Remove pending spec (#9454)ysksn
Since dots are not allowed in username, this spec is no longer needed.
2018-12-07Add specs for AccountTagStat model (#9452)ysksn
2018-12-07Fix various things in the directory (#9449)Eugen Rochko
* Fix missing variable in directory page title * Order hashtags by number of people instead of alphabetically * Add icon to OpenGraph preview of directory page * Prevent line breaks in hashtags and ensure lowercase in the table
2018-12-07Fix tag mb_chars comparison of profile directory (#9448)Takeshi Umeda
2018-12-06Merge pull request #848 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-12-06Add profile directory (#9427)Eugen Rochko
Fix #5578
2018-12-06Fix mention links in detailed statuses not opening in the WebUIThibaut Girka
2018-12-06Revert "Add database statement timeout of 60s (#9382)"Thibaut Girka
This reverts commit 58a29db99d410771f62ffb9e8c2ce95e1d3cb4ae.
2018-12-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-06Remove pending spec (#9442)ysksn
`#from_account` isn't defined.
2018-12-06Add spec for Identity.find_for_oauth (#9441)ysksn
2018-12-06Bump rails from 5.2.1.1 to 5.2.2 (#9430)dependabot[bot]
Bumps [rails](https://github.com/rails/rails) from 5.2.1.1 to 5.2.2. - [Release notes](https://github.com/rails/rails/releases) - [Commits](https://github.com/rails/rails/compare/v5.2.1.1...v5.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06Bump rails-controller-testing from 1.0.3 to 1.0.4 (#9440)dependabot[bot]
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.3 to 1.0.4. - [Release notes](https://github.com/rails/rails-controller-testing/releases) - [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.3...v1.0.4) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-06Bump rubocop from 0.60.0 to 0.61.0 (#9439)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.60.0 to 0.61.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.60.0...v0.61.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-05Attempt fixing deadlocks by moving account stats update outside transaction ↵ThibG
(#9437) * Use `update_column` instead of `update_attribute` in callback `update_attribute` would normally cause callbacks to be called. Called from a callback, it seems to stop further callbacks from executing. `update_column` does the same work, but without calling callbacks or preventing other callbacks from executing. * Fix deadlocks by moving account stats update outside transaction
2018-12-05Add visible dates for notifications in Notification column (#9423)Paweł Ngei
* add RelativeTimestamp elements * style the elements properly with CSS
2018-12-05Fix thread depth computation in statuses_controller (#9426)ThibG
* Add test that should currently fail * Fix depth computation (will still fail if statuses have been filtered out) * Fix handling of broken threads
2018-12-04Bump capybara from 3.11.1 to 3.12.0 (#9388)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.11.1 to 3.12.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.11.1...3.12.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-04Bump rails-controller-testing from 1.0.2 to 1.0.3 (#9417)dependabot[bot]
Bumps [rails-controller-testing](https://github.com/rails/rails-controller-testing) from 1.0.2 to 1.0.3. - [Release notes](https://github.com/rails/rails-controller-testing/releases) - [Commits](https://github.com/rails/rails-controller-testing/compare/v1.0.2...v1.0.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-04Bump pry-rails from 0.3.7 to 0.3.8 (#9418)dependabot[bot]
Bumps [pry-rails](https://github.com/rweng/pry-rails) from 0.3.7 to 0.3.8. - [Release notes](https://github.com/rweng/pry-rails/releases) - [Commits](https://github.com/rweng/pry-rails/compare/v0.3.7...v0.3.8) Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-03Add database statement timeout of 60s (#9382)Eugen Rochko
2018-12-03Improve 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-02Merge pull request #838 from ↵David Yip
ThibG/glitch-soc/features/reply-all-streaming-entries Display a double reply arrow on public pages for toots that are replies
2018-12-02Merge pull request #842 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-12-02Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-02Bump version to 2.6.5 (#9413)Eugen Rochko
2018-12-02Preload common JSON-LD contexts (#9412)ThibG
Fixes #9411
2018-12-02Merge pull request #840 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-12-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-01Fix since_idThibaut Girka
2018-12-01Fix last_status parameter for notifications and conversations (#9407)ThibG
2018-12-01[i18n] update and corrections for Occitan locale (#9404)Quentí
* Update + correction Colomna and not columna Pòt, verb missing * Correction D’aquí is followed by a time period, and dins by a season. Read : https://github.com/briannesbitt/Carbon/pull/1403 for more details. * Correction admin zone * Correction Reïnicializacion, with the funny ï
2018-12-01Add a tooltip explaining what a locked account is (#9403)Paweł Ngei
* create a title tooltip explaining what a locked account is * improve phrasing * minor phrasing fix to unify default and english
2018-11-30Merge pull request #837 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2018-11-30Scroll to selected toot even if the ancestors happen to be loadedThibaut Girka
2018-11-30Scroll to detailed status when new ancestors get insertedThibaut Girka