Commits · 601e2e6e73ab2fdf7966fe362d23fab818c9bcbb · Dong Zhuang / relate

Feb 07, 2018
- Merge remote-tracking branch 'remotes/upstream/master' into extend_code_and_fix_feedback_points · 601e2e6e
  Dong Zhuang authored Feb 07, 2018
  
  601e2e6e
- Merge pull request #451 from dzhuang/fix_#449 · ef0f7657
  Dong Zhuang authored Feb 07, 2018
```
Fixed potential conflicts between grade points displayed and percentage. 
Fixes #449
```
  ef0f7657
- Better namings: RelateJinjaMacroBase and IpynbJinjaMacro · 7be78840
  Dong Zhuang authored Feb 07, 2018
  
  7be78840
Feb 06, 2018
- Fix Ipynb docs. · 5451d60a
  Dong Zhuang authored Feb 07, 2018
  
  5451d60a
- Merge branch 'ipynb_renderer' into 'master' · b5e9b2bf
  Dong Zhuang authored Feb 06, 2018
```
Built-in ipython notebook Jinja expansion for RELATE flavored markdown.
```
  b5e9b2bf
- Add back incidentally deleted lines. · 929d3e8f
  Dong Zhuang authored Feb 07, 2018
  
  929d3e8f
- Use callable class for Ipynb jinja expansion. · af7f62d6
  Dong Zhuang authored Feb 07, 2018
  
  af7f62d6
Feb 05, 2018
- Merge branch 'master' into ipynb_renderer · 611c072d
  Dong Zhuang authored Feb 05, 2018
  
  611c072d
- Fixed potential conflicts between grade points displayed and percentage · a72a7702
  Dong Zhuang authored Feb 05, 2018
  
  a72a7702
- Merge pull request #450 from dzhuang/throw_error_when_makemessages_format_string_improperly · 1d01fd12
  Dong Zhuang authored Feb 05, 2018
```
Ensure test failure when I18N literals formatted improperly.
```
  1d01fd12
- Ensure test failure when I18N literals formatted improperly. · 358cef91
  Dong Zhuang authored Feb 05, 2018
  
  358cef91
- Fix bug when feedback points are close enough to 1 · b00695fa
  Adam J. Stewart authored Feb 04, 2018
  
  b00695fa
- Merge pull request #446 from dzhuang/test_admin · 74ee62b0
  Dong Zhuang authored Feb 05, 2018
```
Improve admin to show only objects from related course.
```
  74ee62b0
Feb 04, 2018
- Improved admin to show only objects from related course. · 925d0531
  Dong Zhuang authored Feb 01, 2018
  
  925d0531
Feb 02, 2018
- Fix point counts for relate-sample adjustments · 2b4f5208
  Andreas Klöckner authored Feb 02, 2018
  
  2b4f5208
- Merge pull request #443 from bowmanat/master · 300d02cd
  Andreas Klöckner authored Feb 02, 2018
```
Avoid failure when student passes non-callable as function
```
  300d02cd
- Merge pull request #419 from inducer/choicequestion-data-model · d8df3007
  Andreas Klöckner authored Feb 01, 2018
```
Make choice question data handling less string-y
```
  d8df3007
Jan 31, 2018
- Ensure error is caught if student passes callable without a name · d84eab41
  Nathan Bowman authored Jan 31, 2018
  
  d84eab41
- Avoid failure when student passes non-callable as function · 76cea389
  Nathan Bowman authored Jan 31, 2018
  
  76cea389
- Merge pull request #441 from dzhuang/refactor_tests · f7c73c0c
  Andreas Klöckner authored Jan 31, 2018
```
Refactor sandbox and some tests.
```
  f7c73c0c
- Refactor sandbox and some tests. · eb7d0703
  Dong Zhuang authored Jan 31, 2018
  
  eb7d0703
- Merge pull request #442 from dzhuang/res_conflicts · 3d324865
  Andreas Klöckner authored Jan 31, 2018
```
Resolve conflicts for merging #419 into master
```
  3d324865
- Resolve merge conflicts. · 46ff21e3
  Dong Zhuang authored Jan 31, 2018
  
  46ff21e3
- Merge pull request #401 from dzhuang/uniqueness_of_user_email · 96540952
  Andreas Klöckner authored Jan 31, 2018
```
Ensure uniqueness of user email.
```
  96540952
- Rephrase literals/notes. · 9abb7191
  Dong Zhuang authored Jan 31, 2018
  
  9abb7191
Jan 30, 2018
- Merge pull request #440 from dzhuang/choicequestion-data-model · 90c8fda0
  Andreas Klöckner authored Jan 30, 2018
```
Added tests for course.page.choice
```
  90c8fda0
- Added tests for course.page.choice · d86a5dc7
  Dong Zhuang authored Jan 29, 2018
  
  d86a5dc7
- Ensure uniqueness of user email. · 94d697e2
  Dong Zhuang authored Jan 30, 2018
  
  94d697e2
Jan 23, 2018
- Merge pull request #438 from inducer/no-more-dnspython3 · 4280e182
  Andreas Klöckner authored Jan 23, 2018
```
Remove use of dnspython3, which is no longer necessary
```
  4280e182
- Remove use of dnspython3, which is no longer necessary · 3b56bee6
  Andreas Klöckner authored Jan 23, 2018
  
  3b56bee6
- Merge pull request #436 from dzhuang/dj2_compatibility · 028456fc
  Andreas Klöckner authored Jan 23, 2018
```
Fix Django 2 compatibility.
```
  028456fc
- Fix Django 2 compatibility. · 774d0410
  Dong Zhuang authored Jan 23, 2018
  
  774d0410
- Merge pull request #437 from dzhuang/fix_copy_right_string · beb74d6a
  Andreas Klöckner authored Jan 23, 2018
```
Corrected copy right string.
```
  beb74d6a
- Corrected copy right string. · 580dbc52
  Dong Zhuang authored Jan 23, 2018
  
  580dbc52
Jan 22, 2018
- Merge pull request #411 from inducer/purge-page-views · f19c8357
  Andreas Klöckner authored Jan 22, 2018
```
Purge page views
```
  f19c8357
- Merge pull request #434 from dzhuang/purge-page-views · 70b1b064
  Andreas Klöckner authored Jan 22, 2018
```
Added tests for Purge page views
```
  70b1b064
- Added tests for course.tasks.purge_page_view_data. · 619cd762
  Dong Zhuang authored Jan 22, 2018
  
  619cd762
- Merge branch 'master' into purge-page-views · 63f84dfa
  Andreas Klöckner authored Jan 21, 2018
  
  63f84dfa
Jan 20, 2018
- Merge pull request #433 from dzhuang/add_tasks_tests · b1e387c2
  Andreas Klöckner authored Jan 20, 2018
```
Add tasks tests.
```
  b1e387c2
- Test course.tasks more. · f5988ce1
  Dong Zhuang authored Jan 21, 2018
  
  f5988ce1