Commits · 9f7ffcaf06787eaa0827bad7775c236cd067aeed · edx / edx-platform

26 Jul, 2013 2 commits
- Merge remote-tracking branch 'origin/giulio/peer-grading-style-release' into… · 9f7ffcaf
```
Merge remote-tracking branch 'origin/giulio/peer-grading-style-release' into edx-west/release-candidate-20130729
```
  Sef Kloninger committed Jul 25, 2013
  9f7ffcaf Browse Files
- Merge branch 'release' into edx-west/release-candidate-20130729 · a6455099
```
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
```
  Sef Kloninger committed Jul 25, 2013
  a6455099 Browse Files
25 Jul, 2013 1 commit
- openended problems now do an ajax call everytime they are loaded · 9f6910c3
  Giulio Gratta committed Jul 25, 2013
  
  9f6910c3 Browse Files
24 Jul, 2013 6 commits
- edx.org: abstracting new edx.org button extends and colors with other themes in mind · d2eca92f
  Brian Talbot committed Jul 24, 2013
  
  d2eca92f Browse Files
- edx.org: revising base link color variable to use darker value for accessibility · 95478a34
  Brian Talbot committed Jul 24, 2013
  
  95478a34 Browse Files
- edx.org: revises iframe-based register/status buttons to match revised styles · 3094471e
  Brian Talbot committed Jul 24, 2013
  
  3094471e Browse Files
- edx.org: handles letter-spacing on buttons · cc95d004
  Brian Talbot committed Jul 24, 2013
  
  cc95d004 Browse Files
- edx.org: applies edx.org visual changes (with overrides/new mixins) · 5f15e422
  Brian Talbot committed Jul 24, 2013
  
  5f15e422 Browse Files
- edx.org: adds in variables/mixins to support edx.org visual changes · b5fda6d2
  Brian Talbot committed Jul 24, 2013
  
  b5fda6d2 Browse Files
23 Jul, 2013 5 commits
- Merge pull request #482 from edx/hotfix-2013-07-23 · 09dc4683
```
Hotfix 2013 07 23
```
  Diana Huang committed Jul 23, 2013
  09dc4683 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
- remove JSON text from user visible instructor feedback and sanitize inputs to strings · f02505d5
  Giulio Gratta committed Jul 23, 2013
  
  f02505d5 Browse Files
- replace instructor feedback JSON blob with the content · de17289f
  Giulio Gratta committed Jul 23, 2013
  
  de17289f Browse Files
22 Jul, 2013 7 commits
- change save message from 'Check' to 'Submit' · 09741013
  Giulio Gratta committed Jul 22, 2013
  
  09741013 Browse Files
- remove JSON text from user visible instructor feedback and sanitize inputs to strings · 03222844
  Giulio Gratta committed Jul 22, 2013
  
  03222844 Browse Files
- replace instructor feedback JSON blob with the content · 00ad88cb
  Giulio Gratta committed Jul 22, 2013
  
  00ad88cb Browse Files
- added simple confirm dialog for unflagging · 7dcf36c2
  Giulio Gratta committed Jul 22, 2013
  
  7dcf36c2 Browse Files
- first round of unflag confirmation behavior · 93e3ce55
  Giulio Gratta committed Jul 22, 2013
  
  93e3ce55 Browse Files
- re-added textarea content with conditional for review visibility · c5dc6aab
  Giulio Gratta committed Jul 22, 2013
  
  c5dc6aab Browse Files
- moving initial openeded content to placeholder instead of value · 62aeac56
  Giulio Gratta committed Jul 22, 2013
  
  62aeac56 Browse Files
19 Jul, 2013 1 commit
- Allow session backend to be configurable and also add PLATFORM_NAME · 5d096580
```
to cms settings (it was throwing 500s for Stanford when the CMS
calls render_from_lms)
```
  Jason Bau committed Jul 19, 2013
  5d096580 Browse Files
18 Jul, 2013 1 commit

Merge commit '' into edx-west/release · 9ae71a31

Conflicts:
	cms/djangoapps/contentstore/utils.py
	cms/templates/login.html
	cms/templates/widgets/header.html
	cms/templates/widgets/sock.html
	lms/envs/test.py

committed Jul 18, 2013

9ae71a31 Browse Files

17 Jul, 2013 2 commits
- Merge pull request #420 from edx/fix/cdodge/hotfix-export-crash · ab482277
```
[HOTFIX] add a default XML serialization if the 'data' field is empty or None. So...
```
  Calen Pennington committed Jul 17, 2013
  ab482277 Browse Files
- add a default XML serialization if the 'data' field is empty or None. Some… · 8325e28a
```
add a default XML serialization if the 'data' field is empty or None. Some XModules now - like video XModule - do not have XML set in the 'data' field
```
  Chris Dodge committed Jul 17, 2013
  8325e28a Browse Files
15 Jul, 2013 3 commits
- Merge remote-tracking branch 'origin/release' into rc/2013-07-16 · e9d400cb
  Calen Pennington committed Jul 15, 2013
  
  e9d400cb Browse Files
- Merge pull request #402 from edx/peter-fogg/fix-section-release-tests · f9f0d9cc
```
Fix section release acceptance test failure.
```
  Peter Fogg committed Jul 15, 2013
  f9f0d9cc Browse Files
- Fix section release acceptance test failure. · 60d15149
  Peter Fogg committed Jul 15, 2013
  
  60d15149 Browse Files
13 Jul, 2013 5 commits
- Merge pull request #380 from edx/db/studio-i18n · 7f5aedb2
```
Studio internationalization
```
  David Baumgold committed Jul 13, 2013
  7f5aedb2 Browse Files
- copy over password_reset_confirm.html back from master · 132eb249
```
because we've moved our password_reset_confirm.html into the theme repo.
This reduces edx-west diff with master.
```
  Jason Bau committed Jul 12, 2013
  132eb249 Browse Files
- put block around main_vendor js in main_django.html · b2368b3e
```
should be a no-op for edx-east, but allow edx-west to remove
vendor.js with a blank {% block %}
in our password_reset_confirm.html to fix a bug
```
  Jason Bau committed Jul 12, 2013
  b2368b3e Browse Files
- Merge pull request #388 from edx/fix/cdodge/dont-display-github-links-in-mongo-lms · dcc63be4
```
[STUD-431] Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRAT...
```
  chrisndodge committed Jul 12, 2013
  dcc63be4 Browse Files
- add comment as to why we are turning off this feature flag · db7434fa
  Chris Dodge committed Jul 12, 2013
  
  db7434fa Browse Files
12 Jul, 2013 7 commits
- Merge pull request #381 from edx/feature/ichuang/export_all_courses · 547f2300
```
Add management command to Studio for exporting all courses; useful for periodic backups of course content in Studio
```
  ichuang committed Jul 12, 2013
  547f2300 Browse Files
- fix pep-8 in export_all_courses · 8b6a55e2
  ichuang committed Jul 12, 2013
  
  8b6a55e2 Browse Files
- Merge remote-tracking branch 'origin/giulio/peer-grading-style-release' into… · 0987e450
```
Merge remote-tracking branch 'origin/giulio/peer-grading-style-release' into edx-west/release-candidate-20130711
```
  Jason Bau committed Jul 12, 2013
  0987e450 Browse Files
- rehiding legend · f837cfbf
  Giulio Gratta committed Jul 12, 2013
  
  f837cfbf Browse Files
- use unicode instead of str for casting track.views args in idashboard · 5991d478
  ichuang committed Jul 12, 2013
  
  5991d478 Browse Files
- tracking in idashboard should only log json-serializable objects · 3ec74551
  ichuang committed Jul 12, 2013
  
  3ec74551 Browse Files
- Merge pull request #395 from edx/giulio/peer-grading-style-release · 4d5da549
```
Giulio/peer grading style release
```
  Jason Bau committed Jul 12, 2013
  4d5da549 Browse Files