Commits · a91f1278cb1154be8f1c8d4d2155b26361e5624b · edx / edx-platform · GitLab

25 Mar, 2013 9 commits
- Merge pull request #1733 from MITx/bug/christina/studio · a91f1278
```
Don't assume input fields will be within a div.
```
  Don Mitchell committed Mar 25, 2013
  a91f1278 Browse Files
- Don't assume input fields will be within a div. · c39ff353
```
https://edx.lighthouseapp.com/projects/102637/tickets/232
```
  cahrens committed Mar 25, 2013
  c39ff353 Browse Files
- Merge pull request #1732 from MITx/bug/christina/studio · d7057ef5
```
Upadate link to static documentation.
```
  Mark L. Chang committed Mar 25, 2013
  d7057ef5 Browse Files
- Merge pull request #1713 from MITx/jmclaus/edit-molecule-css-fix · 235cce13
```
CSS from JSME doesn't affect surrounding content now
```
  Victor Shnayder committed Mar 25, 2013
  235cce13 Browse Files
- Upadate link to static documentation. · ecf395d6
  cahrens committed Mar 25, 2013
  
  ecf395d6 Browse Files
- Merge pull request #1729 from MITx/bug/dhm/date-parse · 71712ef0
```
Bug/dhm/date parse
```
  chrisndodge committed Mar 25, 2013
  71712ef0 Browse Files
- Add some comments · 264ca656
  Don Mitchell committed Mar 25, 2013
  
  264ca656 Browse Files
- Merge pull request #1728 from MITx/bug/christina/cursor-move · a26a7c86
```
Don't save subsection and unit names until the change event.
```
  Brian Talbot committed Mar 25, 2013
  a26a7c86 Browse Files
- Merge pull request #1730 from MITx/feature/zoldak/pylint-docstring · a2518ff6
```
Pylint to not require docstring for tests
```
  Christina Roberts committed Mar 25, 2013
  a2518ff6 Browse Files
22 Mar, 2013 30 commits
- Pylint to not require docstring for tests · 2c4506b7
  Jay Zoldak committed Mar 22, 2013
  
  2c4506b7 Browse Files
- Merge branch 'bug/dhm/date-parse' of github.com:MITx/mitx into bug/dhm/date-parse · 884019b1
```
Conflicts:
	cms/djangoapps/models/settings/course_metadata.py
	cms/urls.py
```
  Don Mitchell committed Mar 22, 2013
  884019b1 Browse Files
- Merge pull request #1726 from MITx/fix/cdodge/grading-perf-regression · b9dca061
```
if we have to reload a module and already have the descriptor, we don't ...
```
  Calen Pennington committed Mar 22, 2013
  b9dca061 Browse Files
- More unit tests which found another timezone assumption :-) · 056b7d34
  Don Mitchell committed Mar 22, 2013
  
  056b7d34 Browse Files
- Merge pull request #1686 from MITx/feature/vaxxxa/docs-poll-conditional-xml · 5863ba5a
```
Feature/vaxxxa/docs poll conditional xml
```
  David Ormsbee committed Mar 22, 2013
  5863ba5a Browse Files
- pep8: line length · 862a7d13
  Don Mitchell committed Mar 22, 2013
  
  862a7d13 Browse Files
- Make to and from json for dates use iso format esp for timezone. · 8370124e
  Don Mitchell committed Mar 22, 2013
  
  8370124e Browse Files
- Remove console.log. · dfdc2cb7
  cahrens committed Mar 22, 2013
  
  dfdc2cb7 Browse Files
- Merge branch 'master' into bug/christina/cursor-move · 39714a17
```
Conflicts:
	cms/static/js/base.js
```
  cahrens committed Mar 22, 2013
  39714a17 Browse Files
- Merge pull request #1719 from MITx/feature/btalbot/studio-checklists · 2dcfd1eb
```
Add course checklists to Studio
```
  Don Mitchell committed Mar 22, 2013
  2dcfd1eb Browse Files
- Don't save subsection and unit names until the change event. Fixes bugs #18 and #228. · eebef1e6
  cahrens committed Mar 22, 2013
  
  eebef1e6 Browse Files
- Merge pull request #1722 from MITx/bug/btalbot/studio-pagetitles · 1069c2c4
```
Synced up Studio View <titles> with UI headings
```
  Christina Roberts committed Mar 22, 2013
  1069c2c4 Browse Files
- Re-enable all the tests! · 505a3824
  cahrens committed Mar 22, 2013
  
  505a3824 Browse Files
- if we have to reload a module and already have the descriptor, we don't need to… · fd973442
```
if we have to reload a module and already have the descriptor, we don't need to refect the descriptor (which results in another DB round-trip. We just need the student state.
```
  Chris Dodge committed Mar 22, 2013
  fd973442 Browse Files
- Merge pull request #1724 from MITx/bug/btalbot/studio-viewlivebutton · 1ea3a4e7
```
studio - "view live version" of unit button label change
```
  Christina Roberts committed Mar 22, 2013
  1ea3a4e7 Browse Files
- studio - changed the label of view published/live version of unit presented to a… · b4e6b792
```
studio - changed the label of view published/live version of unit presented to a user while editing a draft of the same unit
```
  Brian Talbot committed Mar 22, 2013
  b4e6b792 Browse Files
- Merge pull request #1723 from MITx/fix/zoldak/pep8-test-responsetypes · 23f77a15
```
pep8 fixes on test_responsetypes.py
```
  Will Daly committed Mar 22, 2013
  23f77a15 Browse Files
- pep8 fixes · 08c5ab3c
  Jay Zoldak committed Mar 22, 2013
  
  08c5ab3c Browse Files
- demo change to resolve push error · 420c8216
  Brian Talbot committed Mar 22, 2013
  
  420c8216 Browse Files
- demo change to resolve push error · 22fd8432
  Brian Talbot committed Mar 22, 2013
  
  22fd8432 Browse Files
- studio - syncing up page <title> values with UI titles/headings · f11e54dd
  Brian Talbot committed Mar 22, 2013
  
  f11e54dd Browse Files
- Merge pull request #1720 from MITx/ux/marco/textbook · 45029e70
```
Ux/marco/textbook
```
  brianhw committed Mar 22, 2013
  45029e70 Browse Files
- styled textbook css to look closer to the discussion forum navigation · f8eacff6
  marco committed Mar 22, 2013
  
  f8eacff6 Browse Files
- Merge pull request #1716 from MITx/bug/orphan · 14e0387b
```
Bug/orphan
```
  Christina Roberts committed Mar 22, 2013
  14e0387b Browse Files
- Merge branch 'master' into ux/marco/textbook · 9fdac385
  marco committed Mar 22, 2013
  
  9fdac385 Browse Files
- Re-enable all the tests! · d631509a
  cahrens committed Mar 22, 2013
  
  d631509a Browse Files
- Fix caching bug on back button. · a2a1478d
  cahrens committed Mar 22, 2013
  
  a2a1478d Browse Files
- Reduce pep8 warnings, move Checklistst to top of menu. · be4045cb
  cahrens committed Mar 21, 2013
  
  be4045cb Browse Files
- Clean up comments. · 8385db85
  cahrens committed Mar 21, 2013
  
  8385db85 Browse Files
- Add Python unit tests, don't convert URLs every time. · 016fe196
  cahrens committed Mar 21, 2013
  
  016fe196 Browse Files
21 Mar, 2013 1 commit
- Merge pull request #1718 from MITx/victor/fewer-phds-more-associates · 4d266fa3
```
In sign up form, merge PhD-science and PhD-other, add Associate's degree
```
  Carlos Andrés Rocha committed Mar 21, 2013
  4d266fa3 Browse Files