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.

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

Allow null group assignment for users (Issue #867) #964

Merged
merged 22 commits into from Jul 12, 2019
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
93f3dec
Add migration
amosfolz Apr 9, 2019
eb5f57c
Updates to allow empty group_id
amosfolz Apr 11, 2019
aec3479
Add foreignkey migration to dependencies
amosfolz Apr 11, 2019
c08cf38
Remove and then recreate foreign key constraint
amosfolz Apr 13, 2019
d207ca2
Change column type to
amosfolz Apr 14, 2019
047258b
Changed foreign key to array value format
amosfolz Apr 14, 2019
c8656b7
Merge remote-tracking branch 'upstream/develop' into issue-#867
amosfolz May 11, 2019
953a36c
Merge remote-tracking branch 'upstream/develop' into issue-#867
amosfolz Jun 15, 2019
abe23cc
styleci fixes
amosfolz Jun 15, 2019
c731414
Modify UpdateUsersTable.php
amosfolz Jun 19, 2019
2de781a
Create UpdateUsersTable.php
amosfolz Jun 19, 2019
13fa23c
Migration, controller, template, and asset updates
amosfolz Jun 19, 2019
c189db8
Merge remote-tracking branch 'upstream/develop' into allow-null-group…
amosfolz Jun 19, 2019
062f5d1
Merge branch 'allow-null-group-assignment' into issue-#867
amosfolz Jun 19, 2019
8c87ba7
Remove nullable in down
amosfolz Jun 21, 2019
87e59cb
Merge branch 'develop' into issue-#867
amosfolz Jul 11, 2019
992badb
Merge branch 'develop' into allow-null-group-assignment
amosfolz Jul 11, 2019
b26b705
Fix invalid html
amosfolz Jul 11, 2019
b49c11b
Merge branch 'allow-null-group-assignment' into issue-#867
amosfolz Jul 11, 2019
ce4c507
Update user.html.twig
amosfolz Jul 11, 2019
3467690
Merge branch 'allow-null-group-assignment' into issue-#867
amosfolz Jul 11, 2019
71b2cd1
Add translation key for No group
amosfolz Jul 12, 2019
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

styleci fixes

  • Loading branch information...
amosfolz committed Jun 15, 2019
commit abe23ccc75fe824e8d765b319de3c1d8d6c2eb87
@@ -1,5 +1,6 @@
<?php
/**
/*
* UserFrosting (http://www.userfrosting.com)
*
* @link https://github.com/userfrosting/UserFrosting
@@ -15,9 +16,10 @@
/**
* Groups table migration
* Changes `group_id` column properties to allow user to be created without a group.
* Version 4.3.0
* Version 4.3.0.
*
* See https://laravel.com/docs/5.4/migrations#tables
*
* @author Alex Weissman (https://alexanderweissman.com)
*/
class UpdateUsersTable extends Migration
@@ -28,7 +30,7 @@ class UpdateUsersTable extends Migration
public static $dependencies = [
'\UserFrosting\Sprinkle\Account\Database\Migrations\v400\GroupsTable',
'\UserFrosting\Sprinkle\Account\Database\Migrations\v400\UsersTable',
'\UserFrosting\Sprinkle\Account\Database\Migrations\v420\AddingForeignKeys'
'\UserFrosting\Sprinkle\Account\Database\Migrations\v420\AddingForeignKeys',
];
/**
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.