Commits · 2d4f6c58e015fc58487b967008d51ea47bf83e0e · edx / edx-platform · GitLab

28 Jun, 2012 5 commits
- Merge branch 'master' of github.com:MITx/mitx · 2d4f6c58
  Bridger Maxwell committed Jun 28, 2012
  
  2d4f6c58 Browse Files
- Changed course settings to be a json file. Moved it to its own file. · e4c76e5d
  Bridger Maxwell committed Jun 28, 2012
  
  e4c76e5d Browse Files
- Run tests before running code quality checks (for faster turnaround time) · 24c1060b
  Calen Pennington committed Jun 28, 2012
  
  24c1060b Browse Files
- Import x_module using the full path · 92833e1c
  Calen Pennington committed Jun 28, 2012
  
  92833e1c Browse Files
- Minor fixes from pull request 131 · b80729cd
  Calen Pennington committed Jun 28, 2012
  
  b80729cd Browse Files
27 Jun, 2012 2 commits
- Merge pull request #147 from MITx/ps-fix-problem · 09d1f7db
```
Queue up MathML conversion to be after render
```
  ichuang committed Jun 27, 2012
  09d1f7db Browse Files
- Put in a fix for the Profile page (a bug was showing up for new users). A… · a182f40b
```
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
  a182f40b Browse Files
26 Jun, 2012 12 commits
- Fix code convention · 24fcdad4
  Prem Sichanugrist committed Jun 26, 2012
  
  24fcdad4 Browse Files
- Queue up MathML conversion to be after render · c464e184
```
From https://www.pivotaltracker.com/story/show/31700967
Fixes #137
```
  Prem Sichanugrist committed Jun 26, 2012
  c464e184 Browse Files
- Fix test failure after progress introduction · e7f5a808
  Prem Sichanugrist committed Jun 26, 2012
  
  e7f5a808 Browse Files
- Fix hover on textbook buttons · 119c44aa
  Kyle Fiedler committed Jun 26, 2012
  
  119c44aa Browse Files
- fixed padding issue on seq nav · 8a297094
  Kyle Fiedler committed Jun 26, 2012
  
  8a297094 Browse Files
- Merge pull request #140 from MITx/kf-html-edit · cbef328e
```
Kf html edit
```
  Calen Pennington committed Jun 26, 2012
  cbef328e Browse Files
- Merge pull request #144 from MITx/kf-seq-nav · 68aee102
```
Added new styles for the sequence nav including completeness
```
  David Ormsbee committed Jun 26, 2012
  68aee102 Browse Files
- Merge pull request #145 from MITx/kf-sidebar-buttons · 88a7d104
```
Added fix for the sidebar buttons in the courseware
```
  David Ormsbee committed Jun 26, 2012
  88a7d104 Browse Files
- Added fix for the sidebar buttons in the courseware · 88a2d22c
  Kyle Fiedler committed Jun 26, 2012
  
  88a2d22c Browse Files
- Added new styles for the sequence nav including completeness · 198a66bf
  Kyle Fiedler committed Jun 26, 2012
  
  198a66bf Browse Files
- Merge pull request #141 from MITx/ps-player-slider · 994a72d7
```
Scroll the caption upon video seeking
```
  Prem Sichanugrist committed Jun 26, 2012
  994a72d7 Browse Files
- Merge pull request #132 from MITx/kf-problems · b868969f
```
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
  b868969f Browse Files
25 Jun, 2012 6 commits
- Introduce `rake cms:import` task to import data · 4a81df45
```
Usage: `rake cms:import DATA_DIR=<path_to_your_data_dir>`
```
  Prem Sichanugrist committed Jun 25, 2012
  4a81df45 Browse Files
- Scroll the caption upon video seeking · 0b162a65
  Prem Sichanugrist committed Jun 25, 2012
  
  0b162a65 Browse Files
- Added red wip class and added tag for it · b0ac82db
  Kyle Fiedler committed Jun 25, 2012
  
  b0ac82db Browse Files
- Added wip class · 689fa1de
  Kyle Fiedler committed Jun 25, 2012
  
  689fa1de Browse Files
- Refactored the css and fixed some smaller bugs · 3cd86d99
  Kyle Fiedler committed Jun 25, 2012
  
  3cd86d99 Browse Files
- Added styles to be more consistant across pages · 3ad81949
  Kyle Fiedler committed Jun 25, 2012
  
  3ad81949 Browse Files
22 Jun, 2012 8 commits
- Merge pull request #135 from MITx/cpennington/cms-editing · d2d3b203
```
Roundtrip HTML module editing working in the CMS
```
  David Ormsbee committed Jun 22, 2012
  d2d3b203 Browse Files
- Merge pull request #131 from MITx/victor/xml-testing · ea962dbf
```
Victor/xml testing
```
  Calen Pennington committed Jun 22, 2012
  ea962dbf Browse Files
- added styles for ol in html units · 50db8e81
  Kyle Fiedler committed Jun 22, 2012
  
  50db8e81 Browse Files
- Wire up the cancel button in the unit editor · 19f72048
  Calen Pennington committed Jun 22, 2012
  
  19f72048 Browse Files
- Html Module can now be editing, saved, and re-opened · 79b8b495
  Calen Pennington committed Jun 22, 2012
  
  79b8b495 Browse Files
- Added new readme info and started to rework some of the css · 8864f7dd
  Kyle Fiedler committed Jun 22, 2012
  
  8864f7dd Browse Files
- Split problem metadata out from problem editing contents when rendering · fdf647c0
  Calen Pennington committed Jun 22, 2012
  
  fdf647c0 Browse Files
- Call js module name dynamically, rather than statically calling the HTML module · 3eadcd29
  Calen Pennington committed Jun 22, 2012
  
  3eadcd29 Browse Files
21 Jun, 2012 7 commits
- Added new styles for html editing and removed a bunch of unused templates · c5483def
  Kyle Fiedler committed Jun 21, 2012
  
  c5483def Browse Files
- Added styles for more basic html elements and reworked design of textinput · 49c065e7
  Kyle Fiedler committed Jun 21, 2012
  
  49c065e7 Browse Files
- added styles for lists and paragraphs in problems · 381ae449
  Kyle Fiedler committed Jun 21, 2012
  
  381ae449 Browse Files
- Live editing of html modules implemented, but no saving to the backend · b049aabb
  Calen Pennington committed Jun 21, 2012
  
  b049aabb Browse Files
- folders and a bit of initial test data for xml validation · cb3b5a8b
  Victor Shnayder committed Jun 21, 2012
  
  cb3b5a8b Browse Files
- Make the LMS check_course command work again. · df419f31
  Victor Shnayder committed Jun 21, 2012
  
  df419f31 Browse Files
- Started update of check_course script. It runs again now. · 9a0213bf
```
TODO:
  - support picking a different course name
  - make it use current module rendering path, get that working.
```
  Victor Shnayder committed Jun 21, 2012
  9a0213bf Browse Files