b209e919bd
Merge pull request #1662 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
3 years ago
c42938aed4
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
2d1f082bb6
Fix NameError on ActivityPub::FetchFeaturedCollectionService ( #17326 )
...
Related: #16954
3 years ago
f6acc039ec
Merge pull request #1660 from ClearlyClaire/glitch-soc/features/themes-multiple-packs
...
Refactor glitch-soc's theme handling
3 years ago
b9ed7e0f55
Please CodeClimate
3 years ago
c7e2b9cf64
Move controller theming code to concern
3 years ago
c60f8ce032
Fix `pinned` attribute not being set for private self-posts ( #17304 )
3 years ago
69208ef6ff
[Glitch] Add notifications for statuses deleted by moderators
...
Port front-end changes from 14f436c457
3 years ago
b3bf32a21e
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/reports/show.html.haml`:
Conflicts due to glitch-soc's theming system.
3 years ago
77dd4ab8f5
Fix `pinned` attribute not being set for private self-posts
3 years ago
14f436c457
Add notifications for statuses deleted by moderators ( #17204 )
3 years ago
5effc0f8fa
[Glitch] Add support for private pinned posts
...
Port JS changes from d5c9feb7b7
3 years ago
2d4b4b0b45
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.
3 years ago
d5c9feb7b7
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"
3 years ago
278bd61d6f
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
de4c67c5fa
Fix missing media: 'all' on default skins
3 years ago
c789bcc844
Refactor theming HAML template a bit
3 years ago
1b386c881c
Refactor theme config loading
3 years ago
c61b29ebfd
Refactor some more
3 years ago
30d9abdfc9
Refactor glitch-soc's theme handling
3 years ago
081e4426f8
Fix admin interface crash when displaying deleted user ( #17301 )
3 years ago
474cd302c9
[Glitch] Gradually increase retry waiting for media processing
...
Port bc7a8ae6d6
3 years ago
b61c3ddff8
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.
3 years ago
8e84ebf0cb
Remove IP tracking columns from users table ( #16409 )
3 years ago
bc7a8ae6d6
Gradually increase retry waiting for media processing ( #17271 )
3 years ago
af86c7a5de
[Glitch] Fix media descriptions not being used for client-side filtering
...
Port 37e80994f8
3 years ago
fca50e4b50
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
d3db2eb7fb
Remove custom emojis on domain purge ( #17210 )
3 years ago
37e80994f8
Fix media descriptions not being used for client-side filtering ( #17206 )
...
Fix oversight in #13837
3 years ago
f011787003
[Glitch] Fix tag rendering error in hashtag column settings
...
Port e65080181a
3 years ago
09c61e1376
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.
3 years ago
fe71548844
Fix warnings on Rails boot ( #16946 )
3 years ago
e65080181a
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
3 years ago
720e8ab0f5
Fix duplicate record on admin/accounts when searching with IP ( #17150 )
3 years ago
e061ea5f71
[Glitch] Change title of retention chart
...
Port 0c17fd9109
3 years ago
d4f315f304
Merge branch 'main' into glitch-soc/merge-upstream
3 years ago
76761d5fc0
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
3 years ago
7f803c41e2
Add ability to purge undeliverable domains from admin interface ( #16686 )
...
* Add ability to purge undeliverable domains from admin interface
* Add tests
3 years ago
0c17fd9109
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.
3 years ago
40f202c1e5
Change list title input styling ( #17092 )
3 years ago
50d62fe2e7
[Glitch] ignore hashtag suggestions if they vary only in case
...
Port 2aafa5b4e7
3 years ago
59a5193280
[Glitch] Show correct error message if chosen password is too long
...
Port 66baa629ea
3 years ago
9cecf59300
[Glitch] Add batch suspend for accounts in admin UI
...
Port SCSS changes from 2aafa5b4e7
3 years ago
b2526316f5
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.
3 years ago
2aafa5b4e7
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
3 years ago
bda8e4f815
Fix follow recommendation biased towards older accounts ( #17126 )
3 years ago
fe45184b36
Change trending hashtags threshold back from 15 to 5 ( #17122 )
3 years ago
41503507ec
Fix redirection when succeeded WebAuthn ( #17098 )
3 years ago
66baa629ea
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
3 years ago
0fb9536d38
Add batch suspend for accounts in admin UI ( #17009 )
3 years ago
Claire
Jeong Arm
Eugen Rochko
Rens Groothuijsen
David Sterry
Takeshi Umeda
heguro