User invitations #2095

Merged
hansegucker merged 36 commits from user-invitations into master 2021-12-24 20:56:42 +01:00
Owner

Closes #453

Closes #453
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>f45574ac - Install django-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4398&start_sha=929c0d714dd8a2afc13e3f708f2ec5aa0fd08dc8)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>caf366a2 - Configure django-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4399&start_sha=f45574ac7a004dbc2baf7c5c6180d923d47a0a79)
Author
Owner

mentioned in issue #331

mentioned in issue #331
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>a54a5161 - Rewrite templates</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4404&start_sha=caf366a2c7da5b92dae5991b00ea047a2992e01d)
Author
Owner

requested review from @ZugBahnHof

requested review from @ZugBahnHof
Author
Owner

assigned to @hansegucker

assigned to @hansegucker
Author
Owner

added 3 commits

  • ed2721e3 - 1 commit from branch 331-user-registration
  • 45671793 - Merge branch '331-user-registration' into user-invitations
  • ace54cb9 - Fix menu item

Compare with previous version

added 3 commits <ul><li>ed2721e3 - 1 commit from branch <code>331-user-registration</code></li><li>45671793 - Merge branch &#39;331-user-registration&#39; into user-invitations</li><li>ace54cb9 - Fix menu item</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4408&start_sha=a54a5161e9bc7489944128ba0ed25442ceaa904f)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>fbcedb27 - Reformat tables</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4409&start_sha=ace54cb9034e781bc74c453a2160bc57030904c6)
Owner

I would like that these things can be set using site preferences.

I would like that these things can be set using site preferences.
Author
Owner

added 1 commit

  • 5da8c609 - Rewrite create() method of InvitationModel

Compare with previous version

added 1 commit <ul><li>5da8c609 - Rewrite create() method of InvitationModel</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4416&start_sha=fbcedb27848bdd1c86b832271df21c94588a569e)
Author
Owner

added 19 commits

  • 5da8c609...02c821f5 - 18 commits from branch 331-user-registration
  • a6bf6adc - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 19 commits <ul><li>5da8c609...02c821f5 - 18 commits from branch <code>331-user-registration</code></li><li>a6bf6adc - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4461&start_sha=5da8c609da251e9be5f385f357844c3f865b671a)
Author
Owner

added 1 commit

  • dd518aca - Use custom invitation model

Compare with previous version

added 1 commit <ul><li>dd518aca - Use custom invitation model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4479&start_sha=a6bf6adca3a52dc67f6d6b373586e4a7fbbca6e2)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>e0d4b550 - Use custom invitation model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4482&start_sha=dd518acab8120258f750a99e4c61dd015c1f3499)
Author
Owner

added 9 commits

  • 4120a2c0 - Link/Create persons if a matching one is found for a user
  • 0b2be5f2 - Reverse logic in auto-creation of persons
  • 68600351 - Validate that the user has a name before trying to create a person
  • d3f6819a - Merge branch 'master' into 332-allow-automatic-linking-of-persons-to-account-by-e-mail-address
  • c7daea20 - Correctly honour auto_create_person preference
  • 89e1c037 - Update tox.ini; compile messages before building dist
  • 2f54f82b - Merge branch 'feature/compile-messages-before-build' into 'master'
  • 8911d0e4 - Merge branch '332-allow-automatic-linking-of-persons-to-account-by-e-mail-address' into 'master'
  • d6170cc7 - Merge branch 'master' into user-invitations

Compare with previous version

added 9 commits <ul><li>4120a2c0 - Link/Create persons if a matching one is found for a user</li><li>0b2be5f2 - Reverse logic in auto-creation of persons</li><li>68600351 - Validate that the user has a name before trying to create a person</li><li>d3f6819a - Merge branch &#39;master&#39; into 332-allow-automatic-linking-of-persons-to-account-by-e-mail-address</li><li>c7daea20 - Correctly honour auto_create_person preference</li><li>89e1c037 - Update tox.ini; compile messages before building dist</li><li>2f54f82b - Merge branch &#39;feature/compile-messages-before-build&#39; into &#39;master&#39;</li><li>8911d0e4 - Merge branch &#39;332-allow-automatic-linking-of-persons-to-account-by-e-mail-address&#39; into &#39;master&#39;</li><li>d6170cc7 - Merge branch &#39;master&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4484&start_sha=e0d4b550fd3bc076b6fff6fc9b694eac3624098e)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>ca4431a7 - Add missing migration</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4485&start_sha=d6170cc7b2ce0b2ed1eb5b3be6187d5ca7c54ebf)
Author
Owner

added 7 commits

  • 75c5a8a1 - Enable all panels
  • 9f186e6f - Merge branch 'fix-djdt' into 'master'
  • 6be1929f - Revert "Support custom authentication backends"
  • d6fe6b89 - Merge branch 'bugfix/remove-custom-auth-backends' into 'master'
  • f3e951cc - Always return False for `has_person` if not logged in
  • 2190d869 - Merge branch 'bugfix/anonymous_user_has_no_person' into 'master'
  • 817c894e - Merge branch 'master' into user-invitations

Compare with previous version

added 7 commits <ul><li>75c5a8a1 - Enable all panels</li><li>9f186e6f - Merge branch &#39;fix-djdt&#39; into &#39;master&#39;</li><li>6be1929f - Revert &quot;Support custom authentication backends&quot;</li><li>d6fe6b89 - Merge branch &#39;bugfix/remove-custom-auth-backends&#39; into &#39;master&#39;</li><li>f3e951cc - Always return False for `has_person` if not logged in</li><li>2190d869 - Merge branch &#39;bugfix/anonymous_user_has_no_person&#39; into &#39;master&#39;</li><li>817c894e - Merge branch &#39;master&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4487&start_sha=ca4431a7af678c7f644bf72f224959286b98eeb2)
Author
Owner

added 3 commits

  • a8f7c79d - Do not link person if anonymous
  • 244d300d - Merge branch 'bugfix/do_not_link_person_if_anonymous' into 'master'
  • 8078b9e8 - Merge branch 'master' into user-invitations

Compare with previous version

added 3 commits <ul><li>a8f7c79d - Do not link person if anonymous</li><li>244d300d - Merge branch &#39;bugfix/do_not_link_person_if_anonymous&#39; into &#39;master&#39;</li><li>8078b9e8 - Merge branch &#39;master&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4489&start_sha=817c894e21804a04ca76dd06b73f7981730645bf)
Author
Owner

added 2 commits

  • cec255a1 - Allow to enter an invitation code in frontend
  • 657aee66 - Merge branch 'user-invitations' of edugit.org:AlekSIS/official/AlekSIS-Core into user-invitations

Compare with previous version

added 2 commits <ul><li>cec255a1 - Allow to enter an invitation code in frontend</li><li>657aee66 - Merge branch &#39;user-invitations&#39; of edugit.org:AlekSIS/official/AlekSIS-Core into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4493&start_sha=8078b9e86698d62b4b79e2ac92798647c39fc183)
Author
Owner

added 1 commit

  • cb489f9f - Allow to enter invitation codes

Compare with previous version

added 1 commit <ul><li>cb489f9f - Allow to enter invitation codes</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4495&start_sha=657aee663c8b1e283e66f891eb977e278ab78ef5)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>971beed2 - Fix form field</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4499&start_sha=cb489f9fe780e64c5fbcc46c26fc36264ed0b036)
Author
Owner

changed this line in version 19 of the diff

changed this line in [version 19 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4531&start_sha=971beed2477f036734ad4de88f93de9b57fd43e6#abc9d828b78bd9d36e05475d0bc91119bc5bc6b0_288_289)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>a2f2870d - Rewrite invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4531&start_sha=971beed2477f036734ad4de88f93de9b57fd43e6)
Author
Owner

added 19 commits

  • a2f2870d...4c640a6c - 18 commits from branch 331-user-registration
  • 8ecd6d44 - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 19 commits <ul><li>a2f2870d...4c640a6c - 18 commits from branch <code>331-user-registration</code></li><li>8ecd6d44 - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4532&start_sha=a2f2870de07c5740a5d2cbc84d322ad8e755c5a0)
Author
Owner

added 1 commit

  • 01002074 - Clean up code

Compare with previous version

added 1 commit <ul><li>01002074 - Clean up code</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4534&start_sha=8ecd6d4433635e549de8d6ab061462164b4c711b)
Owner

assigned to @nik and unassigned @hansegucker

assigned to @nik and unassigned @hansegucker
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>2b5f9e14 - Clean up code</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4536&start_sha=01002074674bac426d597be33d1606b73c4044b2)
Author
Owner

added 3 commits

  • 2b5f9e14...28b14412 - 2 commits from branch 331-user-registration
  • 4aea7ffa - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 3 commits <ul><li>2b5f9e14...28b14412 - 2 commits from branch <code>331-user-registration</code></li><li>4aea7ffa - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4539&start_sha=2b5f9e14021bd19c3a69c18158800f64e2327b28)
Owner

Inconsistent naming — is it for "invite only" or for "signup open"?

Inconsistent naming — is it for "invite only" or for "signup open"?
Owner

Please use the method from the original Invitation class.

Please use the method from the original `Invitation` class.
Owner

Please use the method from the original Invitation class.

Please use the method from the original `Invitation` class.
Owner

Should be a preference

Should be a preference
Owner

Please elaborate a bit more on why this is a custom model.

Please elaborate a bit more on why this is a custom model.
Owner

Should be passed as argument, as this is a generic function.

Should be passed as argument, as this is a generic function.
Owner

Please do not add new non-class-based views.

Please do not add new non-class-based views.
Owner

Just redirect to the accept-invite URL here with the entered code.

Just redirect to the accept-invite URL here with the entered code.
Owner

Please do not add new non-class-based views.

Please do not add new non-class-based views.
Owner

Should list the invitation code

Should list the invitation code
Owner

Would be better if it had nice styling for the packs of the code.

Would be better if it had nice styling for the packs of the code.
Author
Owner

changed this line in version 25 of the diff

changed this line in [version 25 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4540&start_sha=4aea7ffa4fc556f79cbfb5fa0396d9aa56fef6f2#cedfd047579474194a5f10a12c798242313675da_221_221)
Author
Owner

changed this line in version 25 of the diff

changed this line in [version 25 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4540&start_sha=4aea7ffa4fc556f79cbfb5fa0396d9aa56fef6f2#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_931_932)
Author
Owner

changed this line in version 25 of the diff

changed this line in [version 25 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4540&start_sha=4aea7ffa4fc556f79cbfb5fa0396d9aa56fef6f2#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_935_932)
Author
Owner

changed this line in version 25 of the diff

changed this line in [version 25 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4540&start_sha=4aea7ffa4fc556f79cbfb5fa0396d9aa56fef6f2#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_917_918)
Author
Owner

changed this line in version 25 of the diff

changed this line in [version 25 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4540&start_sha=4aea7ffa4fc556f79cbfb5fa0396d9aa56fef6f2#8c15ef90a05145592bdded0de1ca9faad06ca049_412_412)
Author
Owner

added 1 commit

  • 69823630 - Clean up code

Compare with previous version

added 1 commit <ul><li>69823630 - Clean up code</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4540&start_sha=4aea7ffa4fc556f79cbfb5fa0396d9aa56fef6f2)
Author
Owner

changed this line in version 26 of the diff

changed this line in [version 26 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4542&start_sha=698236304a2dc06bca625e1f84d479cea70bc05d#ca5e4a886c594c4b59402dbdbd16348bdbcddf3a_962_963)
Author
Owner

changed this line in version 26 of the diff

changed this line in [version 26 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4542&start_sha=698236304a2dc06bca625e1f84d479cea70bc05d#ca5e4a886c594c4b59402dbdbd16348bdbcddf3a_989_966)
Author
Owner

changed this line in version 26 of the diff

changed this line in [version 26 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4542&start_sha=698236304a2dc06bca625e1f84d479cea70bc05d#ca5e4a886c594c4b59402dbdbd16348bdbcddf3a_994_989)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>b566b071 - Clean up code</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4542&start_sha=698236304a2dc06bca625e1f84d479cea70bc05d)
Author
Owner

added 1 commit

  • df25f179 - Clean up code

Compare with previous version

added 1 commit <ul><li>df25f179 - Clean up code</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4543&start_sha=b566b071f7b3266fc41836ef11d39b6adafd7e92)
Author
Owner

added 1 commit

  • ff8c7d5c - Clean up code

Compare with previous version

added 1 commit <ul><li>ff8c7d5c - Clean up code</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4544&start_sha=df25f179d74873c9b2b9f801d18b398bf5595810)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>91179e8d - Clean up code</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4545&start_sha=ff8c7d5cc741b6aa1c9f1c14d65fa21db723b13e)
Author
Owner

Screenshot_20210127_170817

![Screenshot_20210127_170817](/uploads/3e3bb3015c0ec85f2f5c3849a0e4427b/Screenshot_20210127_170817.png)
Owner

I think this is fine from the frontend perspective.

I think this is fine from the frontend perspective.
Author
Owner

added 1 commit

  • dff8e2b3 - Rewrite form to enter invitation code

Compare with previous version

added 1 commit <ul><li>dff8e2b3 - Rewrite form to enter invitation code</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4606&start_sha=91179e8d2deb68b9d4f1baa6eac532e6664e8064)
Author
Owner

added 9 commits

  • dff8e2b3...dd3aa077 - 8 commits from branch 331-user-registration
  • 14b25457 - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 9 commits <ul><li>dff8e2b3...dd3aa077 - 8 commits from branch <code>331-user-registration</code></li><li>14b25457 - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4656&start_sha=dff8e2b387deb1090e92c7cbc0b020251c83c68b)
Author
Owner

added 1 commit

  • 5fc8441b - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 1 commit <ul><li>5fc8441b - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4657&start_sha=14b25457306b90e6847b25964c41cf554c2e934e)
Author
Owner

added 1 commit

  • 5acbec3e - Calculate number of needed fields

Compare with previous version

added 1 commit <ul><li>5acbec3e - Calculate number of needed fields</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4659&start_sha=5fc8441bcbb0ede3fec6adac38ca4fe0dbc22fd9)
Author
Owner

added 1 commit

  • a7d132a2 - Redirect to accept view

Compare with previous version

added 1 commit <ul><li>a7d132a2 - Redirect to accept view</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4663&start_sha=5acbec3e8e7185130e7468a9a0b00aa4d9b0b426)
Author
Owner

resolved all threads

resolved all threads
Author
Owner

marked this merge request as ready

marked this merge request as **ready**
Author
Owner

added 1 commit

  • 2b616a5b - Redirect to accept view

Compare with previous version

added 1 commit <ul><li>2b616a5b - Redirect to accept view</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4665&start_sha=f0148a45b623aa3aee6f4f01c8306bf262f0d776)
Author
Owner

added 1 commit

  • 6086acc6 - Redirect to accept view

Compare with previous version

added 1 commit <ul><li>6086acc6 - Redirect to accept view</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4666&start_sha=2b616a5b499254c9f2f46b2337b8e4289d46bc72)
Author
Owner

added 1 commit

  • 9b9b3cdb - Redirect to accept view

Compare with previous version

added 1 commit <ul><li>9b9b3cdb - Redirect to accept view</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4667&start_sha=6086acc66df3ccaa30273f556cf2bd89a9a48927)
Author
Owner

@ZugBahnHof: Please review and approve

@nik: Please review and merge

@ZugBahnHof: Please review and approve @nik: Please review and merge
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>a2d0b930 - Redirect to accept view</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4668&start_sha=9b9b3cdba1b7b05c96b9feea3742c5b4170357b4)
Owner

This will show an intermediate page to accept the invite, right? Might be better t obuild the form in a way that filling it in ca ndirectly POST to accept-invit.

This will show an intermediate page to accept the invite, right? Might be better t obuild the form in a way that filling it in ca ndirectly POST to `accept-invit`.
Owner

Has @ZugBahnHof reviewd this?

Has @ZugBahnHof reviewd this?
Owner

Please make this a constant/preference/whatever and use it everywhere.

Please make this a constant/preference/whatever and use it everywhere.
Owner

Magic constant in here… define it somewhere under a readable name.

Also, is this specific to invitations, or not? If yes, name it that way; if not, the block length should be an argument rather than a constant used directly here (it probably should anyway)

Magic constant in here… define it somewhere under a readable name. Also, is this specific to invitations, or not? If yes, name it that way; if not, the block length should be an argument rather than a constant used directly here (it probably should anyway)
Author
Owner

I don't think so…

I don't think so…
Author
Owner

changed this line in version 40 of the diff

changed this line in [version 40 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4669&start_sha=a2d0b9307766c04be519dfaa16b9ae2f48b76dd3#8c15ef90a05145592bdded0de1ca9faad06ca049_412_412)
Author
Owner

added 1 commit

  • 8f6d9e7c - Add preference for packet size.

Compare with previous version

added 1 commit <ul><li>8f6d9e7c - Add preference for packet size.</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4669&start_sha=a2d0b9307766c04be519dfaa16b9ae2f48b76dd3)
Author
Owner

changed this line in version 41 of the diff

changed this line in [version 41 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4670&start_sha=8f6d9e7cccc43e0a3da5b363984af23b0646cac9#ca5e4a886c594c4b59402dbdbd16348bdbcddf3a_971_971)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>c1a5e0bc - Fix redirect</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4670&start_sha=8f6d9e7cccc43e0a3da5b363984af23b0646cac9)
Member

I don't think this icon is that fitting. Maybe vpn_key but that's only a little better. Maybe you find something else

I don't think this icon is that fitting. Maybe `vpn_key` but that's only a little better. Maybe you find something else
Member

I don't think this icon is that fitting. Maybe person_add but that's only a little better. Maybe you find something else

I don't think this icon is that fitting. Maybe `person_add` but that's only a little better. Maybe you find something else
Member

I don't think this icon is fitting here, it is not really submit related

I don't think this icon is fitting here, it is not really submit related
Member

I don't think this icon is fitting here, it is not really submit related

I don't think this icon is fitting here, it is not really submit related
Member

I've seen this now, it's not the most beautiful, but I don't really know how to make it better. But if I remember correctly there is a CSS-class called hundred-percent inside the main style.scss that is exactly for this purpose, so you won't need to use this new class.

I've seen this now, it's not the most beautiful, but I don't really know how to make it better. But if I remember correctly there is a CSS-class called `hundred-percent` inside the main `style.scss` that is exactly for this purpose, so you won't need to use this new class.
Member

Please use an icon here. Maybe qr_code?

Please use an icon here. Maybe `qr_code`?
Member

Is it possible for you to write a Layout for this form to make this form be in one line (at east on large enough devices)?

Is it possible for you to write a Layout for this form to make this form be in one line (at east on large enough devices)?
Owner

There was a requirement to invite a specific person to register, either by sending that person an e-mail or by generating a code that is only usable by this perosn, and in such a way that the registered user account is linked to exactly that person upon acceptance.

I do not see this implemented in this MR.

There was a requirement to invite a specific person to register, either by sending that person an e-mail or by generating a code that is only usable by this perosn, and in such a way that the registered user account is linked to exactly that person upon acceptance. I do not see this implemented in this MR.
Author
Owner

added 17 commits

  • c1a5e0bc...1af84364 - 16 commits from branch 331-user-registration
  • 943cda4e - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 17 commits <ul><li>c1a5e0bc...1af84364 - 16 commits from branch <code>331-user-registration</code></li><li>943cda4e - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4706&start_sha=c1a5e0bc94c49f7cfc3d096ffae85a3ab0fb1352)
Author
Owner

vpn_key is already used by another official App.

vpn_key is already used by another official App.
Author
Owner

person_add is already used iirc.

`person_add` is already used iirc.
Member

Which one?

Which one?
Author
Owner

added 9 commits

  • 943cda4e...c15e244b - 8 commits from branch 331-user-registration
  • b35368bb - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 9 commits <ul><li>943cda4e...c15e244b - 8 commits from branch <code>331-user-registration</code></li><li>b35368bb - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4728&start_sha=943cda4ead9876e932c2cd91457d2bdb51f0e718)
Author
Owner

AlekSIS-App-POSIX

AlekSIS-App-POSIX
Author
Owner

yup. Already used by persons_accounts

yup. Already used by `persons_accounts`…
Author
Owner

changed this line in version 44 of the diff

changed this line in [version 44 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4730&start_sha=b35368bb6cb48cca8e875e7777a94578a6ae7a26#105dde677b9e2a1590f93a471e270af4803f8f66_390_388)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>aefe0b69 - Fix CSS class of button</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4730&start_sha=b35368bb6cb48cca8e875e7777a94578a6ae7a26)
Author
Owner

added 68 commits

  • aefe0b69...77b61fc9 - 67 commits from branch 331-user-registration
  • 3ec87cc7 - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 68 commits <ul><li>aefe0b69...77b61fc9 - 67 commits from branch <code>331-user-registration</code></li><li>3ec87cc7 - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4863&start_sha=aefe0b6923dbb4a0f2dfa1c1496366cfe5eb8324)
Author
Owner

changed this line in version 47 of the diff

changed this line in [version 47 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4864&start_sha=3ec87cc734bcf4f42fa07da033e1cc9917c9069a#41b06a954c61fecb081db93d283750488a928ca1_20_15)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>26571c48 - Rewrite templates</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4864&start_sha=3ec87cc734bcf4f42fa07da033e1cc9917c9069a)
Owner

added 4 commits

  • 26571c48...60a2b3d7 - 3 commits from branch 331-user-registration
  • 8541e4d4 - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 4 commits <ul><li>26571c48...60a2b3d7 - 3 commits from branch <code>331-user-registration</code></li><li>8541e4d4 - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4874&start_sha=26571c48f153e5db2a3a6f757f746ff39b8e00ad)
Owner

added 1 commit

  • 40afdc5b - Rewrite invitation code form to use the same style

Compare with previous version

added 1 commit <ul><li>40afdc5b - Rewrite invitation code form to use the same style</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4880&start_sha=8541e4d4da71d316e5f0a2a33a5e438e6b77fe5d)
Member

I still would not use the giftcard icons. Maybe just use some other ones and change them when the new icon set arrives?
And btw, the Core menu section Account uses the same icon as the Chronos menu entry My Plan

I still would not use the giftcard icons. Maybe just use some other ones and change them when the new icon set arrives? And btw, the Core menu section `Account` uses the same icon as the Chronos menu entry `My Plan`
Author
Owner

added 3 commits

  • 91a78776 - 1 commit from branch 331-user-registration
  • a1658180 - Merge branch '331-user-registration' into user-invitations
  • 0adfdcc9 - Use django-cleavejs instead of django-split-input

Compare with previous version

added 3 commits <ul><li>91a78776 - 1 commit from branch <code>331-user-registration</code></li><li>a1658180 - Merge branch &#39;331-user-registration&#39; into user-invitations</li><li>0adfdcc9 - Use django-cleavejs instead of django-split-input</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4934&start_sha=40afdc5b053612f4045e80f42f69bcb5e733203b)
Author
Owner

added 6 commits

  • 0adfdcc9...c33217b2 - 5 commits from branch 331-user-registration
  • 447cc3d2 - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 6 commits <ul><li>0adfdcc9...c33217b2 - 5 commits from branch <code>331-user-registration</code></li><li>447cc3d2 - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4936&start_sha=0adfdcc9180db6f8b6de39042d87000bfd753311)
Author
Owner

added 1 commit

  • f9033d93 - Fix syntax

Compare with previous version

added 1 commit <ul><li>f9033d93 - Fix syntax</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4937&start_sha=447cc3d20b8a315007b70702214db19c1fbbb125)
Author
Owner

added 1 commit

  • 2458f297 - Fix syntax

Compare with previous version

added 1 commit <ul><li>2458f297 - Fix syntax</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4938&start_sha=f9033d93ba75bc7b24a4bf4b4103c1f98feec1e5)
Author
Owner

added 1 commit

  • 7a86212e - Fix syntax

Compare with previous version

added 1 commit <ul><li>7a86212e - Fix syntax</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4940&start_sha=2458f2979a2be7e78ab31b7b06f66e7ad7ebebb8)
Author
Owner

added 1 commit

  • 31909a17 - Fix syntax

Compare with previous version

added 1 commit <ul><li>31909a17 - Fix syntax</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4941&start_sha=7a86212e27b202ae7b37f1c3885d8dfb058e2eb5)
Author
Owner

added 1 commit

  • 670c3262 - Fix syntax

Compare with previous version

added 1 commit <ul><li>670c3262 - Fix syntax</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4944&start_sha=31909a17a820f0ee66e103182fb330cc9d05b72d)
Owner

mentioned in merge request !2142

mentioned in merge request !2142
Author
Owner

added 5 commits

  • 4a4569ac - Use django-cleavejs instead of django-split-input. Closes #381
  • 24fb8afb - Add health checks for media and db backups. Closes #378
  • 429d72c7 - Use seperate settings for db and media backup
  • d7cf081c - Apply 1 suggestion(s) to 1 file(s)
  • 2e0efbdf - Fix syntax

Compare with previous version

added 5 commits <ul><li>4a4569ac - Use django-cleavejs instead of django-split-input. Closes #381</li><li>24fb8afb - Add health checks for media and db backups. Closes #378</li><li>429d72c7 - Use seperate settings for db and media backup</li><li>d7cf081c - Apply 1 suggestion(s) to 1 file(s)</li><li>2e0efbdf - Fix syntax</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4945&start_sha=670c32627cc48391951a48e59fe10aa361fddb3b)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>92b72f5e - Sicherheitscommit</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=4955&start_sha=2e0efbdf355d4f8671b281313893a4e4e59333d3)
Author
Owner

added 13 commits

  • 92b72f5e...1de961c1 - 10 commits from branch 331-user-registration
  • b566b071 - Clean up code
  • 09f3dfce - Merge branch 'user-invitations' of edugit.org:AlekSIS/official/AlekSIS-Core into user-invitations
  • ed6b142c - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 13 commits <ul><li>92b72f5e...1de961c1 - 10 commits from branch <code>331-user-registration</code></li><li>b566b071 - Clean up code</li><li>09f3dfce - Merge branch &#39;user-invitations&#39; of edugit.org:AlekSIS/official/AlekSIS-Core into user-invitations</li><li>ed6b142c - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=5023&start_sha=92b72f5e31fda6ba4adaad42b66a6fc6a6cbb4f7)
Author
Owner

added 1 commit

  • c85c23b3 - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 1 commit <ul><li>c85c23b3 - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=5025&start_sha=ed6b142c9d30d043fa1f5f48e8e321abd8a284ae)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>8741335b - [Reformat] Make lint clean</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=5026&start_sha=c85c23b3e0ebb85c8ab415cd390052c9278062e1)
Author
Owner

added 1 commit

  • bb9cf666 - Reformat templates

Compare with previous version

added 1 commit <ul><li>bb9cf666 - Reformat templates</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=5028&start_sha=8741335b12c77e130ad27360a66cde2479556bf4)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>976b1ba9 - Reformat templates</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=5029&start_sha=bb9cf666fc77e72c5aa6ef43b643a394d21b9c1b)
Author
Owner

added 159 commits

  • 976b1ba9...7882bb4c - 158 commits from branch 331-user-registration
  • 6b878fac - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 159 commits <ul><li>976b1ba9...7882bb4c - 158 commits from branch <code>331-user-registration</code></li><li>6b878fac - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=6291&start_sha=976b1ba95004abe154b1f43bb7386bd020d6bffa)
Author
Owner

added 25 commits

  • 6b878fac...6d5e9dac - 24 commits from branch 331-user-registration
  • 58ef64dc - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 25 commits <ul><li>6b878fac...6d5e9dac - 24 commits from branch <code>331-user-registration</code></li><li>58ef64dc - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=6578&start_sha=6b878facd6aa3b609c7d44a67ab9dbeb455f3cef)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>d2467da6 - Reformat import</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=6580&start_sha=58ef64dc8cb463402a57a69d1314fae31a4cad5e)
Author
Owner

added 1 commit

  • bd8f68bf - Fix migrations

Compare with previous version

added 1 commit <ul><li>bd8f68bf - Fix migrations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=6582&start_sha=d2467da64a7a747ea007930f86bbe40d98c1d115)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>1c333a3d - Fix migrations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=6583&start_sha=bd8f68bf8c4f81c3dbeedf8b55699fb438be29c9)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>993ac84c - Recreate migration</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=6585&start_sha=1c333a3d3efd0c1ff324c9a336dc7fc4c02d0f05)
Author
Owner

added 1 commit

  • 23394236 - Move blocks to init method

Compare with previous version

added 1 commit <ul><li>23394236 - Move blocks to init method</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=6586&start_sha=993ac84c7ca3ecf8aff73fd0482f2de8719beeb3)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>96c06e0a - Move blocks to init method</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=6588&start_sha=233942367956f6bd841baac9bb26e44fb6fc2f4c)
Author
Owner

resolved all threads

resolved all threads
Author
Owner

changed this line in version 72 of the diff

changed this line in [version 72 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=6591&start_sha=96c06e0a803596eeb519337ce288ec5e0a0e68a9#e25342bba815fa538d53a3e922ea2f6e55b6a2b3_26_26)
Author
Owner

added 1 commit

  • 1a7fc767 - Fix menu icon

Compare with previous version

added 1 commit <ul><li>1a7fc767 - Fix menu icon</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=6591&start_sha=96c06e0a803596eeb519337ce288ec5e0a0e68a9)
Author
Owner

added 89 commits

  • 1a7fc767...0c3778c8 - 88 commits from branch 331-user-registration
  • 639e74e1 - Merge branch '331-user-registration' into user-invitations

Compare with previous version

added 89 commits <ul><li>1a7fc767...0c3778c8 - 88 commits from branch <code>331-user-registration</code></li><li>639e74e1 - Merge branch &#39;331-user-registration&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=7666&start_sha=1a7fc767a0d4ebd5db26c0f8db3c908a41a88e07)
Author
Owner

added 1 commit

  • cd0baed9 - Allow to invite specific person

Compare with previous version

added 1 commit <ul><li>cd0baed9 - Allow to invite specific person</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=7678&start_sha=639e74e160a7a3d9ebec7a5e5cff1c966729c1ca)
Author
Owner

added 1 commit

  • 1666480c - Allow to invite specific person

Compare with previous version

added 1 commit <ul><li>1666480c - Allow to invite specific person</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=7723&start_sha=cd0baed9f9e60631ca03b1ee3a930227593b55ee)
Owner

mentioned in issue #453

mentioned in issue #453
Owner

changed the description

changed the description
Author
Owner

deleted the 331-user-registration branch. This merge request now targets the master branch

deleted the `331-user-registration` branch. This merge request now targets the `master` branch
Owner

marked this merge request as draft

marked this merge request as **draft**
Author
Owner

added 755 commits

  • 1666480c...210cd536 - 754 commits from branch master
  • 9c158b3b - Merge branch 'master' into user-invitations

Compare with previous version

added 755 commits <ul><li>1666480c...210cd536 - 754 commits from branch <code>master</code></li><li>9c158b3b - Merge branch &#39;master&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14220&start_sha=1666480c0a60a0ad6eef0e94368d8732d1c428bc)
Author
Owner

added 1 commit

  • 721497ac - Fix conflicting migration

Compare with previous version

added 1 commit <ul><li>721497ac - Fix conflicting migration</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14222&start_sha=9c158b3bd76320a13b516712798e9bd3b3a78fc3)
Author
Owner

added 1 commit

  • 6e0fef50 - Fix url routes

Compare with previous version

added 1 commit <ul><li>6e0fef50 - Fix url routes</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14225&start_sha=721497ac027151ccb4376f636174aad3b8c31745)
Author
Owner

added 1 commit

  • 4068db1f - Fix syntax and add missign preference

Compare with previous version

added 1 commit <ul><li>4068db1f - Fix syntax and add missign preference</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14226&start_sha=6e0fef509c9753c84e329d705341a26e6349f064)
Author
Owner

added 11 commits

  • 4068db1f...45467c97 - 10 commits from branch master
  • f9d81345 - Merge branch 'master' into user-invitations

Compare with previous version

added 11 commits <ul><li>4068db1f...45467c97 - 10 commits from branch <code>master</code></li><li>f9d81345 - Merge branch &#39;master&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14388&start_sha=4068db1fd76652b960ec1305783b3e2a259e44a2)
Author
Owner

added 1 commit

  • 94de6eef - Remvoe useless get function

Compare with previous version

added 1 commit <ul><li>94de6eef - Remvoe useless get function</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14389&start_sha=f9d813459d5261ea2359d159f787672c3909ad5b)
Author
Owner

added 1 commit

  • 701448e4 - Allow person to be null

Compare with previous version

added 1 commit <ul><li>701448e4 - Allow person to be null</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14397&start_sha=94de6eef9923c9ade973f786202a80b9c58b98b2)
Author
Owner

added 1 commit

  • 665de293 - Reformat code

Compare with previous version

added 1 commit <ul><li>665de293 - Reformat code</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14398&start_sha=701448e4bced0a1ddb61c33cede1606be4cf17e3)
Author
Owner

added 9 commits

  • 665de293...7d76040f - 3 commits from branch master
  • 48a9d143 - Install and configure django-invitations
  • 1ce516c5 - Rewrite invitations model
  • a57092a4 - Add migrations
  • 2280ba68 - Implement invitation logic
  • 30677c94 - Add helper function to generate random code
  • fb229ce3 - Rewrite templates

Compare with previous version

added 9 commits <ul><li>665de293...7d76040f - 3 commits from branch <code>master</code></li><li>48a9d143 - Install and configure django-invitations</li><li>1ce516c5 - Rewrite invitations model</li><li>a57092a4 - Add migrations</li><li>2280ba68 - Implement invitation logic</li><li>30677c94 - Add helper function to generate random code</li><li>fb229ce3 - Rewrite templates</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14401&start_sha=665de293b86497f8b3e7d3942750934a14189f45)
Author
Owner

added 1 commit

  • a409b1ea - Do not create person on signup

Compare with previous version

added 1 commit <ul><li>a409b1ea - Do not create person on signup</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14405&start_sha=fb229ce3a74fe83fcf8832da6c8d4250f9b1aae9)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>11fa7752 - Refactor registration form</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14415&start_sha=a409b1ea8f15c7e8ce06f12730efb162f53c2042)
Author
Owner

added 9 commits

  • 11fa7752...f183bdf6 - 7 commits from branch master
  • ecfdcad5 - Merge branch 'master' into user-invitations
  • 6958f79f - Merge branch 'user-invitations' of edugit.org:AlekSIS/official/AlekSIS-Core into user-invitations

Compare with previous version

added 9 commits <ul><li>11fa7752...f183bdf6 - 7 commits from branch <code>master</code></li><li>ecfdcad5 - Merge branch &#39;master&#39; into user-invitations</li><li>6958f79f - Merge branch &#39;user-invitations&#39; of edugit.org:AlekSIS/official/AlekSIS-Core into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14447&start_sha=11fa775256d5f707f91a93bcd7e0170ab639403d)
Author
Owner

added 1 commit

  • 2254ff54 - Pass request to form

Compare with previous version

added 1 commit <ul><li>2254ff54 - Pass request to form</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14450&start_sha=6958f79f47524ebe5fc4c9345774a380f649e67c)
Author
Owner

added 1 commit

  • 83aedced - Pass request to form

Compare with previous version

added 1 commit <ul><li>83aedced - Pass request to form</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14451&start_sha=2254ff543e6e44af145aeb96fff4267dd1571cef)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>a01c02c5 - Pass request to form</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14452&start_sha=83aedced6d7c2284b249932eabd675fe715c127d)
Author
Owner

added 1 commit

  • c6ae7da6 - Raise 403 if signup disabled

Compare with previous version

added 1 commit <ul><li>c6ae7da6 - Raise 403 if signup disabled</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14454&start_sha=a01c02c54dcc08ae469b814c3ff0986b57e0c782)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>fb0bf2e5 - Raise 403 if signup disabled</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14455&start_sha=c6ae7da6b063b0be5ed3b336f0ab655ecb9c24fe)
Author
Owner

marked this merge request as ready

marked this merge request as **ready**
Owner

KeyErrors are not for catching.

Check for the key in regular flow control, instead.

`KeyError`s are not for catching. Check for the key in regular flow control, instead.
Owner

You should try to retrieve exactly one person here, and error out if none exists.

You should try to retrieve exactly one person here, and error out if none exists.
Owner

.last_name, probably.

`.last_name`, probably.
Owner

Unrelated change.

Unrelated change.
Owner

Why do we need to reference the person here?

Why do we need to reference the person here?
Owner
    verbose_name = _("Signup open for everyone")
```suggestion:-0+0 verbose_name = _("Signup open for everyone") ```
Owner

Shouldn't this depend on the preference defined in preferences.py?

Shouldn't this depend on the preference defined in `preferences.py`?
Owner

This should use ANY_JS.

This should use `ANY_JS`.
Owner

This manual wrapping seems very questionable, not only, but foremost, because it completely ignores packet_size.

What is it useful for?

This manual wrapping seems very questionable, not only, but foremost, because it completely ignores `packet_size`. What is it useful for?
Owner

Do not use try/catch. Use regular flow control to check for the key.

Do not use try/catch. Use regular flow control to check for the key.
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>3dd56b74 - Allow to invite person by id</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14457&start_sha=fb0bf2e53adc36ca396c3fc26e81992c527e7e63)
Owner

We should allow to define two preferences:

  • Fields shown in the registration form (defaulting to all required Person fields)
  • Fields additionally required for registriation (in contrast to shown, but optional)

This probably means we nede to create a Person object on registration agian, if one does not exist.

We should allow to define two preferences: * Fields shown in the registration form (defaulting to all required `Person` fields) * Fields additionally required for registriation (in contrast to shown, but optional) This probably means we nede to create a `Person` object on registration agian, if one does not exist.
Author
Owner

changed this line in version 99 of the diff

changed this line in [version 99 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14460&start_sha=3dd56b74c474dde5a7f9054d74d1b40ad6ef72ed#abc9d828b78bd9d36e05475d0bc91119bc5bc6b0_357_357)
Author
Owner

marked this merge request as draft

marked this merge request as **draft**
Author
Owner

changed this line in version 99 of the diff

changed this line in [version 99 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14460&start_sha=3dd56b74c474dde5a7f9054d74d1b40ad6ef72ed#622da2712f4801473aba0b611c3232f8148ef126_571_571)
Author
Owner

changed this line in version 99 of the diff

changed this line in [version 99 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14460&start_sha=3dd56b74c474dde5a7f9054d74d1b40ad6ef72ed#622da2712f4801473aba0b611c3232f8148ef126_573_573)
Author
Owner

changed this line in version 99 of the diff

changed this line in [version 99 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14460&start_sha=3dd56b74c474dde5a7f9054d74d1b40ad6ef72ed#622da2712f4801473aba0b611c3232f8148ef126_581_585)
Author
Owner

changed this line in version 99 of the diff

changed this line in [version 99 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14460&start_sha=3dd56b74c474dde5a7f9054d74d1b40ad6ef72ed#cedfd047579474194a5f10a12c798242313675da_271_271)
Author
Owner

changed this line in version 99 of the diff

changed this line in [version 99 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14460&start_sha=3dd56b74c474dde5a7f9054d74d1b40ad6ef72ed#abc9d828b78bd9d36e05475d0bc91119bc5bc6b0_357_357)
Author
Owner

changed this line in version 99 of the diff

changed this line in [version 99 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14460&start_sha=3dd56b74c474dde5a7f9054d74d1b40ad6ef72ed#abc9d828b78bd9d36e05475d0bc91119bc5bc6b0_537_537)
Author
Owner

changed this line in version 99 of the diff

changed this line in [version 99 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14460&start_sha=3dd56b74c474dde5a7f9054d74d1b40ad6ef72ed#2b517c8fe3fd2a42ead0be8cff78d3baedd5276e_111_112)
Author
Owner

changed this line in version 99 of the diff

changed this line in [version 99 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14460&start_sha=3dd56b74c474dde5a7f9054d74d1b40ad6ef72ed#ca5e4a886c594c4b59402dbdbd16348bdbcddf3a_1400_1396)
Author
Owner

added 1 commit

  • 6f589fb2 - Allow to invite specific person on person detail page

Compare with previous version

added 1 commit <ul><li>6f589fb2 - Allow to invite specific person on person detail page</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14460&start_sha=3dd56b74c474dde5a7f9054d74d1b40ad6ef72ed)
Author
Owner

resolved all threads

resolved all threads
Author
Owner

.

.
Author
Owner

changed this line in version 100 of the diff

changed this line in [version 100 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14462&start_sha=6f589fb230abef42850165385750e3e120f4f3b2#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_2_2)
Author
Owner

added 1 commit

  • ea616456 - Allow to invite specific person on person detail page

Compare with previous version

added 1 commit <ul><li>ea616456 - Allow to invite specific person on person detail page</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14462&start_sha=6f589fb230abef42850165385750e3e120f4f3b2)
Owner

We need to discuss this again, and look into the different flows for different kinds of invitations.

We need to discuss this again, and look into the different flows for different kinds of invitations.
Author
Owner

added 10 commits

  • ea616456...72fd701c - 8 commits from branch master
  • 99a2ece4 - Merge branch 'master' into user-invitations
  • f730410e - Reformat

Compare with previous version

added 10 commits <ul><li>ea616456...72fd701c - 8 commits from branch <code>master</code></li><li>99a2ece4 - Merge branch &#39;master&#39; into user-invitations</li><li>f730410e - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14503&start_sha=ea61645679b439a471476d120154651af4646a04)
Author
Owner

added 1 commit

  • 5f69250a - Show all available fields of person model

Compare with previous version

added 1 commit <ul><li>5f69250a - Show all available fields of person model</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14506&start_sha=f730410ecc10d49863c6f078799dca297de61df9)
Author
Owner

added 1 commit

  • 4423231f - Create person on signup if unexisting, allow to edit all person fields

Compare with previous version

added 1 commit <ul><li>4423231f - Create person on signup if unexisting, allow to edit all person fields</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14508&start_sha=5f69250a1843e6f1f740c81ae745748952f1951f)
Author
Owner

added 1 commit

  • 73453020 - Create person on signup if unexisting, allow to edit all person fields

Compare with previous version

added 1 commit <ul><li>73453020 - Create person on signup if unexisting, allow to edit all person fields</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14509&start_sha=4423231fa612b88032d42218f2a4c87d632f8c79)
Author
Owner

added 3 commits

  • 4423231f - Create person on signup if unexisting, allow to edit all person fields
  • b09450da - Fix creation of person
  • 9b27577c - Merge branch 'user-invitations' of edugit.org:AlekSIS/official/AlekSIS-Core into user-invitations

Compare with previous version

added 3 commits <ul><li>4423231f - Create person on signup if unexisting, allow to edit all person fields</li><li>b09450da - Fix creation of person</li><li>9b27577c - Merge branch &#39;user-invitations&#39; of edugit.org:AlekSIS/official/AlekSIS-Core into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14510&start_sha=734530206297164813f75984f25a85cacd1feb36)
Author
Owner

added 1 commit

  • 9a843fdc - Merge branch 'user-invitations' of edugit.org:AlekSIS/official/AlekSIS-Core into user-invitations

Compare with previous version

added 1 commit <ul><li>9a843fdc - Merge branch &#39;user-invitations&#39; of edugit.org:AlekSIS/official/AlekSIS-Core into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14511&start_sha=9b27577c5eee100c55ba7bb8fe50f5e9abaab78b)
Author
Owner

added 1 commit

  • 21e67104 - Disallow login if email is not verified

Compare with previous version

added 1 commit <ul><li>21e67104 - Disallow login if email is not verified</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14515&start_sha=9a843fdc3f308989275c2138de071db38e884f01)
Author
Owner

added 1 commit

  • 6b85e23a - Disallow login if email is not verified

Compare with previous version

added 1 commit <ul><li>6b85e23a - Disallow login if email is not verified</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14516&start_sha=21e671043baa384f5a877f84b3af072978618239)
Author
Owner

added 1 commit

  • 182bb19f - Disallow login if email is not verified

Compare with previous version

added 1 commit <ul><li>182bb19f - Disallow login if email is not verified</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14517&start_sha=6b85e23a515ec7ec91251d04d12a72a7030063f9)
Author
Owner

added 15 commits

  • 182bb19f...ee119980 - 14 commits from branch master
  • 4720061e - Merge branch 'master' into user-invitations

Compare with previous version

added 15 commits <ul><li>182bb19f...ee119980 - 14 commits from branch <code>master</code></li><li>4720061e - Merge branch &#39;master&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14611&start_sha=182bb19feba5d5f798b309017b7d0c1e30625c5a)
Owner

Please merge the migrations

Please merge the migrations
Owner

Should this really be a User rather than a Person?

Should this really be a `User` rather than a `Person`?
Owner

Unrelated changes?

Unrelated changes?
Owner

Unrelated changes?

Unrelated changes?
Owner

What is this good for?

What is this good for?
Owner

What if it exists? Where does the data go in that case?

What if it exists? Where does the data go in that case?
Owner

You don't need to call save after create.

You don't need to call `save` after `create`.
Owner

This seems wrong – only users who can invite can accept invitations?

This seems wrong – only users who can invite can accept invitations?
Owner

Please re-order, group and unspace.

Please re-order, group and unspace.
Owner

Same here, see comment above. Please properly group the settings, and what all the empty lines are for si a mystery to me.

Same here, see comment above. Please properly group the settings, and what all the empty lines are for si a mystery to me.
Owner

Please document how this interacts with allauth and django-invitations (describe the flow, assumptions about upstream behaviour, etc.).

Please document how this interacts with allauth and django-invitations (describe the flow, assumptions about upstream behaviour, etc.).
Owner

Please document how this interacts with allauth and django-invitations (describe the flow, assumptions about upstream behaviour, etc.).

Please document how this interacts with allauth and django-invitations (describe the flow, assumptions about upstream behaviour, etc.).
Owner

Please document how this interacts with allauth and django-invitations (describe the flow, assumptions about upstream behaviour, etc.).

Please document how this interacts with allauth and django-invitations (describe the flow, assumptions about upstream behaviour, etc.).
Owner

Missing docstring.

Please document how this interacts with allauth and django-invitations (describe the flow, assumptions about upstream behaviour, etc.).

Missing docstring. Please document how this interacts with allauth and django-invitations (describe the flow, assumptions about upstream behaviour, etc.).
Owner

Please turn this into a class-based view.

Please turn this into a class-based view.
Owner

Please document how this interacts with allauth and django-invitations (describe the flow, assumptions about upstream behaviour, etc.).

Please document how this interacts with allauth and django-invitations (describe the flow, assumptions about upstream behaviour, etc.).
Author
Owner

unn?

unn?
Author
Owner

jo

jo
Author
Owner

mentioned in merge request !2473

mentioned in merge request !2473
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>21b67433 - Remove unrelated changes</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14629&start_sha=4720061ef99e0de1d67478ece1e99cad74382fe0)
Author
Owner

"Nja lass mal drin"

"Nja lass mal drin"
Author
Owner

changed this line in version 113 of the diff

changed this line in [version 113 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14630&start_sha=21b67433a219bfefc44a5b229ad81b01e4cb18a2#49fb16c7a5983b3818a772030cfd738a07ee0e05_11_0)
Author
Owner

changed this line in version 113 of the diff

changed this line in [version 113 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14630&start_sha=21b67433a219bfefc44a5b229ad81b01e4cb18a2#7d7e9a13e630dde349910eed065381caca2b7ee9_26_0)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>75b3d4a8 - Cleanup</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14630&start_sha=21b67433a219bfefc44a5b229ad81b01e4cb18a2)
Author
Owner

added 2 commits

Compare with previous version

added 2 commits <ul><li>96bce736 - Rename rule</li><li>e657f2f4 - Use class-based view</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14632&start_sha=75b3d4a837d089079e2504f432d5c03c7a6800f3)
Author
Owner

added 1 commit

  • 3c90b0a9 - Document overriden views

Compare with previous version

added 1 commit <ul><li>3c90b0a9 - Document overriden views</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14634&start_sha=e657f2f45cfdd05d7731bf134cbb9e67d48d00ea)
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>c8626343 - Document overriden views</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14635&start_sha=3c90b0a96e180409b439c953cc4ec2728d873f40)
Author
Owner

resolved all threads

resolved all threads
Author
Owner

added 38 commits

  • c8626343...8cd2dd85 - 37 commits from branch master
  • 36d7200c - Merge branch 'master' into user-invitations

Compare with previous version

added 38 commits <ul><li>c8626343...8cd2dd85 - 37 commits from branch <code>master</code></li><li>36d7200c - Merge branch &#39;master&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14937&start_sha=c8626343ad45b5935668ad11c5d777874e35ff3a)
Author
Owner

added 1 commit

  • d8427c77 - Merge branch 'master' into user-invitations

Compare with previous version

added 1 commit <ul><li>d8427c77 - Merge branch &#39;master&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14938&start_sha=36d7200ce7546a5f484442f92f08c23a8123b48f)
Author
Owner

added 5 commits

  • d8427c77...2d6b28b1 - 4 commits from branch master
  • 890d2a9a - Merge branch 'master' into user-invitations

Compare with previous version

added 5 commits <ul><li>d8427c77...2d6b28b1 - 4 commits from branch <code>master</code></li><li>890d2a9a - Merge branch &#39;master&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14983&start_sha=d8427c7717bc31f84404d4f557779e10cec663af)
Owner

Why do we have signup_enabled and signup_open?

We should have signup_enabled and invite_enabled (please make sure to check these in all relevant places).

The best way forward would be to make the can_signup rule check that either signup_enabled is set, or both invite_enabled is set and the user has submitted a valid invite code. This could be done by writing a predecate that checks for a stashed invite in the session.

Why do we have `signup_enabled` and `signup_open`? We should have `signup_enabled` and `invite_enabled` (please make sure to check these in all relevant places). The best way forward would be to make the `can_signup` rule check that either `signup_enabled` is set, or both `invite_enabled` is set and the user has submitted a valid invite code. This could be done by writing a predecate that checks for a stashed invite in the session.
Author
Owner

added 1 commit

  • e52fb507 - Use rule instead of preference

Compare with previous version

added 1 commit <ul><li>e52fb507 - Use rule instead of preference</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14984&start_sha=890d2a9a3ab7a82fd4638f38e47f3858e126caf4)
Owner

What is this method needed for?

What is this method needed for?
Owner

Can this be turned into a preference?

Can this be turned into a preference?
Owner

Can this be turned into a preference?

Can this be turned into a preference?
Owner

Please document, in a comment, what these settings do.

Please document, in a comment, what these settings do.
Author
Owner

Nein, immer noch nicht.

Nein, immer noch nicht.
Author
Owner

Nein, auch immer noch nicht.

Nein, auch immer noch nicht.
Author
Owner

changed this line in version 121 of the diff

changed this line in [version 121 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14988&start_sha=e52fb507f56644d80b8e31c66568e4a753197974#216f48f50c6758eba4a72b334fd1ea4e6af4b3c0_318_318)
Author
Owner

changed this line in version 121 of the diff

changed this line in [version 121 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14988&start_sha=e52fb507f56644d80b8e31c66568e4a753197974#2e44ad1f61249cf0440bea20d23bd07cc7f3a61a_1076_1075)
Author
Owner

added 1 commit

  • 0cd92dfc - Comment settings

Compare with previous version

added 1 commit <ul><li>0cd92dfc - Comment settings</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14988&start_sha=e52fb507f56644d80b8e31c66568e4a753197974)
Author
Owner

added 1 commit

  • acab0062 - Comment settings

Compare with previous version

added 1 commit <ul><li>acab0062 - Comment settings</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14989&start_sha=0cd92dfc089b69ba9c5ce99a86a51cdf8579456d)
Author
Owner

resolved all threads

resolved all threads
Author
Owner

added 1 commit

Compare with previous version

added 1 commit <ul><li>03f0d775 - Comment settings</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=14990&start_sha=acab006271f0e292c270b9c50f1f0061fcaafd0d)
Owner

This doc string should describe what the class does, not what you did when writing it.

This doc string should describe what the class does, not what you did when writing it.
Owner

Please use English in the development process.

Please use English in the development process.
Owner

Please use English in the development process.

Please use English in the development process.
Owner

Also, please stop marking unresolved threads as resolved!

Also, please **stop** marking unresolved threads as resolved!
Owner

Also, please stop marking unresolved threads as resolved!

Also, please **stop** marking unresolved threads as resolved!
Owner

added 4 commits

  • 03f0d775...77f94218 - 2 commits from branch master
  • 860627a5 - Merge branch 'master' into user-invitations
  • 79554789 - Amend changelog for user invitations

Compare with previous version

added 4 commits <ul><li>03f0d775...77f94218 - 2 commits from branch <code>master</code></li><li>860627a5 - Merge branch &#39;master&#39; into user-invitations</li><li>79554789 - Amend changelog for user invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=15044&start_sha=03f0d775426980be616943f2a7f1f60a64c1c0d0)
Owner

Follow-up issue: #583

Follow-up issue: #583
Owner

Follow-up issue: #583

Follow-up issue: #583
Owner

changed this line in version 125 of the diff

changed this line in [version 125 of the diff](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=15056&start_sha=795547891cbea55623e381a71d6f6aa9a44de9e6#ca5e4a886c594c4b59402dbdbd16348bdbcddf3a_1403_1402)
Owner

added 5 commits

  • 79554789...e0345796 - 3 commits from branch master
  • 9c872510 - Rephrase view doc strings
  • 7741f64e - Merge branch 'master' into user-invitations

Compare with previous version

added 5 commits <ul><li>79554789...e0345796 - 3 commits from branch <code>master</code></li><li>9c872510 - Rephrase view doc strings</li><li>7741f64e - Merge branch &#39;master&#39; into user-invitations</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/450/diffs?diff_id=15056&start_sha=795547891cbea55623e381a71d6f6aa9a44de9e6)
Owner

resolved all threads

resolved all threads
Owner

marked this merge request as ready

marked this merge request as **ready**
nik scheduled this pull request to auto merge when all checks succeed 2021-12-24 18:47:44 +01:00
nik merged commit 2a7cc13a4d into master 2021-12-24 20:56:42 +01:00
Owner

mentioned in commit 2a7cc13a4d

mentioned in commit 2a7cc13a4de864c5d883b75ae8a81b07d37a4f67
Owner

Congratulations, @debdolph 🎉 !

Congratulations, @debdolph :tada: !
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
4 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
aleksis/AlekSIS-Core!2095
No description provided.