aleksis/AlekSIS-Core
9
0
Fork 0
Code Issues 197 Pull requests 63 Projects Releases 14 Packages 1 Wiki Activity Actions

Resolve "Add Birthplace to Core Data" #2396

Merged
hansegucker merged 7 commits from 524-add-birthplace-to-core-data into master 2021-11-05 22:27:50 +01:00
Conversation 15 Commits 7 Files changed 5 +30 -2
lukasw commented 2021-10-24 16:03:28 +02:00
Contributor
Copy link

Closes #524

Closes #524
lukasw commented 2021-10-24 16:03:29 +02:00
Author
Contributor
Copy link

assigned to @lukasw

assigned to @lukasw
lukasw commented 2021-11-02 21:32:59 +01:00
Author
Contributor
Copy link

added 40 commits

  • eefe8e04...15bccea2 - 39 commits from branch master
  • a2a48c1f - Added Birthplace

Compare with previous version

added 40 commits <ul><li>eefe8e04...15bccea2 - 39 commits from branch <code>master</code></li><li>a2a48c1f - Added Birthplace</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/751/diffs?diff_id=12922&start_sha=eefe8e048e7a8d1111599f16e5ee8f6c48db48f0)
nik commented 2021-11-03 13:10:36 +01:00
Owner
Copy link

assigned to @nik and unassigned @lukasw

assigned to @nik and unassigned @lukasw
lukasw commented 2021-11-05 20:15:30 +01:00
Author
Contributor
Copy link

added 1 commit

  • 24c05233 - Make birthplace usable in font-end

Compare with previous version

added 1 commit <ul><li>24c05233 - Make birthplace usable in font-end</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/751/diffs?diff_id=13088&start_sha=a2a48c1fd805230b999014aadd18256aa8207edd)
lukasw commented 2021-11-05 20:32:16 +01:00
Author
Contributor
Copy link

added 1 commit

  • f7582e59 - Update changelog

Compare with previous version

added 1 commit <ul><li>f7582e59 - Update changelog</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/751/diffs?diff_id=13095&start_sha=24c05233d4cac2a95faf11615625ef18f0d540d6)
lukasw commented 2021-11-05 20:39:50 +01:00
Author
Contributor
Copy link

added 3 commits

Compare with previous version

added 3 commits <ul><li>7025119a - Add birthplace to Person model</li><li>b0848d9e - Make birthplace usable in font-end</li><li>39978702 - Update changelog</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/751/diffs?diff_id=13104&start_sha=f7582e593013640749695062c43337dc04fc148c)
lukasw commented 2021-11-05 20:43:31 +01:00
Author
Contributor
Copy link

added 49 commits

  • 39978702...5e3c190b - 28 commits from branch master
  • b4090959 - Install django-multiselectfield
  • 1473db29 - [OAuth] Add allowed_scopes to application model
  • ca100a65 - [OAuth] Filter scopes by application's allowed scopes if available
  • 7e96552e - [OAuth] Use Postgres ArrayField instead of external MultiSelectField
  • 802665a7 - Revert "Install django-multiselectfield"
  • 5ff806b4 - [OAuth] Make AppScopes schoices lazy to work around circular import
  • a9764e3c - [OAuth] Let allowed_scopes default to empty list
  • ead3d596 - [OAuth] Remove choices for allowed_scopes
  • f4434eaf - [OAuth] Add verbose_name and migration for allowed_scopes
  • 0d1ac60b - Merge branch '514-oauth-provider-allow-several-all-grant-flows' into...
  • 88adac18 - Set multiple select with scopes as choices for allowed_scopes field
  • 95148e33 - Show allowed scopes for an OAuth2 application in the detail view
  • ccc670f2 - [OAuth] Provde allowed_scopes-aware ClientProtectedResourceMixin
  • a64f45d2 - Update changelog for OAuth allowed_scopes
  • 3aa86dee - Fix typos
  • 5ac7256f - Allow allowed_scopes field to be blank
  • e708a929 - Merge branch 'master' into 532-oauth-allow-limiting-scopes-per-application
  • 7bfb6a45 - Fix docstrings for linter
  • 3e046f8d - Merge branch 'master' into 532-oauth-allow-limiting-scopes-per-application
  • 4fd07b46 - Merge branch 'master' into 524-add-birthplace-to-core-data
  • d9d8a9d6 - Merge remote-tracking branch...

Compare with previous version

added 49 commits <ul><li>39978702...5e3c190b - 28 commits from branch <code>master</code></li><li>b4090959 - Install django-multiselectfield</li><li>1473db29 - [OAuth] Add allowed_scopes to application model</li><li>ca100a65 - [OAuth] Filter scopes by application&#39;s allowed scopes if available</li><li>7e96552e - [OAuth] Use Postgres ArrayField instead of external MultiSelectField</li><li>802665a7 - Revert &quot;Install django-multiselectfield&quot;</li><li>5ff806b4 - [OAuth] Make AppScopes schoices lazy to work around circular import</li><li>a9764e3c - [OAuth] Let allowed_scopes default to empty list</li><li>ead3d596 - [OAuth] Remove choices for allowed_scopes</li><li>f4434eaf - [OAuth] Add verbose_name and migration for allowed_scopes</li><li>0d1ac60b - Merge branch &#39;514-oauth-provider-allow-several-all-grant-flows&#39; into...</li><li>88adac18 - Set multiple select with scopes as choices for allowed_scopes field</li><li>95148e33 - Show allowed scopes for an OAuth2 application in the detail view</li><li>ccc670f2 - [OAuth] Provde allowed_scopes-aware ClientProtectedResourceMixin</li><li>a64f45d2 - Update changelog for OAuth allowed_scopes</li><li>3aa86dee - Fix typos</li><li>5ac7256f - Allow allowed_scopes field to be blank</li><li>e708a929 - Merge branch &#39;master&#39; into 532-oauth-allow-limiting-scopes-per-application</li><li>7bfb6a45 - Fix docstrings for linter</li><li>3e046f8d - Merge branch &#39;master&#39; into 532-oauth-allow-limiting-scopes-per-application</li><li>4fd07b46 - Merge branch &#39;master&#39; into 524-add-birthplace-to-core-data</li><li>d9d8a9d6 - Merge remote-tracking branch...</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/751/diffs?diff_id=13108&start_sha=39978702d22253228e91dd715f1d5a015960eb22)
lukasw commented 2021-11-05 20:43:59 +01:00
Author
Contributor
Copy link

marked this merge request as ready

marked this merge request as **ready**
nik commented 2021-11-05 21:19:49 +01:00
Owner
Copy link

added 2 commits

Compare with previous version

added 2 commits <ul><li>11376058 - Re-order person detail form</li><li>44d09a61 - Reformat</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/751/diffs?diff_id=13122&start_sha=d9d8a9d640d7f1c49118307cfbe125e48cf4a0f1)
leuckeju commented 2021-11-05 21:27:03 +01:00
Member
Copy link

It seems wrong to me to substitute something with a colspan of 3, with two elements with a colspan of 4 (cause that would be a colspan of 4 I believe)

It seems wrong to me to substitute something with a colspan of 3, with two elements with a colspan of 4 (cause that would be a colspan of 4 I believe)
nik commented 2021-11-05 21:28:16 +01:00
Owner
Copy link

Yes, it is wrong. But it is wrong all over the place. In fact, each and every row in this table has a different number of columns.

Yes, it is wrong. But it is wrong all over the place. In fact, each and every row in this table has a different number of columns.
nik commented 2021-11-05 21:28:16 +01:00
Owner
Copy link

resolved all threads

resolved all threads
leuckeju commented 2021-11-05 21:29:18 +01:00
Member
Copy link

Then this should be changed with #529

Then this should be changed with #529
leuckeju commented 2021-11-05 21:29:18 +01:00
Member
Copy link

resolved all threads

resolved all threads
hansegucker scheduled this pull request to auto merge when all checks succeed 2021-11-05 22:10:26 +01:00
nik canceled auto merging this pull request when all checks succeed 2021-11-05 22:27:45 +01:00
nik merged commit eb534925c7 into master 2021-11-05 22:27:50 +01:00
nik commented 2021-11-05 22:27:52 +01:00
Owner
Copy link

mentioned in commit eb534925c7

mentioned in commit eb534925c7f21f86c41e928a3a8827315ae0146b
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Security

   
TeX
Needs LaTeX template

  
auto-update
  
board
done

  
board
ready

  
board
todo

  
check
delete-eslint-rc-js

  
check
update-builddeps-package-json

  
check
update-eslint-rc-js

  
check
update-gitignore

  
check
update-merge-request-template

  
check
update-prettier-ignore

  
check
update-pyproject-toml

  
check
update-renovate-json

  
check
update-tox-ini

  
part
backend
 Backend (view code, models, logic, etc.)

  
part
ci

  
part
docs
 Issue or addition to the documentation

  
part
frontend
 Frontend (templates, etc.)

  
part
i18n
 Translation or internationalisation issue

  
part
non-technical
 Non-technical (policy, maintenance, etc.) issue or discussion

  
part
packaging
 Issue concerning the packaging of AlekSIS and components

  
prio
1
 Priority High

  
prio
2
 Priority Medium

  
prio
3
 Priority Low

  
release-mr-5.x
  
size
large

  
size
medium

  
size
small

  
source
customer
 Requested by a customer or affiliated user

  
source
customer::fsmw

  
source
customer::fss

  
source
customer::teckids

  
source
downstream
 Issue or merge request from other projects using AlekSIS or parts of it

  
type
breaking

  
type
bug
 Bug

  
type
feature
 New feature

  
type
refactoring

  
workflow
blocked
 Issue is blocked by another issue

  
workflow
confirmed
 The bug is reproducible and will be fixed

  
workflow
current-todo

  
workflow
discussing
 Needs to be discussed before implementation

  
workflow
new-app
 Requires new AlekSIS app, which has to be created

  
workflow
wontfix
 The bug is not reproducible or the feature was decided against

No labels
Security
TeX
auto-update
board
done
board
ready
board
todo
check
delete-eslint-rc-js
check
update-builddeps-package-json
check
update-eslint-rc-js
check
update-gitignore
check
update-merge-request-template
check
update-prettier-ignore
check
update-pyproject-toml
check
update-renovate-json
check
update-tox-ini
part
backend
part
ci
part
docs
part
frontend
part
i18n
part
non-technical
part
packaging
prio
1
prio
2
prio
3
release-mr-5.x
size
large
size
medium
size
small
source
customer
source
customer::fsmw
source
customer::fss
source
customer::teckids
source
downstream
type
breaking
type
bug
type
feature
type
refactoring
workflow
blocked
workflow
confirmed
workflow
current-todo
workflow
discussing
workflow
new-app
workflow
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
nik
3 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!2396
No description provided.