Commits · dc43d21b49fe479f1df3f85a8652ab523c1d6b11 · Adrian Lance Damalerio / midterm_aguandhischipmunks · GitLab

06 Mar, 2023 14 commits
- Merge branch 'calendar_wip' into 'master' · dc43d21b
  Deokhyun Lee authored Mar 06, 2023
```
Merge Request for Calendar App

See merge request !4
```
  dc43d21b
- Merge branch 'master' into 'calendar_wip' · 8915b544
  Deokhyun Lee authored Mar 06, 2023
```
# Conflicts:
#   widget_aguandhischipmunks/widget_aguandhischipmunks/urls.py
```
  8915b544
- no manual changes · 930c651e
  Jan Ericsson Ong Ang authored Mar 06, 2023
  
  930c651e
- Merge branch 'dashboard_wip' into 'master' · aa888c8e
  Adrian Lance Damalerio authored Mar 06, 2023
```
requesting for dashboard_branch to be merged with master

See merge request !2
```
  aa888c8e
- Merge branch 'master' into 'dashboard_wip' · ea117b22
  Adrian Lance Damalerio authored Mar 06, 2023
```
# Conflicts:
#   widget_aguandhischipmunks/widget_aguandhischipmunks/urls.py
```
  ea117b22
- added <br> in views & changed index name in urls · 494b8f4a
  Jan Ericsson Ong Ang authored Mar 06, 2023
  
  494b8f4a
- updated and mapped urls for calendar · fa37cb12
  Jan Ericsson Ong Ang authored Mar 06, 2023
  
  fa37cb12
- db issue fixed · 21e10dbd
  Jan Ericsson Ong Ang authored Mar 06, 2023
  
  21e10dbd
- migrations for assignments is fixed · 9e6101ee
  Jan Ericsson Ong Ang authored Mar 06, 2023
  
  9e6101ee
- Updated view.py for calendar app · 22e4b5fe
  Jan Ericsson Ong Ang authored Mar 06, 2023
  
  22e4b5fe
- Updated admin.py comments for calendar app · 356cfd01
  Jan Ericsson Ong Ang authored Mar 06, 2023
  
  356cfd01
- Updated models.py to include course object · ca6a7896
  Jan Ericsson Ong Ang authored Mar 06, 2023
  
  ca6a7896
- Fixing Conflicts after pulling · 4ceb9a0f
  Jan Ericsson Ong Ang authored Mar 06, 2023
  
  4ceb9a0f
- Merge branch 'assignmebts_wip' into 'master' · 2fd4b41b
  Adrian Lance Damalerio authored Mar 06, 2023
```
Assignmebts wip-app merge request

See merge request !1
```
  2fd4b41b
05 Mar, 2023 26 commits
- passing score is implemented based on perfect_score · 2e5e6727
  Deokhyun Lee authored Mar 05, 2023
  
  2e5e6727
- final view edits · 45fbb940
  Deokhyun Lee authored Mar 05, 2023
  
  45fbb940
- view is implemented and properly shows the content · 590d90d4
  Deokhyun Lee authored Mar 05, 2023
  
  590d90d4
- migrated models for admin viewing · 5e515419
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  5e515419
- created url settings for assignments · 34daae9e
  Deokhyun Lee authored Mar 05, 2023
  
  34daae9e
- removed inline view · d9a618c6
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  d9a618c6
- calculating 60 percent of passing_score is implemented. · 9c40c713
  Deokhyun Lee authored Mar 05, 2023
  
  9c40c713
- admin panel for the model: course; assignment is finished · b24cab4e
  Deokhyun Lee authored Mar 05, 2023
  
  b24cab4e
- changed stacked inline back to tabular inline · cecfc506
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  cecfc506
- created admin model for assignment · 43416390
  Deokhyun Lee authored Mar 05, 2023
  
  43416390
- fixed name convention of the model · d2bcc95a
  Deokhyun Lee authored Mar 05, 2023
  
  d2bcc95a
- initial migration is finished · 9f82332a
  Deokhyun Lee authored Mar 05, 2023
  
  9f82332a
- all the fields are now defined with passing_score · d0500ab8
  Deokhyun Lee authored Mar 05, 2023
  
  d0500ab8
- added reference link to models.py · 38bedd15
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  38bedd15
- changed tabular inline to stacked inline and added reference link comment · ad4904b2
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  ad4904b2
- making new brach for assignments · 89ad08ba
  Deokhyun Lee authored Mar 05, 2023
  
  89ad08ba
- added inline formatting for Event models · e154029f
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  e154029f
- added label descriptions to the models and added comment for course model · 31d2bd7c
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  31d2bd7c
- deleted '()' after CASCADE · 9b9c8b60
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  9b9c8b60
- changed the venue attribute in models.py to be a textfield instead of charfield · ed904e99
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  ed904e99
- changed the function for naming · d7d7270a
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  d7d7270a
- edited a syntax error involving the commas of location_choices · 836d3d18
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  836d3d18
- added the admin panel for calendar app location model and event model · d6c53e5a
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  d6c53e5a
- added models for event and location · 0584e2cb
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  0584e2cb
- created urls.py for the calendar app · 0885639b
  Jan Ericsson Ong Ang authored Mar 05, 2023
  
  0885639b
- fixed the format of object name in WidgetUser model · 620b79a6
  Adrian Lance Damalerio authored Mar 05, 2023
  
  620b79a6