Commits · 976aca1aa96de594785d363dc79bc3e68b812e60 · John Michael T. Amador / midterm-group3 · GitLab

06 Mar, 2023 28 commits
- Merge branch 'master' of https://gitlab.discs.ateneo.edu/jmamador_/midterm-group3 · 976aca1a
  John Michael T. Amador authored Mar 06, 2023
  
  976aca1a
- assignments update · 2d56e0c7
  John Michael T. Amador authored Mar 06, 2023
  
  2d56e0c7
- Edited the README so that the names are in alphabetical order · bb03a59d
  mantlei authored Mar 06, 2023
  
  bb03a59d
- updated url namespace of assignments from "Assignments" to "assignments" · aa2cb290
  John Michael T. Amador authored Mar 06, 2023
  
  aa2cb290
- populated announcements, forums, and calendar apps · c4a5da2d
  John Michael T. Amador authored Mar 06, 2023
  
  c4a5da2d
- made migrations that were lost during merging · 2a228494
  mantlei authored Mar 06, 2023
  
  2a228494
- merged calendar_app into master · cc64cb6e
  mantlei authored Mar 06, 2023
  
  cc64cb6e
- made the migrations necessary · 5abd66dd
  mantlei authored Mar 06, 2023
  
  5abd66dd
- Populated database with Dashboard data · f8e7bddb
  Brendan Fausto authored Mar 06, 2023
  
  f8e7bddb
- fixed error that arised during merging in urls.py · 4380fd93
  mantlei authored Mar 06, 2023
  
  4380fd93
- merged master to calendar_app · 45065abd
  mantlei authored Mar 06, 2023
  
  45065abd
- edited README · 6def896d
  mantlei authored Mar 06, 2023
  
  6def896d
- merged master to forum_app · 1a5a2375
  mantlei authored Mar 06, 2023
  
  1a5a2375
- update · 737ffb5b
  John Michael T. Amador authored Mar 06, 2023
  
  737ffb5b
- Revert "Merge branch 'assignments_app'" · 980bb116
  John Michael T. Amador authored Mar 06, 2023
```
This reverts merge request !6
```
  980bb116
- Merge branch 'assignments_app' · b884c39f
  John Michael T. Amador authored Mar 06, 2023
  
  b884c39f
- Merge branch 'master' of https://gitlab.discs.ateneo.edu/jmamador_/midterm-group3 · cf35e2c8
  John Michael T. Amador authored Mar 06, 2023
  
  cf35e2c8
- populated the assignments database with another entry · 62e14b96
  John Michael T. Amador authored Mar 06, 2023
  
  62e14b96
- Merge branch 'announcement_app' into 'master' · 86fc90f3
  Marco Anton O. Paeldon authored Mar 06, 2023
```
Announcement app

See merge request !4
```
  86fc90f3
- Merge branch 'master' into 'announcement_app' · 910d291d
  Marco Anton O. Paeldon authored Mar 06, 2023
```
# Conflicts:
#   README.md
```
  910d291d
- Changed variable name for reply model's foreign key in accordance to updated specs · f0dde999
  Ron Rodillas authored Mar 06, 2023
  
  f0dde999
- edited the README · 6c72dd1b
  mantlei authored Mar 06, 2023
  
  6c72dd1b
- made it so that the output looks more like the example in the pdf · 1066914b
  mantlei authored Mar 06, 2023
  
  1066914b
- fixed incorrect title in views.py · ac60d6b3
  mantlei authored Mar 06, 2023
  
  ac60d6b3
- Merge branch 'dashboard_app' into 'master' · b49eea13
  Brendan Fausto authored Mar 06, 2023
```
Dashboard app

See merge request !2
```
  b49eea13
- Updated README.md · bcd840b1
  Brendan Fausto authored Mar 06, 2023
  
  bcd840b1
- Fixed the mispelled name in the README · 6a6aca72
  mantlei authored Mar 06, 2023
  
  6a6aca72
- Updated the README · 84b7a9b8
  mantlei authored Mar 06, 2023
  
  84b7a9b8
05 Mar, 2023 10 commits
- Fully Completed and Functional Announcements Board with populated models · e99251dc
  mantlei authored Mar 05, 2023
  
  e99251dc
- updated the README file · f65f7d1a
  Ron Rodillas authored Mar 05, 2023
  
  f65f7d1a
- added datetime formatting function for the models and created the view function · 3a79eb7e
  Ron Rodillas authored Mar 05, 2023
  
  3a79eb7e
- fixed issues with the forum models not working · 76fb520d
  Ron Rodillas authored Mar 05, 2023
  
  76fb520d
- Created the models and admin panel for the forum app · 225847b0
  Ron Rodillas authored Mar 05, 2023
  
  225847b0
- Merge branch 'master' into assignments_app · cd52672a
  jmAmador authored Mar 05, 2023
  
  cd52672a
- Created dashboard/views, added dashboard to widget_group3 and populated the database · 76cad784
  Brendan Fausto authored Mar 05, 2023
  
  76cad784
- More error fixes on model, and mmigrations done · c9f8e0b0
  Brendan Fausto authored Mar 05, 2023
  
  c9f8e0b0
- Created admin for dashboard · 4de7a617
  Brendan Fausto authored Mar 05, 2023
  
  4de7a617
- Fixed error in dashboard/models · f8ef1ce6
  Brendan Fausto authored Mar 05, 2023
  
  f8ef1ce6
04 Mar, 2023 2 commits
- Modified models to be able to print with formatting · 27adcf95
  Brendan Fausto authored Mar 04, 2023
  
  27adcf95
- Created models & url file of dashboard · 4c94f299
  Brendan Fausto authored Mar 04, 2023
  
  4c94f299