Commits · 80ab2d27a0ea83997498b9aec287a3d6a8e5363d · edx / edx-platform · GitLab

19 Aug, 2012 6 commits
- fixed comment retrieval · 80ab2d27
  Rocky Duan committed Aug 19, 2012
  
  80ab2d27 Browse Files
- major refactor of templates · b4ec109d
  Rocky Duan committed Aug 19, 2012
  
  b4ec109d Browse Files
- some refactor · e49226e9
  Rocky Duan committed Aug 19, 2012
  
  e49226e9 Browse Files
- minor refactoring · 1c1d449a
  Rocky Duan committed Aug 18, 2012
  
  1c1d449a Browse Files
- refactored code to render ajax content · 0dd5428e
  Rocky Duan committed Aug 18, 2012
  
  0dd5428e Browse Files
- Merge branch 'master' into profile · 238adb1a
```
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/course_navigation.html
```
  Rocky Duan committed Aug 18, 2012
  238adb1a Browse Files
18 Aug, 2012 6 commits
- Merge branch 'master' of github.com:MITx/mitx into profile · 028bd23c
```
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
```
  Rocky Duan committed Aug 18, 2012
  028bd23c Browse Files
- cache setting · 0d2f787c
  Rocky Duan committed Aug 18, 2012
  
  0d2f787c Browse Files
- Merge pull request #455 from MITx/kimth/circuitsim-link-fix · 9aeec690
```
Remove outdated hardcoded url from circuit simulator
```
  ichuang committed Aug 18, 2012
  9aeec690 Browse Files
- More info in comment · 78b3ca05
  kimth committed Aug 18, 2012
  
  78b3ca05 Browse Files
- Remove outdated hardcoded url from circuit simulator · 25d38905
  kimth committed Aug 18, 2012
  
  25d38905 Browse Files
- Merge pull request #451 from MITx/feature/kfiedler/courseware-style · 40b49224
```
Added new styles for sequence nav and reset some of the styles for inputs
```
  kimth committed Aug 17, 2012
  40b49224 Browse Files
17 Aug, 2012 12 commits
- Added new styles for sequence nav and reset some of the styles for inputs · 8473188f
  Kyle Fiedler committed Aug 17, 2012
  
  8473188f Browse Files
- Leave management of services and package installation to puppet · 445ce72b
  Calen Pennington committed Aug 17, 2012
  
  445ce72b Browse Files
- Merge pull request #449 from MITx/feature/dave/wiki_proxy · 656ee847
```
Config changes relating to course server split
```
  jarv committed Aug 17, 2012
  656ee847 Browse Files
- add course-specific askbot URLs for AWS course servers · 83ea5efa
  David Ormsbee committed Aug 17, 2012
  
  83ea5efa Browse Files
- Add proxy rule for wiki for local testing of split servers · 9806deee
  David Ormsbee committed Aug 17, 2012
  
  9806deee Browse Files
- Merge pull request #446 from MITx/hotfix/ichuang/pyxserver-default-url-change · 53006700
```
hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver

merging now so it stops holding up content teams.
```
  ichuang committed Aug 17, 2012
  53006700 Browse Files
- hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver · 4dbcfe92
```
This needs a more permanent solution.
```
  ichuang committed Aug 17, 2012
  4dbcfe92 Browse Files
- Fix the tests of the book url · b0627efc
  Calen Pennington committed Aug 17, 2012
  
  b0627efc Browse Files
- Merge pull request #444 from MITx/feature/fix_user_repl_to_3_plus · 427c400f
```
Fix user replication to Courses you're already enrolled in
```
  Calen Pennington committed Aug 17, 2012
  427c400f Browse Files
- Merge pull request #441 from MITx/feature/halogenandtoast/fix_scroll · 502691fa
```
Add jQuery scrollTo to courseware.
```
  Calen Pennington committed Aug 17, 2012
  502691fa Browse Files
- Merge pull request #445 from MITx/kimth/sjsu · 879fb0db
```
Fix CustomResponse for 6.002x
changes affect 6.002 model of customresponse, making it slightly more robust when improperly used.
```
  ichuang committed Aug 16, 2012
  879fb0db Browse Files
- Fix CustomResponse for 6.002x · 0a9065f2
  kimth committed Aug 16, 2012
  
  0a9065f2 Browse Files
16 Aug, 2012 16 commits
- When replicating CourseEnrollment, make sure Users were created in all DBs… · 61108c27
```
When replicating CourseEnrollment, make sure Users were created in all DBs before replicating other models
```
  David Ormsbee committed Aug 16, 2012
  61108c27 Browse Files
- Merge pull request #443 from MITx/feature/victor/fix-html-rendering · bea9aec6
```
fix another backcompat html bug
```
  kimth committed Aug 16, 2012
  bea9aec6 Browse Files
- fix another backcompat html bug · 7e69c357
  Victor Shnayder committed Aug 16, 2012
  
  7e69c357 Browse Files
- Merge pull request #442 from MITx/feature/kfiedler/courseware-style · 9686868a
```
Added fix for answer status and show answer to stay in the same place
```
  kimth committed Aug 16, 2012
  9686868a Browse Files
- Added fix for answer status and show answer to stay in the same place · f343bc28
  Kyle Fiedler committed Aug 16, 2012
  
  f343bc28 Browse Files
- Merge pull request #440 from MITx/feature/kfiedler/courseware-style · c56fb6f3
```
BUG SMASH
```
  kimth committed Aug 16, 2012
  c56fb6f3 Browse Files
- Merge pull request #438 from MITx/feature/ichuang/minor-py26-compat-fix-part2 · b5c60530
```
{} -> {0} etc in .format statements
```
  David Ormsbee committed Aug 16, 2012
  b5c60530 Browse Files
- Added fix for circut simulator · 09973bd8
  Kyle Fiedler committed Aug 16, 2012
  
  09973bd8 Browse Files
- Add jQuery scrollTo to courseware. · 40947752
  Matthew Mongeau committed Aug 16, 2012
  
  40947752 Browse Files
- Merge pull request #439 from MITx/feature/victor/fix-html-rendering · fa3e4688
```
fix html rendering bug
```
  kimth committed Aug 16, 2012
  fa3e4688 Browse Files
- fix html rendering bug · 1ae71313
  Victor Shnayder committed Aug 16, 2012
  
  1ae71313 Browse Files
- use only one conf param · c89e290c
  Rocky Duan committed Aug 16, 2012
  
  c89e290c Browse Files
- add askbot flag back · 730d4d94
  Rocky Duan committed Aug 16, 2012
  
  730d4d94 Browse Files
- {} -> {0} etc in .format statements · 6e3eff30
  ichuang committed Aug 16, 2012
  
  6e3eff30 Browse Files
- Merge pull request #437 from MITx/feature/ichuang/minor-py26-compat-fix · 97538e70
```
Fix backcompat_module : html escape & py26
```
  Calen Pennington committed Aug 16, 2012
  97538e70 Browse Files
- Merge pull request #436 from MITx/kimth/sjsu · f09fa831
```
Hide chapters in addition to sections
```
  Calen Pennington committed Aug 16, 2012
  f09fa831 Browse Files