6259051853
Port directory CSS changes from upstream
...
Port fd8ca11f19
6 years ago
b62953b3d2
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/packs/public.js
- app/models/user.rb
- config/settings.yml
- db/schema.rb
Moved public.js changes to settings.js.
6 years ago
097d866028
Add setting to not aggregate reblogs ( #9248 )
...
* 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
6 years ago
f551383e4a
Cache hashtag sample accounts, and exclude ineligible ones ( #9465 )
6 years ago
d72487aef6
Make notification time smaller and reduce contrast ( #9464 )
6 years ago
4379a39c05
i18n: Update Polish translation ( #9459 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
6 years ago
246dfe9d47
Remove pending spec ( #9453 )
6 years ago
53c462bf66
Bump rubocop from 0.61.0 to 0.61.1 ( #9451 )
...
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>
6 years ago
03289a4d14
Escape HTML in profile name preview in profile settings ( #9446 )
...
* 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
6 years ago
d61410c306
Add specs for ActivityPub::InboxesController ( #9456 )
6 years ago
f607161253
Add specs for Admin::AccountModerationNotesHelper ( #9455 )
6 years ago
994c20699c
Remove pending spec ( #9454 )
...
Since dots are not allowed in username,
this spec is no longer needed.
6 years ago
26345b7cf2
Add specs for AccountTagStat model ( #9452 )
6 years ago
ac437d6b25
Fix various things in the directory ( #9449 )
...
* 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
6 years ago
f2ca159c3b
Fix tag mb_chars comparison of profile directory ( #9448 )
6 years ago
b34053e888
Merge pull request #848 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
fd8ca11f19
Add profile directory ( #9427 )
...
Fix #5578
6 years ago
467786f29b
Fix mention links in detailed statuses not opening in the WebUI
6 years ago
516adec7ad
Revert "Add database statement timeout of 60s ( #9382 )"
...
This reverts commit 01861b4f8e
6 years ago
4aca9b4e0f
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
6d73528424
Remove pending spec ( #9442 )
...
`#from_account` isn't defined.
6 years ago
23607d43da
Add spec for Identity.find_for_oauth ( #9441 )
6 years ago
579e2d632a
Bump rails from 5.2.1.1 to 5.2.2 ( #9430 )
...
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>
6 years ago
ae2eafd897
Bump rails-controller-testing from 1.0.3 to 1.0.4 ( #9440 )
...
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>
6 years ago
79c837efd9
Bump rubocop from 0.60.0 to 0.61.0 ( #9439 )
...
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>
6 years ago
88faa4ff2d
Attempt fixing deadlocks by moving account stats update outside transaction ( #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
6 years ago
2a9843a021
Add visible dates for notifications in Notification column ( #9423 )
...
* add RelativeTimestamp elements
* style the elements properly with CSS
6 years ago
5e2cd7f672
Fix thread depth computation in statuses_controller ( #9426 )
...
* Add test that should currently fail
* Fix depth computation (will still fail if statuses have been filtered out)
* Fix handling of broken threads
6 years ago
9734868448
Bump capybara from 3.11.1 to 3.12.0 ( #9388 )
...
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>
6 years ago
58a6c7004f
Bump rails-controller-testing from 1.0.2 to 1.0.3 ( #9417 )
...
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>
6 years ago
9cecfb2e4f
Bump pry-rails from 0.3.7 to 0.3.8 ( #9418 )
...
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>
6 years ago
01861b4f8e
Add database statement timeout of 60s ( #9382 )
6 years ago
626a544d08
Improve account suspension speed and completeness ( #9290 )
...
- 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
6 years ago
3988b60bc2
Merge pull request #838 from ThibG/glitch-soc/features/reply-all-streaming-entries
...
Display a double reply arrow on public pages for toots that are replies
6 years ago
5aaf52b46c
Merge pull request #842 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
e5aadde0d5
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
9b85750348
Bump version to 2.6.5 ( #9413 )
6 years ago
4813053e97
Preload common JSON-LD contexts ( #9412 )
...
Fixes #9411
6 years ago
f523852b87
Merge pull request #840 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
d67776ac83
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
606f0df712
Fix since_id
6 years ago
a3f01ec6f8
Fix last_status parameter for notifications and conversations ( #9407 )
6 years ago
d69ee38a7b
[i18n] update and corrections for Occitan locale ( #9404 )
...
* 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 ï
6 years ago
49fe8fa425
Add a tooltip explaining what a locked account is ( #9403 )
...
* create a title tooltip explaining what a locked account is
* improve phrasing
* minor phrasing fix to unify default and english
6 years ago
c430672460
Merge pull request #837 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
a281d3ebd3
Scroll to selected toot even if the ancestors happen to be loaded
6 years ago
8117ba2cb1
Scroll to detailed status when new ancestors get inserted
6 years ago
5a03b30f13
[Glitch] Fix bug in order of conversations in web UI
...
Port 2af43c3dce
6 years ago
ff50412846
[Glitch] Replace recursion in status mapStateToProps
...
Port 20a23c7d08
6 years ago
45ba4e83e0
[Glitch] Fix context building in the reducer
...
Port a5c740ba41
6 years ago
Thibaut Girka
Eugen Rochko
Marcin Mikołajczak
ysksn
dependabot[bot]
Paweł Ngei
Takeshi Umeda
David Yip
Quentí