Commits · 97fb8be6badb2cbb4e3eddfe964eb06c1028b84c · edx / edx-platform · GitLab

09 Oct, 2012 1 commit
- Merge pull request #832 from MITx/feature/cdodge/subsection-edit-page · 97fb8be6
```
Feature/cdodge/subsection edit page
```
  Calen Pennington committed Oct 09, 2012
  97fb8be6 Browse Files
05 Oct, 2012 6 commits
- check if 'delete metadata field' is not in the list of system metadata · d5576986
  Chris Dodge committed Oct 05, 2012
  
  d5576986 Browse Files
- Merge pull request #830 from MITx/feature/tomg/cms-style-cleanup · 0ef56bb0
```
Random style updates
```
  Calen Pennington committed Oct 05, 2012
  0ef56bb0 Browse Files
- time/date setting on Release Date and Due date · 95e15c44
  Chris Dodge committed Oct 05, 2012
  
  95e15c44 Browse Files
- wip on setting date/times on subsection page · 758c4469
  Chris Dodge committed Oct 05, 2012
  
  758c4469 Browse Files
- fixed sign up to log in text · 1e68123e
  Tom Giannattasio committed Oct 05, 2012
  
  1e68123e Browse Files
- updated styles and template for unit location tree · 842306ad
  Tom Giannattasio committed Oct 05, 2012
  
  842306ad Browse Files
04 Oct, 2012 15 commits
- fixed courseware overview search positioning · fbae5d9e
  Tom Giannattasio committed Oct 04, 2012
  
  fbae5d9e Browse Files
- fixed log in header and overview search · 61ea9d36
  Tom Giannattasio committed Oct 04, 2012
  
  61ea9d36 Browse Files
- added padding to xmodule units · ebd3f28d
  Tom Giannattasio committed Oct 04, 2012
  
  ebd3f28d Browse Files
- Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into… · 3b38070d
```
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page
```
  Chris Dodge committed Oct 04, 2012
  3b38070d Browse Files
- remove template_dir_name from Vertical and Sequence descriptors so that it uses… · c3aa86f1
```
remove template_dir_name from Vertical and Sequence descriptors so that it uses the default template dir
```
  Chris Dodge committed Oct 04, 2012
  c3aa86f1 Browse Files
- Merge pull request #826 from MITx/feature/cdodge/subsection-edit-page · 580164e1
```
Feature/cdodge/subsection edit page
```
  Calen Pennington committed Oct 04, 2012
  580164e1 Browse Files
- address pull request feedback · fe42f6fd
  Chris Dodge committed Oct 04, 2012
  
  fe42f6fd Browse Files
- support reordering of units inside subsection list · 48d84c2e
  Chris Dodge committed Oct 04, 2012
  
  48d84c2e Browse Files
- save display_name and subtitle metadata · d93bf63d
  Chris Dodge committed Oct 04, 2012
  
  d93bf63d Browse Files
- need to wire through the new unit template location to the edit unit page · 29c142e3
  Chris Dodge committed Oct 04, 2012
  
  29c142e3 Browse Files
- Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into… · 322c4c0b
```
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page

Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/templates/widgets/units.html
```
  Chris Dodge committed Oct 04, 2012
  322c4c0b Browse Files
- update creating a new unit to use an empty template. Also twiddle the units.html… · 45b82f3a
```
update creating a new unit to use an empty template. Also twiddle the units.html and base.js where we put the unit Location on the <li> element
```
  Chris Dodge committed Oct 04, 2012
  45b82f3a Browse Files
- Merge pull request #819 from MITx/feature/cale/cas-unit-location-view · ab7377dc
```
Wire up the unit location display
```
  chrisndodge committed Oct 04, 2012
  ab7377dc Browse Files
- Merge pull request #822 from MITx/feature/tomg/labs-signup · 612e5fe8
```
added course page with log in and sign up
```
  Calen Pennington committed Oct 04, 2012
  612e5fe8 Browse Files
- more explicit temporary status on landing page · 92e830df
  Tom Giannattasio committed Oct 04, 2012
  
  92e830df Browse Files
03 Oct, 2012 18 commits
- h1 float fix · cd64f921
  Tom Giannattasio committed Oct 03, 2012
  
  cd64f921 Browse Files
- added landing styles · 145be8c8
  Tom Giannattasio committed Oct 03, 2012
  
  145be8c8 Browse Files
- added temp labs logo · 249d2520
  Tom Giannattasio committed Oct 03, 2012
  
  249d2520 Browse Files
- setup landing template · 6b4d9ba0
  Tom Giannattasio committed Oct 03, 2012
  
  6b4d9ba0 Browse Files
- consistent field labels · ea1b7caf
  Tom Giannattasio committed Oct 03, 2012
  
  ea1b7caf Browse Files
- removed extraneous border on log in extras · 5a26dd7e
  Tom Giannattasio committed Oct 03, 2012
  
  5a26dd7e Browse Files
- added no-header class to login.html · 277cc343
  Tom Giannattasio committed Oct 03, 2012
  
  277cc343 Browse Files
- added class to remove header · 222d23df
  Tom Giannattasio committed Oct 03, 2012
  
  222d23df Browse Files
- abstracted classes to work for both log in and sign up forms · f4ccb335
  Tom Giannattasio committed Oct 03, 2012
  
  f4ccb335 Browse Files
- tweaked signup template · d44d9ff2
  Tom Giannattasio committed Oct 03, 2012
  
  d44d9ff2 Browse Files
- Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into… · 1240325c
```
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/subsection-edit-page

Conflicts:
	cms/static/js/base.js
```
  Chris Dodge committed Oct 03, 2012
  1240325c Browse Files
- delete unit in overview and subsection_edit pages · 5390a19f
  Chris Dodge committed Oct 03, 2012
  
  5390a19f Browse Files
- Merge pull request #817 from MITx/feature/tomg/cms-library · a6cf7cb0
```
Feature/tomg/cms library
```
  Calen Pennington committed Oct 03, 2012
  a6cf7cb0 Browse Files
- Wire up the unit location display · 55d6aff4
  Calen Pennington committed Oct 03, 2012
  
  55d6aff4 Browse Files
- Merge pull request #813 from MITx/feature/cdodge/asset-id-change · 35d1966d
```
add a 'safety switch' where we add new content into GridFS with a filena...
```
  Calen Pennington committed Oct 03, 2012
  35d1966d Browse Files
- Merge pull request #815 from MITx/feature/cale/cas-component-delete · baaafb9d
```
Feature/cale/cas component delete
```
  chrisndodge committed Oct 03, 2012
  baaafb9d Browse Files
- Hook up the component delete button to the backend. Don't break if the process… · d80c9317
```
Hook up the component delete button to the backend. Don't break if the process of updating a parent unit after deleting is interrupted (leaving a pointer to a missing module)
```
  Calen Pennington committed Oct 03, 2012
  d80c9317 Browse Files
- Don't send back a preview when saving an item · 79a7cc9f
  Calen Pennington committed Oct 03, 2012
  
  79a7cc9f Browse Files