Commits · 6965e00639ba7b8982ba4d729f195d0db84c6d50 · edx / edx-platform · GitLab

10 Jul, 2012 4 commits
- Merge pull request #152 from MITx/ps-cms-backbone · 6965e006
```
Rewrite CMS JavaScript to use Backbone
```
  Calen Pennington committed Jul 10, 2012
  6965e006 Browse Files
- Merge remote-tracking branch 'origin/master' into ps-cms-backbone · 6d246f06
```
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/coffee/unit.coffee
	cms/templates/index.html
	cms/templates/widgets/sequence-edit.html
```
  Calen Pennington committed Jul 10, 2012
  6d246f06 Browse Files
- Merge pull request #157 from MITx/cpennington/cms-github · ed0053ef
```
Enable interaction with github
```
  Calen Pennington committed Jul 10, 2012
  ed0053ef Browse Files
- Merge remote-tracking branch 'origin/master' into cpennington/cms-github · cfd6890d
```
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
```
  Calen Pennington committed Jul 10, 2012
  cfd6890d Browse Files
09 Jul, 2012 19 commits
- Made data identifiers consistent with master branch of 'content-mit-6002x' · 024789da
  kimth committed Jul 09, 2012
  
  024789da Browse Files
- Merge pull request #161 from MITx/kf-cms-style · 72a3c0f7
```
Kf cms style
```
  kylefiedler committed Jul 09, 2012
  72a3c0f7 Browse Files
- Fixed overflow and fixed hover on new module · 6f40b464
  Kyle Fiedler committed Jul 09, 2012
  
  6f40b464 Browse Files
- put normalize in vendor folder · 8a4d860a
  Kyle Fiedler committed Jul 09, 2012
  
  8a4d860a Browse Files
- Get rid of comments · 389fd711
  Kyle Fiedler committed Jul 09, 2012
  
  389fd711 Browse Files
- Added more wip and fixed issue with after · 93f8f768
  Kyle Fiedler committed Jul 09, 2012
  
  93f8f768 Browse Files
- Readd the wip class · 19bd613f
  Kyle Fiedler committed Jul 09, 2012
  
  19bd613f Browse Files
- Added some fixes for some small things adn reset the js · dbcad03d
  Kyle Fiedler committed Jul 09, 2012
  
  dbcad03d Browse Files
- Added new icons for all of the content · c8da9874
  Kyle Fiedler committed Jul 09, 2012
  
  c8da9874 Browse Files
- Rearranged the filter and sort bar and made it consistant · 0cb4781e
  Kyle Fiedler committed Jul 09, 2012
  
  0cb4781e Browse Files
- Played with the layout a bit and some other small changes · cb2a6f9d
  Kyle Fiedler committed Jul 09, 2012
  
  cb2a6f9d Browse Files
- Added better styles for draggable · 7aad8f04
  Kyle Fiedler committed Jul 09, 2012
  
  7aad8f04 Browse Files
- More tweeks for visual style for the filter bar and settings · 4b43e347
  Kyle Fiedler committed Jul 09, 2012
  
  4b43e347 Browse Files
- Added more tweeks to the calendar and unit pages · f1623ec6
  Kyle Fiedler committed Jul 09, 2012
  
  f1623ec6 Browse Files
- Added fixes for the sidebar, made better base style for inputs and brightened colors a bit · 94fccb00
  Kyle Fiedler committed Jul 09, 2012
  
  94fccb00 Browse Files
- Added some hovers fo the caledar · 985a5323
  Kyle Fiedler committed Jul 09, 2012
  
  985a5323 Browse Files
- Merge branch 'kf-inline-inputs' of github.com:MITx/mitx into ichuang/stable_edx4edx_merge · 5ee29807
  ichuang committed Jul 08, 2012
  
  5ee29807 Browse Files
- minor changes - test this branch with more courses (8.01x, 6.00x) · 3a664753
  ichuang committed Jul 08, 2012
  
  3a664753 Browse Files
- change "type" to "category" in xml_module.py · aedcd9a4
  ichuang committed Jul 08, 2012
  
  aedcd9a4 Browse Files
08 Jul, 2012 3 commits
- merging of stable-edx4edx into master - bugfixes and debugging · 0daf7b04
  ichuang committed Jul 08, 2012
  
  0daf7b04 Browse Files
- default course to settings.COURSE_DEFAULT · 4356ec5c
  ichuang committed Jul 08, 2012
  
  4356ec5c Browse Files
- Merge branch 'stable-edx4edx' of github.com:MITx/mitx · 9b90068e
```
Conflicts:
	common/lib/xmodule/seq_module.py
	common/lib/xmodule/xmodule/capa_module.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/multicourse/multicourse_settings.py
```
  ichuang committed Jul 08, 2012
  9b90068e Browse Files
06 Jul, 2012 14 commits
- Add documentation for running JavaScript test · 9801ce5d
  Prem Sichanugrist committed Jul 06, 2012
  
  9801ce5d Browse Files
- Use `static.url` for static assets · 58fc2000
  Prem Sichanugrist committed Jul 06, 2012
  
  58fc2000 Browse Files
- Move vendored js files into js/vendor/ · 9dc5cdde
  Prem Sichanugrist committed Jul 06, 2012
  
  9dc5cdde Browse Files
- Remove unnecessary fat arrow · 07aae06d
  Prem Sichanugrist committed Jul 06, 2012
  
  07aae06d Browse Files
- Pass in element in CMS.start() instead · b8fd728e
  Prem Sichanugrist committed Jul 06, 2012
  
  b8fd728e Browse Files
- Make it more obvious that the function is no-op · 28959973
  Prem Sichanugrist committed Jul 06, 2012
  
  28959973 Browse Files
- Removed unused Week Model · f71e54cc
  Prem Sichanugrist committed Jul 06, 2012
  
  f71e54cc Browse Files
- fixed two bugs in inputtypes: textline with quotes crashed problems, and · 74e01bb0
```
choice without text caused error
```
  ichuang committed Jul 06, 2012
  74e01bb0 Browse Files
- Prevent default click event on links · 2a36fee4
  Prem Sichanugrist committed Jul 06, 2012
  
  2a36fee4 Browse Files
- Fix quote convention in tests · 95cf25c1
  Prem Sichanugrist committed Jul 06, 2012
  
  95cf25c1 Browse Files
- Update Views.ModuleEdit, also added test · 9ba62468
  Prem Sichanugrist committed Jul 06, 2012
  
  9ba62468 Browse Files
- CMS.Views.Week is tested · dd3ddeb9
  Prem Sichanugrist committed Jul 06, 2012
  
  dd3ddeb9 Browse Files
- CMS.Views.Course fixed and tested · b11b9169
  Prem Sichanugrist committed Jul 05, 2012
  
  b11b9169 Browse Files
- Update jasmine-jquery for newer features · a77e7fe5
  Prem Sichanugrist committed Jul 05, 2012
  
  a77e7fe5 Browse Files