Commits · b23bfc75bc33fbe0c3d589f8e8d259c5799a5ab2 · edx / edx-platform · GitLab

20 Aug, 2012 1 commit
- additional minor change: allow "inline" attrib on textline · b23bfc75
  ichuang committed Aug 19, 2012
  
  b23bfc75 Browse Files
17 Aug, 2012 14 commits
- Merge branch 'feature/ichuang/add-gitreload-to-migrate' of github.com:MITx/mitx… · ed1a08d3
```
Merge branch 'feature/ichuang/add-gitreload-to-migrate' of github.com:MITx/mitx into feature/ichuang/add-gitreload-to-migrate
```
  ichuang committed Aug 17, 2012
  ed1a08d3 Browse Files
- fix view_tracking_log to show proper timezone · b6e41dc0
  ichuang committed Aug 17, 2012
  
  b6e41dc0 Browse Files
- update utility scripts for djang-1.4; will make them management cmds later · f7d48319
  ichuang committed Aug 17, 2012
  
  f7d48319 Browse Files
- MITX_FEATURES['USE_DJANGO_PIPELINE']=False in dev_ike by default · a6c6d0f4
  ichuang committed Aug 17, 2012
  
  a6c6d0f4 Browse Files
- Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/add-gitreload-to-migrate · 39e2d642
  ichuang committed Aug 17, 2012
  
  39e2d642 Browse Files
- more flexible event logs retrieval · 4365b4a0
  ichuang committed Aug 17, 2012
  
  4365b4a0 Browse Files
- add gitreload to lms migration, so it doesn't have to run separately · 7dd7de95
  ichuang committed Aug 17, 2012
  
  7dd7de95 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 25 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
- {} -> {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
- Added fixes for speed dropdown · b17cbcdc
  Kyle Fiedler committed Aug 16, 2012
  
  b17cbcdc Browse Files
- html needs < in backcompat_module · 73d9d10a
  ichuang committed Aug 16, 2012
  
  73d9d10a Browse Files
- minor change to backcompat_module for py26 compat · 0cac6c95
  ichuang committed Aug 16, 2012
  
  0cac6c95 Browse Files
- Hide chapters in addition to sections · 9acb1dda
  kimth committed Aug 16, 2012
  
  9acb1dda Browse Files
- Merge pull request #434 from MITx/sarina/max-attempts-fix · ea03838a
```
Add facility for fixed number of problem attempts
```
  ichuang committed Aug 16, 2012
  ea03838a Browse Files
- Add facility for fixed number of problem attempts · 725e9a2a
  Sarina Canelake committed Aug 16, 2012
  
  725e9a2a Browse Files
- add initial docs on xml format and policy files · 147bd5eb
  Victor Shnayder committed Aug 16, 2012
  
  147bd5eb Browse Files
- Merge pull request #433 from MITx/feature/kfiedler/courseware-style · 56fc4e2f
```
Made video go to the center of the screen in full screen
```
  Calen Pennington committed Aug 16, 2012
  56fc4e2f Browse Files
- Merge pull request #432 from MITx/feature/cale/fix-tests · 4e9e65e0
```
Move mitxmako out of common lib, and pass template rendering function in...
```
  Calen Pennington committed Aug 16, 2012
  4e9e65e0 Browse Files
- Made video go to the center of the screen in full screen · c2ee8447
  Kyle Fiedler committed Aug 16, 2012
  
  c2ee8447 Browse Files
- Add docstring for load_function · 4798a469
  Calen Pennington committed Aug 16, 2012
  
  4798a469 Browse Files