Commits · 69c792f5e95c92ef736ce6b5109885f2314cde0c · edx / edx-platform

29 Jul, 2013 2 commits
- edx.org: applies edx.org visual changes (with overrides/new mixins) · 69c792f5
  Brian Talbot committed Jul 29, 2013
  
  69c792f5 Browse Files
- edx.org: adds in variables/mixins to support edx.org visual changes · 71c3f5e5
  Brian Talbot committed Jul 29, 2013
  
  71c3f5e5 Browse Files
26 Jul, 2013 1 commit
- Merge pull request #341 from edx/talbs/studio-authorship · 166aea62
```
Studio: Authorship Rights Request UI + Dashboard Clean-up
```
  Christina Roberts committed Jul 26, 2013
  166aea62 Browse Files
25 Jul, 2013 15 commits
- Studio: using defined red color variables for error-based system messages · 8a715c1a
  Brian Talbot committed Jul 25, 2013
  
  8a715c1a Browse Files
- Merge pull request #502 from edx/sarina/fix-discussion-acceptance · b143de1f
```
Fix failing acceptance test
```
  Sarina Canelake committed Jul 25, 2013
  b143de1f Browse Files
- Fix failing acceptance test · 50d35b30
  Sarina Canelake committed Jul 25, 2013
  
  50d35b30 Browse Files
- Merge pull request #491 from edx/lettuce-improvements · a90d7b5d
```
Misc improvements to make lettuce testing a bit saner
```
  David Baumgold committed Jul 25, 2013
  a90d7b5d Browse Files
- Misc improvements to make lettuce testing a bit saner · df125290
  David Baumgold committed Jul 25, 2013
  
  df125290 Browse Files
- Merge pull request #498 from edx/cale/make-the-service-variant-flag-on-manage.py-longform-only · c6b51782
```
Make the service-variant flag on manage.py longform only
```
  Calen Pennington committed Jul 25, 2013
  c6b51782 Browse Files
- i18n "Create a New Course". · 628994da
  cahrens committed Jul 25, 2013
  
  628994da Browse Files
- Use format for strings instead of %. · 60d60de2
  cahrens committed Jul 25, 2013
  
  60d60de2 Browse Files
- Merge pull request #417 from edx/ihoover/feature_flag_auto_auth · aad6dc43
```
Ihoover/feature flag auto auth
```
  ihoover committed Jul 25, 2013
  aad6dc43 Browse Files
- Merge pull request #471 from edx/giulio/fix-tooltips · c80a05f4
```
override .sr class from keeping tooltips hidden in sequence nav
```
  Sarina Canelake committed Jul 25, 2013
  c80a05f4 Browse Files
- Merge pull request #494 from edx/renzo/blank-problem-score · 30baebd7
```
Blank common and advanced problems now display an inline score of "0 points" upon creation
```
  Renzo Lucioni committed Jul 25, 2013
  30baebd7 Browse Files
- Change default names for various LMS components · 2efcb0cd
```
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"

These default names show up in tooltips.
```
  Adam Palay committed Jul 25, 2013
  2efcb0cd Browse Files
- Make the service-variant flag on manage.py longform only · 1bcafd32
  Calen Pennington committed Jul 25, 2013
  
  1bcafd32 Browse Files
- Adjustment to show sequence tool tips in LMS · 214a814b
  Giulio Gratta committed Jul 25, 2013
  
  214a814b Browse Files
- Merge pull request #460 from edx/sarina/update-diffcover · 6923687c
```
Update diff-cover to latest version
```
  Sarina Canelake committed Jul 24, 2013
  6923687c Browse Files
24 Jul, 2013 11 commits
- csrf test fix · 56883d65
```
remove test that csrf middleware is disabled (since we can't seem to reload middleware between tests)

move definitions from setuo into test method
```
  ihoover committed Jul 24, 2013
  56883d65 Browse Files
- Blank common and advanced problems now display an inline score of '0 points' upon creation. · 1a0055ae
  Renzo Lucioni committed Jul 24, 2013
  
  1a0055ae Browse Files
- Merge pull request #490 from edx/cale/make-cms.dev-environment-work-with-manage.py · a569a5f6
```
Make cms.dev environment work with manage.py
```
  Calen Pennington committed Jul 24, 2013
  a569a5f6 Browse Files
- Merge pull request #489 from edx/dhm/export_policy · e223d753
```
change of defaults for rerandomize/showanswer
```
  Don Mitchell committed Jul 24, 2013
  e223d753 Browse Files
- Merge pull request #477 from edx/cale/xmodule-student-vieww · dd338c17
```
Add an XBlock student_view to XModule
```
  Calen Pennington committed Jul 24, 2013
  dd338c17 Browse Files
- Make cms.dev environment work with manage.py · 3e9bbe25
  Calen Pennington committed Jul 24, 2013
  
  3e9bbe25 Browse Files
- Remove presumption of user's intent for imported xml attrs · 400ff494
```
Moved to xlint rather than setting to old default.
```
  Don Mitchell committed Jul 24, 2013
  400ff494 Browse Files
- Add xlint check for any policy fields whose default changed. · 2d085c42
```
Warn user that the course behavior may change.
```
  Don Mitchell committed Jul 24, 2013
  2d085c42 Browse Files
- Add an XBlock student_view to XModule · 3774ea15
```
This just wraps XModule.get_html, and ignores javascript and css for
now.

[LMS-189]
```
  Calen Pennington committed Jul 24, 2013
  3774ea15 Browse Files
- Merge pull request #451 from… · 8e125906
```
Merge pull request #451 from edx/cale/add-a-manage.py-command-that-understands-the-extra-edx-options

Add a manage.py command that understands the extra edX options
```
  Calen Pennington committed Jul 24, 2013
  8e125906 Browse Files
- Add a manage.py command that understands the extra edX options · 76055aa2
  Calen Pennington committed Jul 24, 2013
  
  76055aa2 Browse Files
23 Jul, 2013 11 commits
- Merge pull request #467 from edx/fix/adam/file-upload · 420b0920
```
Fix/adam/file upload
```
  Adam committed Jul 23, 2013
  420b0920 Browse Files
- Merge branch 'release' · 86ee2bca
```
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
```
  Diana Huang committed Jul 23, 2013
  86ee2bca Browse Files
- Merge pull request #482 from edx/hotfix-2013-07-23 · 09dc4683
```
Hotfix 2013 07 23
```
  Diana Huang committed Jul 23, 2013
  09dc4683 Browse Files
- Merge pull request #481 from edx/fix/cdodge/regression-on-tabs-initialization · 077f0a2a
```
It seems like self.tabs is getting set to an empty set [] now rather tha...
```
  chrisndodge committed Jul 23, 2013
  077f0a2a Browse Files
- added csrf tests · 402ae4d8
  ihoover committed Jul 23, 2013
  
  402ae4d8 Browse Files
- Studio: revises spacing fix for welcome to edX studio title · 31e1b0e5
```
Conflicts:
	cms/templates/howitworks.html
```
  Brian Talbot committed Jul 23, 2013
  31e1b0e5 Browse Files
- Prevent XSS attack via submission_history page. · 2926c943
```
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
```
  Diana Huang committed Jul 23, 2013
  2926c943 Browse Files
- resolve conflicts · 4148c00c
  ihoover committed Jul 23, 2013
  
  4148c00c Browse Files
- working under cms too · c6c3e4b9
  ihoover committed Jul 23, 2013
  
  c6c3e4b9 Browse Files
- Fix up auto auth tests. · ea31b17d
  Jay Zoldak committed Jul 23, 2013
  
  ea31b17d Browse Files
- add new test to assert that course creation will populate default tabs as… · 0b6932f4
```
add new test to assert that course creation will populate default tabs as expected. Also update factory to not override defaults on tabs array. Also simplfy self.tab test condition.
```
  Chris Dodge committed Jul 23, 2013
  0b6932f4 Browse Files