Commits · 849388398cd7168ce65d4ace842b4d10f96c1ecc · edx / edx-platform · GitLab

06 Mar, 2015 1 commit
- 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
05 Mar, 2015 5 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 #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
04 Mar, 2015 2 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
- Merge pull request #7215 from edx/christina/full_name_bug · 0eed96c2
```
Correctly point to MAX_LENGTH instead of MIN_LENGTH.
```
  Christina Roberts committed Mar 04, 2015
  0eed96c2 Browse Files
03 Mar, 2015 20 commits
- Merge pull request #7213 from edx/andya/rc-profile-visibility-fix · 1baaf724
```
Default profile visibility to off for now
```
  Andy Armstrong committed Mar 03, 2015
  1baaf724 Browse Files
- Default profile visibility to off for now · 6f118a3d
  Andy Armstrong committed Mar 03, 2015
  
  6f118a3d Browse Files
- Add bok choy coverage for correctly displayed name and email address. · 167bd05a
  cahrens committed Mar 03, 2015
  
  167bd05a Browse Files
- Merge pull request #7214 from edx/clintonb/celery-task-name · 67418be9
```
Explicitly naming task
```
  David Baumgold committed Mar 03, 2015
  67418be9 Browse Files
- Correctly point to MAX_LENGTH instead of MIN_LENGTH. · 84d91a79
```
Bug introduced in recent commit.
```
  cahrens committed Mar 03, 2015
  84d91a79 Browse Files
- Explicitly naming task · ebc9c75e
```
This should prevent errors due to relative imports. See http://docs.celeryproject.org/en/latest/userguide/tasks.html#automatic-naming-and-relative-imports for additional information.
```
  Clinton Blackburn committed Mar 03, 2015
  ebc9c75e Browse Files
- Merge pull request #7206 from edx/merge-release-to-master · ff72eada
```
Merge release to master
```
  Adam committed Mar 03, 2015
  ff72eada Browse Files
- Merge pull request #7207 from delftswa2014/doc_links · ba36a26d
```
added links to docs for listed libraries in overview.md
```
  Sarina Canelake committed Mar 03, 2015
  ba36a26d Browse Files
- Merge pull request #7200 from edx/benp/flaky-SettingsMilestoneTest-bokchoy · 375a996d
```
Flag test as flaky. SOL-449.
```
  Ben Patterson committed Mar 03, 2015
  375a996d Browse Files
- Merge pull request #7197 from edx/bnotions/social-features · 818d59e8
```
Bnotions/social features
```
  Nimisha Asthagiri committed Mar 03, 2015
  818d59e8 Browse Files
- Merge remote-tracking branch 'origin/release' into merge-release-to-master · b35e4337
```
Conflicts:
	requirements/edx/github.txt
```
  Adam Palay committed Mar 03, 2015
  b35e4337 Browse Files
- Merge pull request #7201 from edx/hotfix/2015-03-03 · e9fed173
```
update ora2 hash to address (TNL-1350)
```
  Adam committed Mar 03, 2015
  e9fed173 Browse Files
- added links to docs pages in overview readme · 70db28bb
  Mayank Jain committed Mar 03, 2015
  
  70db28bb Browse Files
- update ora2 hash to address (TNL-1350) · a6a47c35
  Adam Palay committed Mar 03, 2015
  
  a6a47c35 Browse Files
- Merge pull request #7193 from edx/diana/enrollment-api-permissions · 95387be9
```
Allow the enrollment API to be accessed via API keys.
```
  Diana Huang committed Mar 03, 2015
  95387be9 Browse Files
- Merge pull request #7198 from edx/release · 006b06dd
```
Merge Release back to Master
```
  chrisndodge committed Mar 03, 2015
  006b06dd Browse Files
- Merge pull request #7103 from edx/benp/refactor-events-tests · 26d1669f
```
Event-testing pattern should be made available in a Mixin.
```
  Ben Patterson committed Mar 03, 2015
  26d1669f Browse Files
- Flag test as flaky. SOL-449. · bda0c062
  Ben Patterson committed Mar 03, 2015
  
  bda0c062 Browse Files
- Event-testing pattern should be supported by a mixin. · 3539bac1
  Ben Patterson committed Mar 03, 2015
  
  3539bac1 Browse Files
- bnotions contributions to mobile api · c375f666
  Lee Newton committed Mar 02, 2015
  
  c375f666 Browse Files
02 Mar, 2015 12 commits
- Merge pull request #7087 from edx/rc/2015-02-26 · c8ad5197
```
Rc/2015 02 26
```
  chrisndodge committed Mar 02, 2015
  c8ad5197 Browse Files
- Merge pull request #7194 from edx/adam/add-purchasing-logging · ee0ae6ee
```
add extra logging for postpay callbacks from cybersource (ECOM-1034) (EC...
```
  Adam committed Mar 02, 2015
  ee0ae6ee Browse Files
- Merge pull request #7137 from edx/andya/profile-api · 06172e74
```
Implement profile API
```
  Andy Armstrong committed Mar 02, 2015
  06172e74 Browse Files
- Implement profile API · dfe0057b
```
TNL-1491

See the API design here:

https://openedx.atlassian.net/wiki/display/TNL/User+API
```
  Andy Armstrong committed Mar 02, 2015
  dfe0057b Browse Files
- Allow the enrollment API to be accessed via API keys. · 1e4f1b58
```
XCOM-107
```
  Diana Huang committed Mar 02, 2015
  1e4f1b58 Browse Files
- add extra logging for postpay callbacks from cybersource (ECOM-1034) (ECOM-1089) · 34e8ee6b
  Adam Palay committed Mar 02, 2015
  
  34e8ee6b Browse Files
- Merge pull request #7163 from edx/will/example-certificates · 984f8732
```
ECOM-1139: Example certificates.
```
  Will Daly committed Mar 02, 2015
  984f8732 Browse Files
- Merge pull request #7191 from edx/hotfix/ecom-1151 · 4bf608c3
```
Show the payment section if no contribution amount is selected
```
  Will Daly committed Mar 02, 2015
  4bf608c3 Browse Files
- ECOM-1139: Example certificates. · 9530021b
```
Add the ability to generate "example" certificates to
test that certificate generation is working correctly for a course.

Add the ability to enable/disable self-generated certificates
on a per-course basis.
```
  Will Daly committed Mar 02, 2015
  9530021b Browse Files
- Merge pull request #7192 from edx/sarina/20150302-translations-update · d147a655
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Mar 02, 2015
  d147a655 Browse Files
- Update translations (autogenerated message) · 6ccc553f
  Sarina Canelake committed Mar 02, 2015
  
  6ccc553f Browse Files
- Merge pull request #7178 from edx/benp/make-pep8-output-easier · 28a3e9f5
```
Make pep8 failure output easier to understand.
```
  Ben Patterson committed Mar 02, 2015
  28a3e9f5 Browse Files