Commits · 394d4c4cb8ac7b2869ede6e9a0eccae95b26dbcd · John Michael T. Amador / midterm-group3 · GitLab

15 May, 2023 10 commits
- Merge branch 'calendarv2' · 394d4c4c
  Marco Anton O. Paeldon authored May 15, 2023
  
  394d4c4c
- fixed issues regarding url conflicts · c0136a8f
  Marco Anton O. Paeldon authored May 15, 2023
  
  c0136a8f
- Merge remote-tracking branch 'origin/announcementsv2' · 4c40105b
  Marco Anton O. Paeldon authored May 15, 2023
  
  4c40105b
- Merge remote-tracking branch 'origin/forumv2' · 2d730eb0
  Marco Anton O. Paeldon authored May 15, 2023
  
  2d730eb0
- Removed unused imports in dashboard/views.py · fd4f4e81
  Brendan Fausto authored May 15, 2023
  
  fd4f4e81
- Updated README.md · f5b86281
  Brendan Fausto authored May 15, 2023
  
  f5b86281
- Added widgetuser edit page and corresponding template · c38544fa
  Brendan Fausto authored May 15, 2023
  
  c38544fa
- Added widgetuser details page and corresponding template · eea1aff3
  Brendan Fausto authored May 15, 2023
  
  eea1aff3
- Created list view of dashboard users and correspoding template · 5c33f14c
  Brendan Fausto authored May 15, 2023
  
  5c33f14c
- Added temporary base template · 5ec7a86c
  Brendan Fausto authored May 15, 2023
  
  5ec7a86c
14 May, 2023 2 commits
- rectified minor formatting mistakes · 27e7482d
  Marco Anton O. Paeldon authored May 14, 2023
  
  27e7482d
- adding a completed announcementsv2 · a2a9424c
  Marco Anton O. Paeldon authored May 14, 2023
  
  a2a9424c
13 May, 2023 7 commits
- implemented all calendar pages · 1bd9dab5
  Alvin Joshua Andrada authored May 13, 2023
  
  1bd9dab5
- added base template · 9cea9e55
  Alvin Joshua Andrada authored May 13, 2023
  
  9cea9e55
- updated README · cd8c8c90
  Alvin Joshua Andrada authored May 13, 2023
  
  cd8c8c90
- Created the edit post page · 6ccf5db8
  Ron Rodillas authored May 13, 2023
  
  6ccf5db8
- created the per post's details page · 5df3ae23
  Ron Rodillas authored May 13, 2023
  
  5df3ae23
- created add forum page and fixed issues with models · 3670b489
  Ron Rodillas authored May 13, 2023
  
  3670b489
- modified the home page for the forum app · cfffc4c0
  Ron Rodillas authored May 13, 2023
  
  cfffc4c0
06 Mar, 2023 21 commits
- REmoved comments from README · a6960e20
  mantlei authored Mar 06, 2023
  
  a6960e20
- 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