Commits · 3ee0d4395e2d94d78cab7315a6b7e459f32b26c0 · edx / edx-platform · GitLab

30 Jul, 2012 1 commit
- Added Gemfile.lock to ignore · 3ee0d439
  Kyle Fiedler committed Jul 30, 2012
  
  3ee0d439 Browse Files
27 Jul, 2012 7 commits
- Merge branch 'master' of github.com:MITx/mitx · 2984d7a4
  Bridger Maxwell committed Jul 27, 2012
  
  2984d7a4 Browse Files
- Merge branch 'MITx/hotfix/1.0.2' · db96a0e7
  Bridger Maxwell committed Jul 27, 2012
  
  db96a0e7 Browse Files
- Merge pull request #309 from MITx/feature/tutorials_fix · e8b82da7
```
Add optional hide_from_toc attribute to XML elements
```
  Calen Pennington committed Jul 27, 2012
  e8b82da7 Browse Files
- Added faq about UC Berkeley's 'X University' Consortium. · dfaff0a9
  Bridger Maxwell committed Jul 27, 2012
  
  dfaff0a9 Browse Files
- Merge pull request #307 from MITx/kimth/lms-coderesponse · e53c8402
```
Kimth/lms coderesponse
```
  Calen Pennington committed Jul 27, 2012
  e53c8402 Browse Files
- Merge pull request #310 from MITx/arjun/javascript_loading · 7cabd8a5
```
Adding the ability for javascript from problems to execute more intelligently
```
  Calen Pennington committed Jul 27, 2012
  7cabd8a5 Browse Files
- Remove sections from ever getting appended in the first place if hide_from_toc is true · af0494c9
  David Ormsbee committed Jul 27, 2012
  
  af0494c9 Browse Files
26 Jul, 2012 18 commits
- Adding the ability for javascript from problems to execute more intelligently;… · 9c7d2ac0
```
Adding the ability for javascript from problems to execute more intelligently; for example, errors from javascript included in the returned html will show up in the console when using this mechanism.
```
  Arjun Singh committed Jul 26, 2012
  9c7d2ac0 Browse Files
- Merge pull request #306 from MITx/arjun/compile_coffee · c3592d43
```
Compiling coffee files in course data directories on startup.
```
  Calen Pennington committed Jul 26, 2012
  c3592d43 Browse Files
- Merge pull request #308 from MITx/feature/halogenandtoast/form-field-errors · 5c8f9be0
```
Add field-error class to field with issues.
```
  David Ormsbee committed Jul 26, 2012
  5c8f9be0 Browse Files
- Add optional hide_from_toc attribute to XML elements to support Tutorials (which… · 675db277
```
Add optional hide_from_toc attribute to XML elements to support Tutorials (which don't show up in the navigation).
```
  David Ormsbee committed Jul 26, 2012
  675db277 Browse Files
- Make logging work for xmodule and company. · 151923c2
```
* We do not want to disable existing loggers when setting up our own
```
  Victor Shnayder committed Jul 26, 2012
  151923c2 Browse Files
- Add field-error class to field with issues. · 49c6a138
  Matthew Mongeau committed Jul 26, 2012
  
  49c6a138 Browse Files
- Added TODO near temporary code. · cb240976
  Arjun Singh committed Jul 26, 2012
  
  cb240976 Browse Files
- Comment out really loud debug messages from xml.py · edb74b97
  Calen Pennington committed Jul 26, 2012
  
  edb74b97 Browse Files
- CodeMirror fix in the new scss org · 8a5c1174
  kimth committed Jul 26, 2012
  
  8a5c1174 Browse Files
- Ignore some spurious errors from pylint · cb64d5e2
  Calen Pennington committed Jul 26, 2012
  
  cb64d5e2 Browse Files
- Pull clean codemirror.css from master · 481070a1
  kimth committed Jul 26, 2012
  
  481070a1 Browse Files
- restored responsetypes.py from master · 686cb5a2
  kimth committed Jul 26, 2012
  
  686cb5a2 Browse Files
- Merging master · 67615ce8
  kimth committed Jul 26, 2012
  
  67615ce8 Browse Files
- Adjust comments · a1cedac1
  kimth committed Jul 26, 2012
  
  a1cedac1 Browse Files
- Merge remote-tracking branch 'origin/hotfix/1.0.1' · 440a6f69
```
Conflicts:
	common/djangoapps/student/views.py
```
  Calen Pennington committed Jul 26, 2012
  440a6f69 Browse Files
- Removing stray print statement · 5013eae8
  Arjun Singh committed Jul 25, 2012
  
  5013eae8 Browse Files
- Compiling coffee files in course data directories on startup. · d3873995
  Arjun Singh committed Jul 25, 2012
  
  d3873995 Browse Files
- Compiling coffee files in course data directories on startup. · 9660f73d
  Arjun Singh committed Jul 25, 2012
  
  9660f73d Browse Files
25 Jul, 2012 14 commits
- Have Bloomberg link point to Bloomberg article :-P · 8dfe2d70
  David Ormsbee committed Jul 25, 2012
  
  8dfe2d70 Browse Files
- Merge pull request #305 from MITx/feature/dormsbee/press_copy_updates · 0c9a3b1c
```
Hotfix changes
```
  David Ormsbee committed Jul 25, 2012
  0c9a3b1c Browse Files
- add a few items to the press links at the bottom of the front page · 7211b1ca
  David Ormsbee committed Jul 25, 2012
  
  7211b1ca Browse Files
- minor typo fixes · 42cb2081
  David Ormsbee committed Jul 25, 2012
  
  42cb2081 Browse Files
- Added styles for course images to always the right dimentions · 4df77472
  Kyle Fiedler committed Jul 25, 2012
  
  4df77472 Browse Files
- fixed twitter link to Berkeley Press Release · e0c9a15b
  David Ormsbee committed Jul 25, 2012
  
  e0c9a15b Browse Files
- fixed twitter link for course about pages · 0848a629
  David Ormsbee committed Jul 25, 2012
  
  0848a629 Browse Files
- New press articles · c96c0940
  David Ormsbee committed Jul 25, 2012
  
  c96c0940 Browse Files
- Update About Page text with new intro paragraph · c817b623
  David Ormsbee committed Jul 25, 2012
  
  c817b623 Browse Files
- Merge pull request #304 from MITx/feature/halogenandtoast/press-page · c9dacc4e
```
Feature/halogenandtoast/press page
```
  David Ormsbee committed Jul 25, 2012
  c9dacc4e Browse Files
- Move press articles to json. · 06037f14
  Matthew Mongeau committed Jul 25, 2012
  
  06037f14 Browse Files
- Consolidate textbox styling into codemirror.css · a6896158
  kimth committed Jul 25, 2012
  
  a6896158 Browse Files
- Merge pull request #297 from MITx/arjun/minor_css_fixes · b6f0bce0
```
change activation complete green and add styles for faq
```
  kylefiedler committed Jul 25, 2012
  b6f0bce0 Browse Files
- Fix cursor/text mismatch in Code/External-Response styling · 798809b1
  kimth committed Jul 25, 2012
  
  798809b1 Browse Files