Commits · 82070acdc5af65826c61a417aeb74ed3e7ba0abf · ARFA / ARFA

26 Nov, 2018 29 commits
- Merge branch 'master' of https://git.cse.iitb.ac.in/ARFA/ARFA · 82070acd
  SANCHIT JAIN authored Nov 27, 2018
  
  82070acd
- added Mathjax in base.html · 9e156cd8
  SANCHIT JAIN authored Nov 27, 2018
  
  9e156cd8
- Corrected view all questions · 9fb0d9c1
  CHINTHAREDDY SAI CHARITH REDDY authored Nov 27, 2018
  
  9fb0d9c1
- Prints and corrected chart · e971cc27
  CHINTHAREDDY SAI CHARITH REDDY authored Nov 27, 2018
  
  e971cc27
- filter difficulty · 454e5d92
  Rahul-chunduru authored Nov 27, 2018
  
  454e5d92
- more ui · 697b9501
  Rahul-chunduru authored Nov 27, 2018
  
  697b9501
- Responses side by side · 3c422045
  CHINTHAREDDY SAI CHARITH REDDY authored Nov 27, 2018
  
  3c422045
- merge conflict resolved · 74b49c59
  NARRA SURAJ authored Nov 26, 2018
  
  74b49c59
- disabled load test for attempted tests · 1f16e090
  NARRA SURAJ authored Nov 26, 2018
  
  1f16e090
- improved create_question · 157e55ef
  Rahul-chunduru authored Nov 26, 2018
  
  157e55ef
- Merge branch 'master' of https://git.cse.iitb.ac.in/ARFA/ARFA · ee12e8d0
  NARRA SURAJ authored Nov 26, 2018
  
  ee12e8d0
- testhome ui · f7db8450
  Rahul-chunduru authored Nov 26, 2018
  
  f7db8450
- Merge branch 'master' of https://git.cse.iitb.ac.in/ARFA/ARFA · 466b5c37
  NARRA SURAJ authored Nov 26, 2018
  
  466b5c37
- merge conflicts resolvedd · c0b01136
  Rahul-chunduru authored Nov 26, 2018
  
  c0b01136
- ui for images in questions · edc4a72b
  Rahul-chunduru authored Nov 26, 2018
  
  edc4a72b
- Centre align · 7882f369
  CHINTHAREDDY SAI CHARITH REDDY authored Nov 26, 2018
  
  7882f369
- Test Performance · 07c37cb4
  CHINTHAREDDY SAI CHARITH REDDY authored Nov 26, 2018
  
  07c37cb4
- Test Performance · 39812351
  CHINTHAREDDY SAI CHARITH REDDY authored Nov 26, 2018
  
  39812351
- changed name of button and created a database file · 83a2e921
  SANCHIT JAIN authored Nov 26, 2018
  
  83a2e921
- Merge branch 'master' of https://git.cse.iitb.ac.in/ARFA/ARFA · 9e9fe6ec
  NARRA SURAJ authored Nov 26, 2018
  
  9e9fe6ec
- max_marks done, frontend and backend · cd41d35f
  NARRA SURAJ authored Nov 26, 2018
  
  cd41d35f
- pulling · f59e050e
  CHINTHAREDDY SAI CHARITH REDDY authored Nov 26, 2018
  
  f59e050e
- fixed favicon · cb3dfd3e
  SANCHIT JAIN authored Nov 26, 2018
  
  cb3dfd3e
- added comments · 0a4a3412
  NARRA SURAJ authored Nov 26, 2018
  
  0a4a3412
- Merge branch 'master' of https://git.cse.iitb.ac.in/ARFA/ARFA · 22db66fb
  NARRA SURAJ authored Nov 26, 2018
  
  22db66fb
- timezone, background_tasks · af504fb0
  NARRA SURAJ authored Nov 26, 2018
  
  af504fb0
- ranking done · 8bd93373
  NARRA SURAJ authored Nov 26, 2018
  
  8bd93373
- resolve conflicts · 5c5ae581
  Rahul-chunduru authored Nov 26, 2018
  
  5c5ae581
- added image upload facility · 9c3728d1
  Rahul-chunduru authored Nov 26, 2018
  
  9c3728d1
25 Nov, 2018 11 commits
- Merge branch 'master' of https://git.cse.iitb.ac.in/ARFA/ARFA · 917d940b
  CHINTHAREDDY SAI CHARITH REDDY authored Nov 26, 2018
```
merge
```
  917d940b
- merging · 4c2a45ab
  CHINTHAREDDY SAI CHARITH REDDY authored Nov 26, 2018
  
  4c2a45ab
- added date time · 6d27c864
  SANCHIT JAIN authored Nov 26, 2018
  
  6d27c864
- added date time picker · 1d76ca5d
  SANCHIT JAIN authored Nov 26, 2018
  
  1d76ca5d
- mergedd · b7f7551d
  Rahul-chunduru authored Nov 26, 2018
  
  b7f7551d
- Merge branch 'b1' into 'master' · 5becfe94
  rahul_chunduru authored Nov 26, 2018
```
B1

See merge request !4
```
  5becfe94
- Merge branch 'master' into 'b1' · ac29e610
  rahul_chunduru authored Nov 26, 2018
```
# Conflicts:
#   ARFA/ARFA_app/models.py
```
  ac29e610
- Merge branch 'master' of https://git.cse.iitb.ac.in/ARFA/ARFA · 582642c8
  SANCHIT JAIN authored Nov 26, 2018
  
  582642c8
- logout improved · fe73cce5
  SANCHIT JAIN authored Nov 26, 2018
  
  fe73cce5
- merged · 27707f99
  Rahul-chunduru authored Nov 26, 2018
  
  27707f99
- Merge branch 'testsBranch' into 'master' · 440a0a66
  CHINTHAREDDY SAI CHARITH REDDY authored Nov 26, 2018
```
Tests branch

See merge request !3
```
  440a0a66