Commits · 0840467201e857bb3624a0ca3911e4fec3d5dba8 · edx / edx-platform

09 Mar, 2015 2 commits
- Making edX changes to pdf viewer/analytics html · 08404672
  Giulio Gratta committed Mar 09, 2015
  
  08404672 Browse Files
- Upgrade PDF.js library from v0.8.1243 -> v1.0.907 · 4726da6c
  Giulio Gratta committed Mar 09, 2015
  
  4726da6c Browse Files
06 Mar, 2015 29 commits
- Merge pull request #7223 from edx/cgoldberg/video-cdn-experiment · c7ebda8f
```
china video cdn experiment
```
  Ali Mohammad committed Mar 06, 2015
  c7ebda8f Browse Files
- Added listener and beacon for video cdn eval. · 1fc9c837
  Corey Goldberg committed Mar 06, 2015
  
  1fc9c837 Browse Files
- Merge pull request #7195 from edx/will/certs-instructor-dash · 3604e2dd
```
ECOM-1140: Instructor dashboard example certificates
```
  Will Daly committed Mar 06, 2015
  3604e2dd Browse Files
- Merge pull request #7255 from edx/sarina/studio-default-logo · 9e8a0b86
```
Match Studio logo logic to LMS
```
  Sarina Canelake committed Mar 06, 2015
  9e8a0b86 Browse Files
- Merge pull request #7249 from edx/chrisitna/flaky-test · 3aaf52d2
```
Add flaky decorator.
```
  Christina Roberts committed Mar 06, 2015
  3aaf52d2 Browse Files
- ECOM-1140: Instructor dashboard example certificates · 940f8922
```
Allow global staff to generate example certificates
on the instructor dashboard.

Allow global staff to enable/disable self-generated
certificates for a course.
```
  Will Daly committed Mar 06, 2015
  940f8922 Browse Files
- Merge pull request #7253 from edx/ned/md-to-rst · 1e52687f
```
Change .md file to .rst.
```
  Ned Batchelder committed Mar 06, 2015
  1e52687f Browse Files
- Leave a redirection testing.md file behind · 697b487e
  Ned Batchelder committed Mar 06, 2015
  
  697b487e Browse Files
- Change .md file to .rst. · 4f6881c8
  Ned Batchelder committed Mar 06, 2015
  
  4f6881c8 Browse Files
- Abstract out platform name in default Wiki string · 1dc75ffd
  Sarina Canelake committed Mar 06, 2015
  
  1dc75ffd Browse Files
- Remove unused common image · e1dc0f5c
  Sarina Canelake committed Mar 06, 2015
  
  e1dc0f5c Browse Files
- Add default logo to Studio · 4133740a
  Sarina Canelake committed Mar 06, 2015
  
  4133740a Browse Files
- Add flaky decorator. · 3e7488f5
```
Related to TNL-1642.
```
  cahrens committed Mar 06, 2015
  3e7488f5 Browse Files
- Add flaky decorator. · 758d2f4e
```
Related to TNL-1619.
```
  cahrens committed Mar 06, 2015
  758d2f4e Browse Files
- Merge pull request #7252 from edx/dan-f/fix-failing-forums-test-after-revert · 1cc7178b
```
Fix failing forums unit test.
```
  Daniel Friedman committed Mar 06, 2015
  1cc7178b Browse Files
- Merge pull request #7254 from edx/ned/finish-pr-7232 · 4f5b319f
```
Ned/finish pr 7232
```
  Ned Batchelder committed Mar 06, 2015
  4f5b319f Browse Files
- Merge pull request #7218 from edx/will/student-cert-xqueue-error · 749269a3
```
Certificate status when XQueue is unavailable.
```
  Will Daly committed Mar 06, 2015
  749269a3 Browse Files
- Fix another contributor agreement link. · b3dbc7ba
  Ned Batchelder committed Mar 06, 2015
  
  b3dbc7ba Browse Files
- Fix failing forums unit test. · a79bf683
  Daniel Friedman committed Mar 06, 2015
  
  a79bf683 Browse Files
- Merge pull request #7246 from cguardia/patch-1 · 0e171be2
```
Add empty introspection rule for BlockTypeKeyField.
```
  Ned Batchelder committed Mar 06, 2015
  0e171be2 Browse Files
- Merge pull request #7196 from edx/ned/tweaked-pylintrc · f8c9fdf6
```
Use 'edx_lint write' to create our pylintrc from pylintrc_tweaks
```
  Ned Batchelder committed Mar 06, 2015
  f8c9fdf6 Browse Files
- Merge branch 'release' · dca05a60
  David Baumgold committed Mar 06, 2015
  
  dca05a60 Browse Files
- Merge pull request #7244 from edx/jsa/hotfix-forums · 84938839
```
Revert "Merge pull request #6771 from edx/dan-f/forums-filter-discussion...
```
  David Baumgold committed Mar 06, 2015
  84938839 Browse Files
- Merge pull request #7247 from edx/awais786/ECOM-1158-upgrade-page · d1af8f35
```
Awais786/ecom 1158 upgrade page
```
  Awais Qureshi committed Mar 06, 2015
  d1af8f35 Browse Files
- ECOM-1158 fixing astrophysique in html. · c8ae32e6
  Awais committed Mar 06, 2015
  
  c8ae32e6 Browse Files
- Merge pull request #7148 from open-craft/library-selector · 7338cc12
```
Show a select box when editing a library content block (SOL-123)
```
  Xavier Antoviaque committed Mar 06, 2015
  7338cc12 Browse Files
- Merge pull request #7018 from edx/zub/bugfix/tnl-1331-unique_users_in_cohort_group · 41f08055
```
use 'commit_on_success' transaction decorator to avoid registering users...
```
  zubair-arbi committed Mar 06, 2015
  41f08055 Browse Files
- Update AUTHORS · c04e76e6
  Carlos de la Guardia committed Mar 06, 2015
  
  c04e76e6 Browse Files
- Add empty introspection rule fro BlockTypeKeyField. · baa1b05e
```
From 0.7 on, South requires explicit introspection rules. Previously, it used the parser module to introspect.
```
  Carlos de la Guardia committed Mar 05, 2015
  baa1b05e Browse Files
05 Mar, 2015 9 commits
- Revert "Merge pull request #6771 from edx/dan-f/forums-filter-discussion-modules" · 13ba2c4a
```
This reverts commit 086a2ba7, reversing
changes made to a44132ec.  Some minor
code quality issues were addressed as part of this change.

Conflicts:
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/utils.py
```
  jsa committed Mar 05, 2015
  13ba2c4a Browse Files
- Disable new user APIs in production. · 5802e17c
  cahrens committed Mar 05, 2015
  
  5802e17c Browse Files
- Merge pull request #7151 from open-craft/ekolpakov/settings-service · 4cb45571
```
SettingsService for accessing django settings from XBlock
```
  John Eskew committed Mar 05, 2015
  4cb45571 Browse Files
- Merge pull request #7086 from edx/ahsan/tnl-1520-studio-nav-label-accessibility-issue · c430eaed
```
Studio header nav label accessibility issue
```
  ahsan-ul-haq committed Mar 06, 2015
  c430eaed Browse Files
- Certificate status when XQueue is unavailable. · ebb2d031
```
If certificates cannot be added to the queue,
mark the certificate status as 'error' so that
it can be re-run by management commands.

Clean up logging and return values.
```
  Will Daly committed Mar 05, 2015
  ebb2d031 Browse Files
- Merge pull request #7239 from edx/hotfix/ecom-1169 · 1a6b474d
```
Fix callback URL for certificate generation tasks
```
  Will Daly committed Mar 05, 2015
  1a6b474d Browse Files
- Fix callback URL for certificate generation tasks · d1b9bbf2
  Will Daly committed Mar 05, 2015
  
  d1b9bbf2 Browse Files
- Merge pull request #7229 from edx/hotfix/2015-03-05 · 6fd4d2fd
```
Fix 500 errors on video upload page
```
  David Baumgold committed Mar 05, 2015
  6fd4d2fd Browse Files
- Merge branch 'release' · a37a50cf
  David Baumgold committed Mar 05, 2015
  
  a37a50cf Browse Files