Commits · f2ca6600d73502629a35a54e13edc3604332d13d · Kyla Martin / widgets_FEKK

18 May, 2022 4 commits
- Merge branch 'master' into evangelista/forum · f2ca6600
  Emmanuel Linus T. Evangelista authored May 18, 2022
  
  f2ca6600
- Merge branch 'master' of https://gitlab.discs.ateneo.edu/totallynotkai/widgets-fekk · 4f7f5afc
  Emmanuel Linus T. Evangelista authored May 18, 2022
  
  4f7f5afc
- add image upload for Forum · 2093cf64
  Emmanuel Linus T. Evangelista authored May 18, 2022
  
  2093cf64
- add support for media upload · 087073ca
  Emmanuel Linus T. Evangelista authored May 18, 2022
  
  087073ca
17 May, 2022 1 commit
- add new Forum post form, convert to CBV, minor QoL changes · ddcac344
  Emmanuel Linus T. Evangelista authored May 17, 2022
  
  ddcac344
16 May, 2022 33 commits
- Edited assignments html · ebcc9ec4
  Katrina Bernice Tan authored May 16, 2022
  
  ebcc9ec4
- Updated README with Lab 3 video · 6d9dd3ea
  Katrina Bernice Tan authored May 16, 2022
  
  6d9dd3ea
- Merge branch 'velasco/homepage' into 'master' · e7a413b3
  Franco Velasco authored May 16, 2022
```
Fixed urls pointing to user

See merge request !17
```
  e7a413b3
- Fixed urls pointing to user · 34d38102
  Franco Velasco authored May 16, 2022
  
  34d38102
- Merge branch 'master' of https://gitlab.discs.ateneo.edu/totallynotkai/widgets-fekk · af702936
  Emmanuel Linus T. Evangelista authored May 16, 2022
  
  af702936
- Merge branch 'tan/assignments' into 'master' · db3358f3
  Katrina Bernice Tan authored May 16, 2022
```
Added templates for Assignments

See merge request !16
```
  db3358f3
- Merge branch 'master' of https://gitlab.discs.ateneo.edu/totallynotkai/widgets-fekk · f50c87d9
  Emmanuel Linus T. Evangelista authored May 16, 2022
  
  f50c87d9
- fix anchor tag in assignments · 62ef8c1a
  Emmanuel Linus T. Evangelista authored May 16, 2022
  
  62ef8c1a
- Merge branch 'tan/assignments' of... · f4df64fb
  Emmanuel Linus T. Evangelista authored May 16, 2022
```
Merge branch 'tan/assignments' of https://gitlab.discs.ateneo.edu/totallynotkai/widgets-fekk into tan/assignments
```
  f4df64fb
- Edited urls · d6cb7c22
  Katrina Bernice Tan authored May 16, 2022
  
  d6cb7c22
- Merge branch 'tan/assignments' of... · 7ee7d3ad
  Emmanuel Linus T. Evangelista authored May 16, 2022
```
Merge branch 'tan/assignments' of https://gitlab.discs.ateneo.edu/totallynotkai/widgets-fekk into tan/assignments
```
  7ee7d3ad
- Fixed assignments/urls.py for individual assignments · 248f68aa
  Katrina Bernice Tan authored May 16, 2022
  
  248f68aa
- Merge branch 'tan/assignments' of... · 0b1fc78b
  Emmanuel Linus T. Evangelista authored May 16, 2022
```
Merge branch 'tan/assignments' of https://gitlab.discs.ateneo.edu/totallynotkai/widgets-fekk into tan/assignments
```
  0b1fc78b
- Fixed Assignments/views.py · 4dd4782f
  Katrina Bernice Tan authored May 16, 2022
  
  4dd4782f
- Merge branch 'tan/assignments' of... · d2fca308
  Emmanuel Linus T. Evangelista authored May 16, 2022
```
Merge branch 'tan/assignments' of https://gitlab.discs.ateneo.edu/totallynotkai/widgets-fekk into tan/assignments
```
  d2fca308
- Fixed Assignment Templates · 11f28fcb
  Katrina Bernice Tan authored May 16, 2022
  
  11f28fcb
- Merge branch 'tan/assignments' · 6a5d4bd8
  Emmanuel Linus T. Evangelista authored May 16, 2022
  
  6a5d4bd8
- Delete .DS_Store · f25eabb6
  Franco Velasco authored May 16, 2022
  
  f25eabb6
- Delete .DS_Store · d653241f
  Franco Velasco authored May 16, 2022
  
  d653241f
- Delete .DS_Store · 956eace2
  Franco Velasco authored May 16, 2022
  
  956eace2
- Delete .DS_Store · b42f2948
  Franco Velasco authored May 16, 2022
  
  b42f2948
- Delete .DS_Store · bb7c47b7
  Franco Velasco authored May 16, 2022
  
  bb7c47b7
- Delete .DS_Store · f82b868c
  Franco Velasco authored May 16, 2022
  
  f82b868c
- Delete .DS_Store · 6f4871e9
  Franco Velasco authored May 16, 2022
  
  6f4871e9
- Delete .DS_Store · 0182b8f4
  Franco Velasco authored May 16, 2022
  
  0182b8f4
- Delete db.sqlite3 · 09088be3
  Franco Velasco authored May 16, 2022
  
  09088be3
- Delete .DS_Store · 4261263f
  Franco Velasco authored May 16, 2022
  
  4261263f
- Delete .DS_Store · 39510cee
  Franco Velasco authored May 16, 2022
  
  39510cee
- Merge branch 'martin/announcements' into 'master' · 592cf44e
  Kyla Martin authored May 16, 2022
```
Martin/announcements

See merge request !14
```
  592cf44e
- Merge branch 'master' into 'martin/announcements' · 340ca903
  Kyla Martin authored May 16, 2022
```
# Conflicts:
#   WidgetFEKK/WidgetFEKK/urls.py
```
  340ca903
- Merge branch 'evangelista/forum' into 'master' · 5c3b03e1
  Emmanuel Linus T. Evangelista authored May 16, 2022
```
Evangelista/forum

See merge request !11
```
  5c3b03e1
- Created templates for the Assignments app · 4c06e39c
  Katrina Bernice Tan authored May 16, 2022
  
  4c06e39c
- Merge branch 'velasco/homepage' into 'master' · c20478ae
  Franco Velasco authored May 16, 2022
```
Created Homepage user list template, User Details page template

See merge request !12
```
  c20478ae
15 May, 2022 2 commits
- Add static image, remove unnecessary lines · d5f12d3e
  Kyla Martin authored May 15, 2022
  
  d5f12d3e
- Create Announcements templates, link in urls · ef6517e9
  Kyla Martin authored May 15, 2022
  
  ef6517e9