Commits · f59951ead5be91902c638144316804c01b3d436d · edx / edx-platform · GitLab

28 Jun, 2012 4 commits
- Run tests before running code quality checks (for faster turnaround time) · f59951ea
  Calen Pennington committed Jun 28, 2012
  
  f59951ea Browse Files
- updating edx4edx_aws config · 5c398b25
  John Jarvis committed Jun 28, 2012
  
  5c398b25 Browse Files
- change MITx -> edX in many lms templates · 5688e89f
  ichuang committed Jun 28, 2012
  
  5688e89f Browse Files
- Merge pull request #150 from MITx/stable-edx4edx-aws · fedf2c8d
```
Stable edx4edx aws
```
  Calen Pennington committed Jun 28, 2012
  fedf2c8d Browse Files
27 Jun, 2012 6 commits
- Merge branch 'ps-fix-problem' of github.com:MITx/mitx into stable-edx4edx · 3f60c76f
  ichuang committed Jun 27, 2012
  
  3f60c76f Browse Files
- setting quickedit to true · 03b6bd04
  John Jarvis committed Jun 27, 2012
  
  03b6bd04 Browse Files
- collect static resources is now handled by the gunicorn upstart script · 59d0c408
  John Jarvis committed Jun 27, 2012
  
  59d0c408 Browse Files
- MITx -> edX in activation email · c5630e6d
  ichuang committed Jun 26, 2012
  
  c5630e6d Browse Files
- fix subject in activation email - now uses course_title · c0581f8c
  ichuang committed Jun 26, 2012
  
  c0581f8c Browse Files
- add MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] config for edx4edx activation · 200e188c
```
 - issue is that content machine isn't whitelisted for email
 - this also provides secondary filtering for user registration
```
  ichuang committed Jun 26, 2012
  200e188c Browse Files
26 Jun, 2012 20 commits
- Merge pull request #149 from MITx/stable-edx4edx-aws · fee4ecf7
```
Stable edx4edx aws
We may need to switch quickedit, based on feedback from Ike. 
```
  pmitros committed Jun 26, 2012
  fee4ecf7 Browse Files
- adding edx4edx_aws for edx4edx aws instance · 7b86caaf
  John Jarvis committed Jun 26, 2012
  
  7b86caaf Browse Files
- Merge branch 'stable-edx4edx' of github.com:MITx/mitx into stable-edx4edx · a3b38f2f
  ichuang committed Jun 26, 2012
  
  a3b38f2f Browse Files
- add admin model for student (need to be able to see activation keys in db) · bda75b4f
  ichuang committed Jun 26, 2012
  
  bda75b4f Browse Files
- 3.091x static link · 5d9c600d
  ichuang committed Jun 26, 2012
  
  5d9c600d Browse Files
- add 3.091x to multicourse · a1b53c3c
  ichuang committed Jun 26, 2012
  
  a1b53c3c Browse Files
- Fix code convention · 4db0a701
  Prem Sichanugrist committed Jun 26, 2012
  
  4db0a701 Browse Files
- Queue up MathML conversion to be after render · 4580ef89
```
From https://www.pivotaltracker.com/story/show/31700967
Fixes #137
```
  Prem Sichanugrist committed Jun 26, 2012
  4580ef89 Browse Files
- Fix test failure after progress introduction · 7475e415
  Prem Sichanugrist committed Jun 26, 2012
  
  7475e415 Browse Files
- Fix hover on textbook buttons · 6c95bfc1
  Kyle Fiedler committed Jun 26, 2012
  
  6c95bfc1 Browse Files
- fixed padding issue on seq nav · fc81cf75
  Kyle Fiedler committed Jun 26, 2012
  
  fc81cf75 Browse Files
- Merge pull request #140 from MITx/kf-html-edit · 65c8396e
```
Kf html edit
```
  Calen Pennington committed Jun 26, 2012
  65c8396e Browse Files
- Merge pull request #144 from MITx/kf-seq-nav · 084c4875
```
Added new styles for the sequence nav including completeness
```
  David Ormsbee committed Jun 26, 2012
  084c4875 Browse Files
- Merge pull request #145 from MITx/kf-sidebar-buttons · 2ec12f59
```
Added fix for the sidebar buttons in the courseware
```
  David Ormsbee committed Jun 26, 2012
  2ec12f59 Browse Files
- Added fix for the sidebar buttons in the courseware · 10c1270b
  Kyle Fiedler committed Jun 26, 2012
  
  10c1270b Browse Files
- Added new styles for the sequence nav including completeness · aee2cf4e
  Kyle Fiedler committed Jun 26, 2012
  
  aee2cf4e Browse Files
- Merge pull request #141 from MITx/ps-player-slider · 3f9554f2
```
Scroll the caption upon video seeking
```
  Prem Sichanugrist committed Jun 26, 2012
  3f9554f2 Browse Files
- configuration running on content server: lms/envs/dev_edx4edx · 9aeaaa72
  ichuang committed Jun 26, 2012
  
  9aeaaa72 Browse Files
- edx4edx configuration running on content server. Notes: · caa14922
```
  - django debug commented out in lms/envs/dev.py (temporarily - need cleanup)
  - email backend set
  - index page modified for edx4edx
```
  ichuang committed Jun 26, 2012
  caa14922 Browse Files
- Merge pull request #132 from MITx/kf-problems · a988452d
```
I'll go ahead and merge this, since it fixes nearly all the issues we had with problem and html css, and this should go in before more changes.  The table borders can be fixed in another round.
```
  ichuang committed Jun 25, 2012
  a988452d Browse Files
25 Jun, 2012 6 commits
- Introduce `rake cms:import` task to import data · d9d6f9b7
```
Usage: `rake cms:import DATA_DIR=<path_to_your_data_dir>`
```
  Prem Sichanugrist committed Jun 25, 2012
  d9d6f9b7 Browse Files
- Scroll the caption upon video seeking · 05f4e4fb
  Prem Sichanugrist committed Jun 25, 2012
  
  05f4e4fb Browse Files
- Added red wip class and added tag for it · 863568ec
  Kyle Fiedler committed Jun 25, 2012
  
  863568ec Browse Files
- Added wip class · 656fa389
  Kyle Fiedler committed Jun 25, 2012
  
  656fa389 Browse Files
- Refactored the css and fixed some smaller bugs · 30812588
  Kyle Fiedler committed Jun 25, 2012
  
  30812588 Browse Files
- Added styles to be more consistant across pages · 5908d844
  Kyle Fiedler committed Jun 25, 2012
  
  5908d844 Browse Files
24 Jun, 2012 2 commits
- add edit link to module pages with filenames (html & problem) · b59b8087
```
uses new 'github_url' dict key in multicourse_settings
this replaces the previous "quickedit" functionality
```
  ichuang committed Jun 24, 2012
  b59b8087 Browse Files
- improved error handling - catch errors around lcp.get_html() · 9cea3f97
  ichuang committed Jun 24, 2012
  
  9cea3f97 Browse Files
23 Jun, 2012 2 commits
- improved symmath error handling for matrix shape mismatch · 84e59a54
  ichuang committed Jun 23, 2012
  
  84e59a54 Browse Files
- improve capa error handling a bit - for better user experience · 7814805c
```
- if no answer given, then symbolicresponse + customrepsonse now
  give an error message, instead of doing nothing
- in capa_module if lcp.grade_answers fails, in DEBUG mode display
  alert with useful error message
```
  ichuang committed Jun 23, 2012
  7814805c Browse Files