Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[4.x] Add notifications method to AugmentedUser #10022

Closed
wants to merge 161 commits into from
Closed

[4.x] Add notifications method to AugmentedUser #10022

wants to merge 161 commits into from

Conversation

duncanmcclean
Copy link
Member

@duncanmcclean duncanmcclean commented May 9, 2024 •
edited
Loading

This pull request adds a notifications method to the AugmentedUser class to prevent it falling back to the notifications method on the User when Laravel's Notifiable trait is present.

Fixes #9932.
Replaces #9936.

duncanmcclean and others added 30 commits February 1, 2024 09:40
@duncanmcclean
[5.x] Remove deprecated revisions method from Collection (#9441)
9e53ac0
@duncanmcclean
Merge remote-tracking branch 'origin/4.x'
10cdc87
@duncanmcclean
[5.x] Remove Antlers Regex Parser (#9442)
be95693
@duncanmcclean
[5.x] Implement Localization interface on LocalizedTerm (#9496)
5e6df0a
@duncanmcclean
Merge branch '4.x'
91c0834
@duncanmcclean
[5.x] Fix failing Antlers tests (#9544)
9b08674 
Fix failing Antlers tests
@duncanmcclean
[5.x] Make Bard/Replicator/Grid sets sit at the bottom of the field c…
29c56c5 
…onfigs (#9516)
@duncanmcclean
Merge remote-tracking branch 'origin/4.x'
eb5cef1
@jasonvarga
Merge branch '4.x'
45d7b79
@JohnathonKoster
[5.x] Sanitize SVG Tag Output by Default (#9575)
0f3cb3b
@duncanmcclean
[5.x] Simple TestCase for addons (#9573)
153f6ca
@JohnathonKoster
[5.x] Refactor Form and SVG tags to use :attr prefix instead of `$k…
5b07862 
…nownTagParams` (#9576)
@duncanmcclean
Merge branch '4.x'
7dfcfce
@duncanmcclean
[5.x] Add findOrFail method to EntryRepository interface (#9596)
3e64710
@jasonvarga
Merge branch '4.x'
6263657
@JohnathonKoster
[5.x] Antlers: Adds support for disabling Antlers entirely inside tag…
4f244a8 
… parameter content (#8887)
@jasonvarga
Merge branch '4.x'
aeb76aa
@jasonvarga
[5.x] OAuth tweaks (#9623)
180de96
@duncanmcclean @jasonvarga
[5.x] Scaffold PHPUnit test suite with make:addon command (#9593)
36e9f80 
Co-authored-by: Jason Varga <[email protected]>
@duncanmcclean @jasonvarga
[5.x] Add install:ssg command (#9622)
b4b2905 
Co-authored-by: duncanmcclean <[email protected]>
Co-authored-by: Jason Varga <[email protected]>
@jasonvarga
Merge branch '4.x'
24864fc
@jasonvarga
[5.x] Laravel 11 (#9434)
dae2639
@JohnathonKoster
[5.x] Reuse results of referenceExists inside the structure `TreeBu…
9770ba2 
…ilder` (#9676)
@duncanmcclean
[5.x] Ensure structured collections are ordered by order by default (…
9cb3ab1 
…#9704)
@duncanmcclean
[5.x] Upgrade to Zipstream 3 (#9702)
d9c958a
@duncanmcclean
[5.x] Clone the date in modifyDate modifier (#9688)
7b72b46 
Co-authored-by: Jay George <[email protected]>
@jasonvarga
Merge branch '4.x'
71e00c2 
# Conflicts:
#	src/Structures/TreeBuilder.php
@jasonvarga
[5.x] PHPUnit 10 (#9715)
7ce6c84
@JohnathonKoster @jasonvarga
[5.x] Cache blueprint calls on Page instances (#9655)
76ffb6e 
Co-authored-by: Jason Varga <[email protected]>
@JohnathonKoster @jasonvarga
[5.x] Cache urls on Page instances (#9654)
7c4c067 
Co-authored-by: Jason Varga <[email protected]>
jasonvarga and others added 22 commits April 29, 2024 15:56
@jasonvarga
[5.x] Cache entry uri (#9844)
6b63786
@duncanmcclean @jasonvarga
[5.x] Offline License Validation (#9975)
6a8365c 
Co-authored-by: Jason Varga <[email protected]>
@jasonvarga
Merge branch '4.x'
edc3c91 
# Conflicts:
#	src/Console/Commands/StarterKitInstall.php
@jasonvarga @github-actions
Fix styling
5d1a51a
@jasonvarga
fix merge whoopsie
38ad724
@JohnathonKoster @jasonvarga
[5.x] Augmentation performance improvements (#9636)
d0f29dd 
Co-authored-by: Jason Varga <[email protected]>
@jasonvarga
changelog
9b02412
@jackmcdade
[5.x] Improve the fake sql config code comment (#9985)
1ae7911
@jackmcdade
[5.x] Multi site config help text (#9986)
fce280c
@jasonvarga
[5.x] Extract whereSite query method to trait (#9991)
341f506
@JohnathonKoster
[5.x] Prevent falsey values from returning blueprint defaults (#9990)
d474d67
@jasonvarga
changelog
7615083
@jesseleite
[5.x] Fix please command --help listing (#9977)
c43c663
@jasonvarga
[5.x] Fix 404s due to entry uri caching changes (#9998)
993aeb1
@jasonvarga
changelog
9d49f3b
@JohnathonKoster
[5.x] Ensures values are resolved when checking Antlers parsing setti…
b199ddf 
…ngs (#10003)
@JohnathonKoster
[5.x] Prevent excessive nocache cache growth (#9999)
a32c923
@jasonvarga
Merge branch '4.x'
adfb667 
# Conflicts:
#	CHANGELOG.md
@jasonvarga
changelog
91f6611
@duncanmcclean @jasonvarga
[5.x] Use Statamic.$slug helper instead of $slugify (#10018)
48f3faf 
Co-authored-by: Jason Varga <[email protected]>
@jasonvarga
[5.x] Allow opting out of svg tag sanitization (#10020)
82345a4
@jasonvarga
Merge branch '4.x'
29e3835 
# Conflicts:
#	CHANGELOG.md
@duncanmcclean duncanmcclean linked an issue May 9, 2024 that may be closed by this pull request
Having a column in the users table of notifications prevents the control panel loading #9932
Closed
jasonvarga
jasonvarga requested changes May 9, 2024
View reviewed changes
Copy link
Member

@jasonvarga jasonvarga left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please target 4.x

@duncanmcclean duncanmcclean changed the base branch from master to 4.x May 9, 2024 14:20
@duncanmcclean duncanmcclean changed the title [5.x] Add notifications method to AugmentedUser [4.x] Add notifications method to AugmentedUser May 9, 2024
@duncanmcclean duncanmcclean force-pushed the fix/prevent-calling-notifications-method-on-user-v5 branch from 4f9c4ea to 29e3835 Compare May 9, 2024 14:22
@duncanmcclean duncanmcclean deleted the fix/prevent-calling-notifications-method-on-user-v5 branch May 9, 2024 14:23
@duncanmcclean duncanmcclean mentioned this pull request May 9, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasonvarga jasonvarga jasonvarga requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Having a column in the users table of notifications prevents the control panel loading
8 participants
@duncanmcclean @jasonvarga @JohnathonKoster @jesseleite @ryanmitchell @jacksleight @peimn @jackmcdade