Commits · fedf216bde61b4879cd0e43e3a8683fb1d09721b · edx / edx-platform · GitLab

30 Jun, 2012 2 commits
- Exception, err -> Exception as err · fedf216b
  ichuang committed Jun 29, 2012
  
  fedf216b Browse Files
- exception as err · 547e1962
  ichuang committed Jun 29, 2012
  
  547e1962 Browse Files
29 Jun, 2012 7 commits
- Merge branch 'master' of github.com:MITx/mitx into stable-edx4edx · 0f1ae7f0
  ichuang committed Jun 29, 2012
  
  0f1ae7f0 Browse Files
- add edx4edx root stuff from aws config to dev_ike config · 14745893
  ichuang committed Jun 29, 2012
  
  14745893 Browse Files
- Merge branch 'stable-edx4edx' of github.com:MITx/mitx into stable-edx4edx · 735833c1
  ichuang committed Jun 29, 2012
  
  735833c1 Browse Files
- inputtypes: if externalresponse server message is bad, don't crash · 8283636e
  ichuang committed Jun 29, 2012
  
  8283636e Browse Files
- postrm update · d61d0845
  John Jarvis committed Jun 29, 2012
  
  d61d0845 Browse Files
- updating rakefile to cleanup on package removal · 6229b2d1
  John Jarvis committed Jun 29, 2012
  
  6229b2d1 Browse Files
- updating URL for activation email to edx4edx · 6df22267
  John Jarvis committed Jun 29, 2012
  
  6df22267 Browse Files
28 Jun, 2012 10 commits
- add 6.00x to dev_ike.py · 8a6dd2f7
  ichuang committed Jun 28, 2012
  
  8a6dd2f7 Browse Files
- removing symlinks · db614b2c
  John Jarvis committed Jun 28, 2012
  
  db614b2c Browse Files
- Import x_module using the full path · 19490871
  Calen Pennington committed Jun 28, 2012
  
  19490871 Browse Files
- Run tests before running code quality checks (for faster turnaround time) · f59951ea
  Calen Pennington committed Jun 28, 2012
  
  f59951ea Browse Files
- Run tests before running code quality checks (for faster turnaround time) · 19044abe
  Calen Pennington committed Jun 28, 2012
  
  19044abe Browse Files
- Import x_module using the full path · 919f8cf2
  Calen Pennington committed Jun 28, 2012
  
  919f8cf2 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
- Minor fixes from pull request 131 · 2fde7f4c
  Calen Pennington committed Jun 28, 2012
  
  2fde7f4c Browse Files
27 Jun, 2012 8 commits
- Merge pull request #147 from MITx/ps-fix-problem · 6f5e54b9
```
Queue up MathML conversion to be after render
```
  ichuang committed Jun 27, 2012
  6f5e54b9 Browse Files
- 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
- Put in a fix for the Profile page (a bug was showing up for new users). A… · bf4f946f
```
Put in a fix for the Profile page (a bug was showing up for new users). A basecamp discussion will be started on the issue.
```
  Bridger Maxwell committed Jun 27, 2012
  bf4f946f 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 13 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