Commits · 6d286e506088ac2135978438ce5ae5d52eadcb56 · Adrian Lance Damalerio / midterm_aguandhischipmunks

06 Mar, 2023 29 commits
- Merge branch 'master' into 'forum_wip' · 6d286e50
  Deokhyun Lee authored Mar 06, 2023
```
# Conflicts:
#   widget_aguandhischipmunks/widget_aguandhischipmunks/urls.py
```
  6d286e50
- Fixed the spacing for the author's name · ebcfc55a
  Jan Enzo Salvador authored Mar 06, 2023
  
  ebcfc55a
- Fixed the spacing of the views · dcd708a5
  Jan Enzo Salvador authored Mar 06, 2023
  
  dcd708a5
- Fixed the syntax of accessing the forum_post.title · eb9489bb
  Jan Enzo Salvador authored Mar 06, 2023
  
  eb9489bb
- Fixed the string concatenation · 447e9526
  Jan Enzo Salvador authored Mar 06, 2023
  
  447e9526
- Added inlines in admin.py of forum for easier access to population of data · 29a9ea7c
  Jan Enzo Salvador authored Mar 06, 2023
  
  29a9ea7c
- 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
- Edited admin.py of forum for easier population of data · 000f0c02
  Jan Enzo Salvador authored Mar 06, 2023
  
  000f0c02
- migration is finished · ff37603b
  Jan Enzo Salvador authored Mar 06, 2023
  
  ff37603b
- Created migration for the models.py of forum · 0327256e
  Jan Enzo Salvador authored Mar 06, 2023
  
  0327256e
- Added forum.urls to the project urlpatterns · 7e12f1c0
  Jan Enzo Salvador authored Mar 06, 2023
  
  7e12f1c0
- Edited the forum\urls.py to map with views.py · 70b45164
  Jan Enzo Salvador authored Mar 06, 2023
  
  70b45164
- Created a urls.py for forum app · cf10e578
  Jan Enzo Salvador authored Mar 06, 2023
  
  cf10e578
- Created the views of the forum showing the forum posts and their corresponding replies · b08e7b70
  Jan Enzo Salvador authored Mar 06, 2023
  
  b08e7b70
- Created admin panels for forum\models.py · f989bad9
  Jan Enzo Salvador authored Mar 06, 2023
  
  f989bad9
- Created models for the forum app · 3df59488
  Jan Enzo Salvador authored Mar 06, 2023
  
  3df59488
- 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 11 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