Age | Commit message (Collapse) | Author |
|
|
|
* Fix mark as read in notifications to be saved immediately
* fix code style
|
|
Fixes #14900
|
|
Fixes #13882
|
|
|
|
|
|
accounts (#14896)
|
|
|
|
UI (#14803)
Port bbcbf12215a5ec69362a769c1bae9c630eda0ed4 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Port b67caf9be48294bef290eea69e90d98223fcf3eb to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 974b1b79ce58e6799e5e5bb576e630ca783150de to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port front-end changes from 6d59dfa15d873da75c731b79367ab6b3d1b2f5a5 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port fcb9350ff8cdc83388f75de6b031410df8aa8a56 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port eaea2311aaaf030e4a2f5d03be6131d0716fdaf7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port aab867b0e8119ecee78dabe8007f3c033e734b6d to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port 91eecd1b3c95807be00535b58ebfd85e549d77e0 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- `Gemfile.lock`:
Not a real conflict, upstream updated dependencies that were too close to
glitch-soc-only ones in the file.
- `app/controllers/oauth/authorized_applications_controller.rb`:
Upstream changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/settings/base_controller.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/controllers/settings/sessions_controller.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's theming system.
Ported upstream changes.
- `app/models/user.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc not preventing moved accounts from logging
in.
Ported upstream changes while keeping the ability for moved accounts to log
in.
- `app/policies/status_policy.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's local-only toots.
Ported upstream changes.
- `app/serializers/rest/account_serializer.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's ability to hide followers count.
Ported upstream changes.
- `app/services/process_mentions_service.rb`:
Upstream refactored and changed the logic surrounding suspended accounts.
Minor conflict due to glitch-soc's local-only toots.
Ported upstream changes.
- `package.json`:
Not a real conflict, upstream updated dependencies that were too close to
glitch-soc-only ones in the file.
|
|
Fix #11160
|
|
* Add unread notification markers
Fixes #14804
* Allow IntersectionObserverArticle's children to be updated
|
|
|
|
|
|
|
|
* Add bell button
Fix #4890
* Remove duplicate type from post-deployment migration
* Fix legacy class type mappings
* Improve query performance with better index
* Fix validation
* Remove redundant index from notifications
|
|
|
|
|
|
|
|
|
|
read notification.
|
|
|
|
|
|
|
|
|
|
Fix #14717
|
|
* Add paragraph about browser add-ons when encountering some errors
When a crash is caused by a NotFoundError exception, add a paragraph
to the error page mentioning browser add-ons.
Indeed, crashes with NotFoundError are often caused by browser extensions
messing with the DOM in ways React.JS can't recover from (e.g. issues #13325
and #14731).
* Reword error messages
|
|
Fixes #14768
|
|
Port 678f5ed296e71bb80d170027b114d9d30a7ccab7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
Conflict caused because we have additional code to make sure pinned
local-only toots don't get rendered on the ActivityPub endpoints.
Ported upstream changes.
|
|
Storing objects in IndexedDB was disabled in #7932, but we were
still trying to read objects from it before making an API call
|
|
|
|
Port 5fc5a9f9f18872cb0f1b54359338b2e189dd2bb1 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Port JS change from f0b6ddd97948d9c443cd155cb8ccc497e0608117 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- `config/webpack/shared.js`:
Upstream has changed how Tesseract.js gets included and dropped a dependency.
The conflict is caused by glitch-soc having different code due to its
theming system.
Ported upstream changes.
- `lib/mastodon/version.rb`:
Upstream refactor/code style change in a place we replaced upstream's
repo URL with ours.
Ported upstram changes, keeping our repo URL.
- `yarn.lock`:
Upstream dropped dependencies, one of which was textually too close to
a glitch-soc-specific dependency. Not a real conflict.
|
|
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
* Add database support for list show-reply preferences
* Add backend support to read and update list-specific show_replies settings
* Add basic UI to set list replies setting
* Add specs for list replies policy
* Switch "cycling" reply policy link to a set of radio inputs
* Capitalize replies_policy strings
* Change radio button design to be consistent with that of the directory explorer
|
|
And remove highlighting in web UI
Full circle from #8940
|
|
Fixes #1414
|
|
* [WiP] Update Tesseract.js
- Update Tesseract.js to 2.2.1
- Use versioned file names
- differentiate two progression states: preparing OCR and detecting picture
* Get rid of copy-webpack-plugin
|