Commits · c776272a8f93ba79aaf9db1cf6e1b134e9968c1c · edx / edx-platform · GitLab

01 May, 2015 1 commit
- Merge pull request #7654 from edx/mjames/SOL-280 · c776272a
```
Index course information alongside courseware
```
  Martyn James committed Apr 30, 2015
  c776272a Browse Files
30 Apr, 2015 18 commits
- Merge pull request #7767 from edx/gprice/discussion-api-topics · c006befd
```
Add discussion topic API
```
  Greg Price committed Apr 30, 2015
  c006befd Browse Files
- Merge pull request #7835 from edx/release · af3519ce
```
Release (DO NOT MERGE)
```
  Adam committed Apr 30, 2015
  af3519ce Browse Files
- Index course information alongside courseware · b9f1c5db
```
Conflicts:
	cms/djangoapps/contentstore/tests/test_courseware_index.py
```
  Martyn James committed Apr 30, 2015
  b9f1c5db Browse Files
- Add discussion topic API · ebff94af
```
This is the first stage of the new Discussion API.

JIRA: MA-604
```
  Greg Price committed Apr 30, 2015
  ebff94af Browse Files
- Merge pull request #7875 from edx/sarina/20150430-translations-update · 22d818e0
```
Update translations (autogenerated message)
```
  Sarina Canelake committed Apr 30, 2015
  22d818e0 Browse Files
- Update translations (autogenerated message) · 78684903
  Sarina Canelake committed Apr 30, 2015
  
  78684903 Browse Files
- Merge pull request #7844 from edx/ahsan/AC-97-aria-describedby-broken-id-ref-sign-in-page · 1e5cbbef
```
aria-describedby has broken IDref on Sign in email form
```
  Ahsan Ulhaq committed Apr 30, 2015
  1e5cbbef Browse Files
- Merge pull request #7358 from edx/ned/add_dunder_init_files · 6fd60f21
```
Add missing __init__.py files
```
  Ned Batchelder committed Apr 30, 2015
  6fd60f21 Browse Files
- Merge pull request #7865 from edx/clytwynec/update-flaky-version · 7982ad4e
```
update version of flaky to 2.0.3
```
  Christine Lytwynec committed Apr 30, 2015
  7982ad4e Browse Files
- Have to increase the pylint limit now that we examine more files · 3417672d
  Ned Batchelder committed Apr 30, 2015
  
  3417672d Browse Files
- Merge pull request #7811 from edx/awais786/ECOM-1284-re-generate-certs · e4657337
```
ECOM-1284  enabling re-generate certs.
```
  Awais Qureshi committed Apr 30, 2015
  e4657337 Browse Files
- Merge pull request #7792 from edx/commit-hash-for-django-settings-context-processor · 372e52bf
```
Set explicit git commit hash for django-settings-context-processor
```
  David Baumgold committed Apr 30, 2015
  372e52bf Browse Files
- change three line structure to one line · 6d451ccd
  Ahsan Ulhaq committed Apr 30, 2015
  
  6d451ccd Browse Files
- change indentaion and add new line · 3ec676e6
  Ahsan Ulhaq committed Apr 30, 2015
  
  3ec676e6 Browse Files
- aria-describedby has broken IDref on Sign in email form · 734ce5e2
```
AC-97
```
  Ahsan Ulhaq committed Apr 30, 2015
  734ce5e2 Browse Files
- Add missing __init__.py files · 777be12a
  Ned Batchelder committed Apr 30, 2015
  
  777be12a Browse Files
- ECOM-1284 enabling re-generate certs. · 19ab698f
  Awais committed Apr 30, 2015
  
  19ab698f Browse Files
- Merge pull request #7813 from edx/zub/story/ecom-1477-verfication-model-add-itemid · 4d9781aa
```
add location_id field for the Reverification XBlock in VerificationStatu...
```
  zubair-arbi committed Apr 30, 2015
  4d9781aa Browse Files
29 Apr, 2015 20 commits
- update version of flaky to 2.0.3 · 66c527a7
  Christine Lytwynec committed Apr 29, 2015
  
  66c527a7 Browse Files
- Merge pull request #7853 from edx/hotfix/2015-04-29 · f740bdbe
```
do garbage collection when dumping memory
```
  Adam committed Apr 29, 2015
  f740bdbe Browse Files
- Merge pull request #6712 from edx/update-pytz · 6eaeddc3
```
Update pytz to 2015.2
```
  David Baumgold committed Apr 29, 2015
  6eaeddc3 Browse Files
- Use pytz-compatible versions of ora2 and ease · 22804e41
  David Baumgold committed Apr 29, 2015
  
  22804e41 Browse Files
- Update pytz to 2015.2 · 3684c083
```
pytz changed their versioning scheme from using letters to using
numbers. The old scheme is screwing up new versions of pip.
```
  David Baumgold committed Apr 29, 2015
  3684c083 Browse Files
- Merge pull request #7863 from edx/dan-f/fix-typo · a19872a8
```
Correct "shure" to "sure" in a comment
```
  Daniel Friedman committed Apr 29, 2015
  a19872a8 Browse Files
- Correct "shure" to "sure" in a comment · 9e90ec5c
  Daniel Friedman committed Apr 29, 2015
  
  9e90ec5c Browse Files
- Merge pull request #7861 from edx/db/fix-spelling · b8bf9b92
```
Correct spelling in a comment
```
  David Baumgold committed Apr 29, 2015
  b8bf9b92 Browse Files
- Correct spelling in a comment · 28c898c3
  David Baumgold committed Apr 29, 2015
  
  28c898c3 Browse Files
- Merge pull request #7725 from edx/adam/add-script-for-hotfix · bc499e3b
```
add script for generating commands needed for hotfix
```
  Adam committed Apr 29, 2015
  bc499e3b Browse Files
- fix typo in captions js (TNL-2076) · 41a66b52
  Adam Palay committed Apr 29, 2015
  
  41a66b52 Browse Files
- do garbage collection when dumping memory · ff82e5e4
  Adam Palay committed Apr 29, 2015
  
  ff82e5e4 Browse Files
- Merge pull request #7826 from edx/will/update-reverification-flow-copy · 50e9b435
```
Update copy on reverification flow.
```
  Will Daly committed Apr 29, 2015
  50e9b435 Browse Files
- Merge pull request #7818 from mcgachey/mcgachey-lti-render · aed9ba8a
```
[LTI Provider] Wiring up LTI views to the courseware template
```
  Sarina Canelake committed Apr 29, 2015
  aed9ba8a Browse Files
- Merge pull request #7831 from amir-qayyum-arbisoft/icon_in_set_date · cd9ce147
```
Fixed cross icon issue on set date dialog inside schedule tab
```
  Sarina Canelake committed Apr 29, 2015
  cd9ce147 Browse Files
- add location_id field for the Reverification XBlock in VerificationStatus model · da94aca5
```
ECOM-1477
```
  zubair-arbi committed Apr 29, 2015
  da94aca5 Browse Files
- fixed cross icon issue on set date dialog inside schedule tab · 3e5e6065
  amir-qayyum-arbisoft committed Apr 29, 2015
  
  3e5e6065 Browse Files
- Merge pull request #7790 from edx/ahsan/AC-34-visually-hidden-contents-accessible-via-keyboard · 5a1d180f
```
Visually hidden content accessible through keyboard
```
  Ahsan Ulhaq committed Apr 29, 2015
  5a1d180f Browse Files
- Merge pull request #7772 from edx/awais786/ECOM-1441-additional-methods · dc308d4f
```
ECOM-1441 additional methods for skip re-verification links.
```
  Aamir committed Apr 29, 2015
  dc308d4f Browse Files
- ECOM-1441 additional methods for skip re-verification links. · 860467e7
  Awais committed Apr 29, 2015
  
  860467e7 Browse Files
28 Apr, 2015 1 commit
- Merge pull request #7820 from edx/mattdrayer/SOL-475 · 7b3bcef1
```
Fix for SOL-475 (double exam grader bug)
```
  Matt Drayer committed Apr 28, 2015
  7b3bcef1 Browse Files