c8ef003c6b
Merge pull request #1692 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-17 22:31:21 +01:00
41a8606627
[Glitch] Fix opening the emoji picker scrolling the single-column view to the top
...
Port aa86cf9557
2022-02-17 11:05:47 +01:00
d70e4e3da0
[Glitch] Fix edge case where settings/admin page sidebar would be incorrectly hidden
...
Port 00b45b967e
2022-02-17 11:04:13 +01:00
41d52ee4b5
Fix issue with glitch-soc's theming system
2022-02-17 10:59:01 +01:00
5ed35a0df4
[Glitch] Add appeals
...
Port SCSS changes from 564efd0651
2022-02-17 10:58:57 +01:00
3a0eba4918
[Glitch] Fix privacy policy link not being visible on small screens
...
Port bbd3474416
2022-02-17 10:58:53 +01:00
f224237862
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Conflict due to glitch-soc adding the `content_type` column on status edits
and thus having a different schema version number.
Solved by taking upstream's schema version number, as it is higher than
glitch-soc's.
2022-02-17 10:58:44 +01:00
ac99f586bb
Fix issues when attempting to appeal an old strike ( #17554 )
...
* Display an error when an appeal could not be submitted
* Do not offer users to appeal old strikes
* Fix 500 error when trying to appeal a strike that is too old
* Avoid using an extra translatable string
2022-02-16 22:29:48 +01:00
aa86cf9557
Fix opening the emoji picker scrolling the single-column view to the top ( #17579 )
...
Fixes #17577
2022-02-16 21:44:47 +01:00
00b45b967e
Fix edge case where settings/admin page sidebar would be incorrectly hidden ( #17580 )
2022-02-16 21:44:19 +01:00
ec4f906618
Fix toggling sidebar on mobile in admin pages
2022-02-16 16:33:23 +01:00
1abf0f9000
Fix 0 pluralization for some localization strings ( #17576 )
...
Apparently, when the `zero` case is not defined, the translation string used
for `0` depends on the language. In French, `one` is used, causing some strings
with hardcoded “one” or `1` to misrepresent the actual data.
For instance, the dashboard would display « 1 utilisateur·rice en attente » for
both 0 and 1 pending users.
2022-02-16 14:57:57 +01:00
6ea80ba2a2
Change streaming server error messages when failing to parse client input ( #17559 )
...
Fixes #17541
- prefix JSON parsing error message by “Error parsing message from …”
- output user id if a user is logged in, IP address otherwise
- reduce log level from error to warning when a user is logged in, and to silly
otherwise
2022-02-16 14:37:26 +01:00
8f537a1168
Change relays handling to not record boosts ( #17571 )
...
* Change relays handling to not record boosts
* Update tests
2022-02-16 14:36:44 +01:00
73fce8d311
Fix performance of server-side filtering ( #17575 )
...
Fixes #17567
2022-02-16 14:28:45 +01:00
793da08995
Change dasbhoard links for “new users” and “active users” ( #17570 )
...
Make them filter for local accounts by default
2022-02-16 13:17:28 +01:00
2fd2666eea
Add test for user matching ip ( #17572 )
2022-02-16 13:14:53 +01:00
436d1243e5
Bump axios from 0.25.0 to 0.26.0 ( #17551 )
...
Bumps [axios](https://github.com/axios/axios ) from 0.25.0 to 0.26.0.
- [Release notes](https://github.com/axios/axios/releases )
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md )
- [Commits](https://github.com/axios/axios/compare/v0.25.0...v0.26.0 )
---
updated-dependencies:
- dependency-name: axios
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-16 19:20:37 +09:00
448d62058c
Bump scenic from 1.5.5 to 1.6.0 ( #17547 )
...
Bumps [scenic](https://github.com/scenic-views/scenic ) from 1.5.5 to 1.6.0.
- [Release notes](https://github.com/scenic-views/scenic/releases )
- [Changelog](https://github.com/scenic-views/scenic/blob/main/CHANGELOG.md )
- [Commits](https://github.com/scenic-views/scenic/compare/v1.5.5...v1.6.0 )
---
updated-dependencies:
- dependency-name: scenic
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-16 19:18:09 +09:00
073543a19c
Bump pg from 1.3.1 to 1.3.2 ( #17555 )
...
Bumps [pg](https://github.com/ged/ruby-pg ) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/ged/ruby-pg/releases )
- [Changelog](https://github.com/ged/ruby-pg/blob/master/History.rdoc )
- [Commits](https://github.com/ged/ruby-pg/compare/v1.3.1...v1.3.2 )
---
updated-dependencies:
- dependency-name: pg
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-16 13:05:10 +09:00
5f4b9e1bce
Bump rails from 6.1.4.4 to 6.1.4.6 ( #17550 )
...
Bumps [rails](https://github.com/rails/rails ) from 6.1.4.4 to 6.1.4.6.
- [Release notes](https://github.com/rails/rails/releases )
- [Commits](https://github.com/rails/rails/compare/v6.1.4.4...v6.1.4.6 )
---
updated-dependencies:
- dependency-name: rails
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 14:13:48 +09:00
db94a3d94d
Bump rqrcode from 2.1.0 to 2.1.1 ( #17542 )
...
Bumps [rqrcode](https://github.com/whomwah/rqrcode ) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/whomwah/rqrcode/releases )
- [Changelog](https://github.com/whomwah/rqrcode/blob/master/CHANGELOG.md )
- [Commits](https://github.com/whomwah/rqrcode/compare/v2.1.0...v2.1.1 )
---
updated-dependencies:
- dependency-name: rqrcode
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:07:42 +09:00
b289644227
Bump npmlog from 6.0.0 to 6.0.1 ( #17545 )
...
Bumps [npmlog](https://github.com/npm/npmlog ) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/npm/npmlog/releases )
- [Changelog](https://github.com/npm/npmlog/blob/main/CHANGELOG.md )
- [Commits](https://github.com/npm/npmlog/compare/v6.0.0...v6.0.1 )
---
updated-dependencies:
- dependency-name: npmlog
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:07:14 +09:00
5939aa934b
Bump @babel/plugin-proposal-decorators from 7.17.0 to 7.17.2 ( #17548 )
...
Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators ) from 7.17.0 to 7.17.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-plugin-proposal-decorators )
---
updated-dependencies:
- dependency-name: "@babel/plugin-proposal-decorators"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:06:25 +09:00
fee7d5cce6
Bump babel-jest from 27.5.0 to 27.5.1 ( #17549 )
...
Bumps [babel-jest](https://github.com/facebook/jest/tree/HEAD/packages/babel-jest ) from 27.5.0 to 27.5.1.
- [Release notes](https://github.com/facebook/jest/releases )
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md )
- [Commits](https://github.com/facebook/jest/commits/v27.5.1/packages/babel-jest )
---
updated-dependencies:
- dependency-name: babel-jest
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:06:06 +09:00
61c2e74f07
Bump @babel/runtime from 7.17.0 to 7.17.2 ( #17544 )
...
Bumps [@babel/runtime](https://github.com/babel/babel/tree/HEAD/packages/babel-runtime ) from 7.17.0 to 7.17.2.
- [Release notes](https://github.com/babel/babel/releases )
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md )
- [Commits](https://github.com/babel/babel/commits/v7.17.2/packages/babel-runtime )
---
updated-dependencies:
- dependency-name: "@babel/runtime"
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 11:05:18 +09:00
f5c6ee4d54
Bump dotenv from 10.0.0 to 16.0.0 ( #17476 )
...
Bumps [dotenv](https://github.com/motdotla/dotenv ) from 10.0.0 to 16.0.0.
- [Release notes](https://github.com/motdotla/dotenv/releases )
- [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md )
- [Commits](https://github.com/motdotla/dotenv/compare/v10.0.0...v16.0.0 )
---
updated-dependencies:
- dependency-name: dotenv
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-14 21:49:40 +01:00
564efd0651
Add appeals ( #17364 )
...
* Add appeals
* Add ability to reject appeals and ability to browse pending appeals in admin UI
* Add strikes to account page in settings
* Various fixes and improvements
- Add separate notification setting for appeals, separate from reports
- Fix style of links in report/strike header
- Change approving an appeal to not restore statuses (due to federation complexities)
- Change style of successfully appealed strikes on account settings page
- Change account settings page to only show unappealed or recently appealed strikes
* Change appealed_at to overruled_at
* Fix missing method error
2022-02-14 21:27:53 +01:00
5be705e1e0
Revert "Bump strong_migrations from 0.7.9 to 0.8.0 ( #17504 )" ( #17540 )
...
This reverts commit f76dd51aa5
2022-02-14 16:08:23 +01:00
298491a816
Remove protobuf dependencies ( #17539 )
2022-02-14 16:08:02 +01:00
d39df35441
Fix admin statuses page order with media ( #17538 )
2022-02-14 16:07:04 +01:00
9a015e43ef
Add `from:` query operator to search syntax ( #16526 )
...
* Add 'by:userhandle' parameter to search api
* Use search syntax for "by" prefix
* Codeclimate
* Use 'from' instead of 'by'
2022-02-14 00:17:09 +01:00
901bbf2e5f
Bump kt-paperclip from 7.0.1 to 7.1.1 ( #17502 )
...
Bumps [kt-paperclip](https://github.com/kreeti/kt-paperclip ) from 7.0.1 to 7.1.1.
- [Release notes](https://github.com/kreeti/kt-paperclip/releases )
- [Changelog](https://github.com/kreeti/kt-paperclip/blob/master/NEWS )
- [Commits](https://github.com/kreeti/kt-paperclip/compare/v7.0.1...v7.1.1 )
---
updated-dependencies:
- dependency-name: kt-paperclip
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13 20:21:09 +09:00
bbd3474416
Fix privacy policy link not being visible on small screens ( #17533 )
...
Fix #17482
2022-02-13 02:52:34 +01:00
6240466866
Fix duplicate accounts when searching by IP range in admin UI ( #17524 )
2022-02-13 01:58:26 +01:00
f76dd51aa5
Bump strong_migrations from 0.7.9 to 0.8.0 ( #17504 )
...
Bumps [strong_migrations](https://github.com/ankane/strong_migrations ) from 0.7.9 to 0.8.0.
- [Release notes](https://github.com/ankane/strong_migrations/releases )
- [Changelog](https://github.com/ankane/strong_migrations/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ankane/strong_migrations/compare/v0.7.9...v0.8.0 )
---
updated-dependencies:
- dependency-name: strong_migrations
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13 08:05:22 +09:00
b87c853806
Bump annotate from 3.1.1 to 3.2.0 ( #17503 )
...
Bumps [annotate](https://github.com/ctran/annotate_models ) from 3.1.1 to 3.2.0.
- [Release notes](https://github.com/ctran/annotate_models/releases )
- [Changelog](https://github.com/ctran/annotate_models/blob/develop/CHANGELOG.md )
- [Commits](https://github.com/ctran/annotate_models/compare/v3.1.1...v3.2.0 )
---
updated-dependencies:
- dependency-name: annotate
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13 08:04:32 +09:00
4a61bbe176
Bump rspec-rails from 5.0.2 to 5.1.0 ( #17406 )
...
Bumps [rspec-rails](https://github.com/rspec/rspec-rails ) from 5.0.2 to 5.1.0.
- [Release notes](https://github.com/rspec/rspec-rails/releases )
- [Changelog](https://github.com/rspec/rspec-rails/blob/main/Changelog.md )
- [Commits](https://github.com/rspec/rspec-rails/compare/v5.0.2...v5.1.0 )
---
updated-dependencies:
- dependency-name: rspec-rails
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-13 08:00:26 +09:00
6f78c66fe0
Merge pull request #1691 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-12 22:43:43 +01:00
f3429d7354
[Glitch] Fix controls for unchangeable properties on status edit not being disabled
...
Port 38845592c4
2022-02-12 22:36:39 +01:00
c9669ee167
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-12 21:36:33 +01:00
27803cd2b7
Make the settings button go to settings when opened in a new tab
2022-02-12 20:12:29 +01:00
7396a254c1
Fix empty batch statuses selection causing a 500 error ( #17532 )
...
* Fix empty batch statuses selection causing a 500 error
* Simplify current_params
2022-02-12 19:52:17 +01:00
38845592c4
Fix controls for unchangeable properties on status edit not being disabled ( #17531 )
...
Fixes #17520
2022-02-12 19:00:33 +01:00
ee40c2c5b0
Bump chewy from 7.2.3 to 7.2.4 ( #17529 )
2022-02-12 18:07:42 +01:00
2d3f8055ed
Fix attempts at distributing Update activities for local-only posts
2022-02-12 15:41:18 +01:00
f61137b7ff
Merge pull request #1688 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-02-12 14:33:01 +01:00
f4db2e1832
[Glitch] Fix layout of the report page on smaller screens in admin UI
...
Port e848d281d5
2022-02-12 13:15:07 +01:00
958089fb21
[Glitch] Add notifications when a reblogged status has been updated
...
Port front-end changes from 8f03b7a2fb
2022-02-12 13:15:07 +01:00
d35bc9c3cc
Bump ws from 8.4.2 to 8.5.0 ( #17467 )
...
Bumps [ws](https://github.com/websockets/ws ) from 8.4.2 to 8.5.0.
- [Release notes](https://github.com/websockets/ws/releases )
- [Commits](https://github.com/websockets/ws/compare/8.4.2...8.5.0 )
---
updated-dependencies:
- dependency-name: ws
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-12 20:50:49 +09:00
Claire