Commits · 697b487e818d13ab184440ae5ef52e7e5be5b729 · edx / edx-platform · GitLab

06 Mar, 2015 8 commits
- 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
- 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
05 Mar, 2015 19 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
- 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
- Merge pull request #7231 from edx/mattdrayer/rename-migration-file · f85d2451
```
Renamed conflicting migration file
```
  Matt Drayer committed Mar 05, 2015
  f85d2451 Browse Files
- SettingsService for accessing server-wide settings from XBlock · c225d86e
  E. Kolpakov committed Mar 05, 2015
  
  c225d86e Browse Files
- Renamed conflicting migration file · df937f1f
  Matt Drayer committed Mar 05, 2015
  
  df937f1f Browse Files
- Revert "Renamed conflicting migration file" · be77f8bf
```
This reverts commit 04429e77.
```
  Matt Drayer committed Mar 05, 2015
  be77f8bf Browse Files
- Renamed conflicting migration file · 04429e77
  Matt Drayer committed Mar 05, 2015
  
  04429e77 Browse Files
- Merge pull request #7227 from edx/flask-test-videotimestest · 9dbadd71
```
Mark VideoTimesTest.test_video_end_time_wo_default_start_time as flaky
```
  David Baumgold committed Mar 05, 2015
  9dbadd71 Browse Files
- Merge pull request #7118 from edx/ahsan/tnl-1554-missing-accessible-label-with-lms-nav-elements · 00899dd9
```
Missing accessible label in lms <nav> elements.
```
  ahsan-ul-haq committed Mar 05, 2015
  00899dd9 Browse Files
- Merge pull request #7147 from edx/benp/static-code-analysis-radon · 1d005086
```
Benp/static code analysis radon
```
  Ben Patterson committed Mar 05, 2015
  1d005086 Browse Files
- add generic sr for <h2> · 4b92a166
  Ahsan Ulhaq committed Mar 05, 2015
  
  4b92a166 Browse Files
- use 'commit_on_success' transaction decorator to avoid registering users in… · 969bfa59
```
use 'commit_on_success' transaction decorator to avoid registering users in multiple cohort groups of a particular course
TNL-1331
```
  zubair-arbi committed Mar 05, 2015
  969bfa59 Browse Files
- Removed aria label from section tag · d116f84c
  Ahsan Ulhaq committed Mar 05, 2015
  
  d116f84c Browse Files
04 Mar, 2015 13 commits
- Fix 500 errors on video upload page · 83c47462
```
Some status strings were accidentally tuples thanks to stray commas, and
ugettext raised an exception as a result.

JIRA: MA-323
```
  Greg Price committed Mar 04, 2015
  83c47462 Browse Files
- Update some strings to reflect the new behaviour · 2e0beac3
  Braden MacDonald committed Mar 04, 2015
  
  2e0beac3 Browse Files
- Show a select box when editing a library content block · 93e5a56d
  Braden MacDonald committed Mar 04, 2015
  
  93e5a56d Browse Files
- Mark VideoTimesTest.test_video_end_time_wo_default_start_time as flaky · a8496573
  David Baumgold committed Mar 04, 2015
  
  a8496573 Browse Files
- Merge pull request #7224 from edx/i18n-mixin-strings · a70cabc1
```
i18n some strings in LmsBlockMixin
```
  David Baumgold committed Mar 04, 2015
  a70cabc1 Browse Files
- Merge pull request #7222 from edx/benp/disable-sol-449 · 38a9d33b
```
Disable test that's too flaky for our flaky policy.
```
  Ben Patterson committed Mar 04, 2015
  38a9d33b Browse Files
- i18n some strings in LmsBlockMixin · 6b90763d
  David Baumgold committed Mar 04, 2015
  
  6b90763d Browse Files
- Disable test that's too flaky for our flaky policy. · 0c0e5163
  Ben Patterson committed Mar 04, 2015
  
  0c0e5163 Browse Files
- Merge pull request #7210 from edx/will/cert-error-management-command · 616f2bb0
```
ECOM-1142: Management command for error certs.
```
  Will Daly committed Mar 04, 2015
  616f2bb0 Browse Files
- Merge pull request #6505 from mitocw/cg/add_sga · 7641fbf5
```
Add Staff Graded Assignments XBlock to edx-platform
```
  Ned Batchelder committed Mar 04, 2015
  7641fbf5 Browse Files
- Merge pull request #7101 from openfun/fun/xblock-authoring-fix-settings-import · 2a95fe62
```
Fixed an import issue with django settings - in xblock authoring module.
```
  Sarina Canelake committed Mar 04, 2015
  2a95fe62 Browse Files
- Merge pull request #7092 from edx/ahsan/tnl-1523-studio-footer-accessible-label-issue · 635194a9
```
footer <nav> accessibility issue
```
  ahsan-ul-haq committed Mar 04, 2015
  635194a9 Browse Files
- Merge pull request #7098 from edx/ahsan/tnl-1531-inaccessible-label-for-page-action-nav-studio · 4ee02e23
```
Inaccessible label for the page action Navigation
```
  ahsan-ul-haq committed Mar 04, 2015
  4ee02e23 Browse Files