6ae170697a
Merge pull request #1662 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-01-19 14:22:59 +01:00
ad5fd97277
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-19 12:32:44 +01:00
be15674215
Fix NameError on ActivityPub::FetchFeaturedCollectionService ( #17326 )
...
Related: #16954
2022-01-19 04:08:46 +01:00
8904dac905
Merge pull request #1660 from ClearlyClaire/glitch-soc/features/themes-multiple-packs
...
Refactor glitch-soc's theme handling
2022-01-18 00:18:07 +01:00
5d38a8573c
Please CodeClimate
2022-01-17 13:06:06 +01:00
a250aefe77
Move controller theming code to concern
2022-01-17 12:50:52 +01:00
833a5e4e52
Fix `pinned` attribute not being set for private self-posts ( #17304 )
2022-01-17 11:59:46 +01:00
a5cb48879d
[Glitch] Add notifications for statuses deleted by moderators
...
Port front-end changes from 2fb76550a9
2022-01-17 11:19:44 +01:00
485cf5c0c1
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/reports/show.html.haml`:
Conflicts due to glitch-soc's theming system.
2022-01-17 10:45:25 +01:00
a10833e909
Fix `pinned` attribute not being set for private self-posts
2022-01-17 09:52:19 +01:00
2fb76550a9
Add notifications for statuses deleted by moderators ( #17204 )
2022-01-17 09:41:33 +01:00
b20dafb566
[Glitch] Add support for private pinned posts
...
Port JS changes from 5aade2baac
2022-01-17 08:35:27 +01:00
de7f936b96
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/accounts_controller.rb`:
Upstream introduced support for private pinned toots, but glitch-soc's query
was a bit different as it filtered out local-only toots.
Used upstream's query, while adding local-only filtering back.
- `app/controllers/activitypub/collections_controller.rb`:
Same thing with regards to local-only posts.
- `app/validators/status_pin_validator.rb`:
Not a real conflict, but the line below was different in glitch-soc due to
the configurable pinned toots limit.
2022-01-17 08:28:52 +01:00
5aade2baac
Add support for private pinned posts ( #16954 )
...
* Add support for private pinned toots
* Allow local user to pin private toots
* Change wording to avoid "direct message"
2022-01-17 00:49:55 +01:00
21828806b3
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-16 22:29:05 +01:00
91c1fbf714
Fix missing media: 'all' on default skins
2022-01-16 22:26:18 +01:00
a3a9d4d789
Refactor theming HAML template a bit
2022-01-16 22:26:18 +01:00
c8973773bc
Refactor theme config loading
2022-01-16 22:26:18 +01:00
37dadd4512
Refactor some more
2022-01-16 22:26:18 +01:00
10bef4493c
Refactor glitch-soc's theme handling
2022-01-16 22:12:11 +01:00
928890bd38
Fix admin interface crash when displaying deleted user ( #17301 )
2022-01-16 20:57:37 +01:00
923eda5cd5
[Glitch] Gradually increase retry waiting for media processing
...
Port 52b05dad34
2022-01-16 18:14:33 +01:00
577c74d422
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream added some text, but our README is completely different.
Kept our README unchanged.
2022-01-16 18:11:20 +01:00
7b3972c270
Remove IP tracking columns from users table ( #16409 )
2022-01-16 13:23:50 +01:00
52b05dad34
Gradually increase retry waiting for media processing ( #17271 )
2022-01-10 14:25:08 +01:00
817072e9c7
[Glitch] Fix media descriptions not being used for client-side filtering
...
Port 651e997a98
2022-01-07 19:54:58 +01:00
338c47b6c6
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-07 19:51:47 +01:00
db10cd8d15
Remove custom emojis on domain purge ( #17210 )
2021-12-30 08:41:09 +01:00
651e997a98
Fix media descriptions not being used for client-side filtering ( #17206 )
...
Fix oversight in #13837
2021-12-28 23:25:50 +01:00
5baeb90bd4
[Glitch] Fix tag rendering error in hashtag column settings
...
Port 9d43863426
2021-12-27 15:22:12 +01:00
2136aa2759
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
We have completely different contents. Kept our version.
- `package.json`:
Not a real conflict, just an upstream dependency udpated
textually too close to a glitch-soc-only dependency.
Updated dependencies like upstream.
- `streaming/index.js`:
Conflict due to code style changes on parts that were
modified in glitch-soc to handle local-only toots.
Changed style according to upstream.
2021-12-27 15:16:18 +01:00
9a8784829f
Fix warnings on Rails boot ( #16946 )
2021-12-27 00:47:20 +01:00
9d43863426
Fix tag rendering error in hashtag column settings ( #17184 )
...
* Flatten tags in configuration to regular array before converting to JSON
* Render filter tags using toJS instead of toJSON
2021-12-26 19:22:05 +01:00
ba93eb818b
Fix duplicate record on admin/accounts when searching with IP ( #17150 )
2021-12-21 00:17:14 +01:00
77e23e2005
[Glitch] Change title of retention chart
...
Port 36347cf494
2021-12-18 11:47:54 +01:00
65987b3956
Merge branch 'main' into glitch-soc/merge-upstream
2021-12-18 11:44:54 +01:00
d8da1689c1
Add ability for admins to delete canonical email blocks ( #16644 )
...
* Add admin option to remove canonical email blocks from a deleted account
* Add tootctl canonical_email_blocks to inspect and remove canonical email blocks
2021-12-17 23:02:14 +01:00
44c8b6ff2f
Add ability to purge undeliverable domains from admin interface ( #16686 )
...
* Add ability to purge undeliverable domains from admin interface
* Add tests
2021-12-17 23:01:21 +01:00
36347cf494
Change title of retention chart ( #16909 )
...
Changes from “Retention” to “User retention rate by month after sign-up”.
This should make it much clearer to people not familiar with retention charts
what it actually means.
2021-12-17 23:00:41 +01:00
1e34cfabdd
Change list title input styling ( #17092 )
2021-12-17 23:00:05 +01:00
8962f00ec8
[Glitch] ignore hashtag suggestions if they vary only in case
...
Port 65ee707755
2021-12-16 16:48:42 +01:00
a5d9a408e3
[Glitch] Show correct error message if chosen password is too long
...
Port 8143d127a4
2021-12-16 16:26:04 +01:00
ee4be446b6
[Glitch] Add batch suspend for accounts in admin UI
...
Port SCSS changes from 65ee707755
2021-12-16 16:25:21 +01:00
179f1d3a78
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/pending_accounts/index.html.haml`:
Removed upstream, while it had glitch-soc-specific changes to accomodate
for glitch-soc's theming system.
Removed the file.
Additional changes:
- `app/views/admin/accounts/index.html.haml':
Accomodate for glitch-soc's theming system.
2021-12-16 16:20:44 +01:00
65ee707755
ignore hashtag suggestions if they vary only in case ( #16460 )
...
* ignore hashtag suggestions if they vary only in case
* remove console.logs and unused args
* consistently add space when dismissing suggestions
* linting
2021-12-15 23:47:19 +01:00
794d9d267d
Fix follow recommendation biased towards older accounts ( #17126 )
2021-12-13 23:21:14 +01:00
2c6be5dc9a
Change trending hashtags threshold back from 15 to 5 ( #17122 )
2021-12-13 05:32:29 +01:00
2b292c44bc
Fix redirection when succeeded WebAuthn ( #17098 )
2021-12-05 21:50:12 +01:00
8143d127a4
Show correct error message if chosen password is too long ( #17082 )
...
* Add correct error message for exceeding max length on password confirmation field
* Code style fixes
2021-12-05 21:49:50 +01:00
7bf5924339
Add batch suspend for accounts in admin UI ( #17009 )
2021-12-05 21:48:39 +01:00
Claire