Commits · c9b0568acc7afa6fd84c1120aa85d735fb967c11 · edx / edx-platform · GitLab

12 Nov, 2013 1 commit
- Merge branch 'release' · c9b0568a
```
Conflicts:
	cms/djangoapps/contentstore/views/item.py
```
  Gabe Mulley committed Nov 12, 2013
  c9b0568a Browse Files
08 Nov, 2013 14 commits
- Merge pull request #1598 from edx/flowerhack/feature/command-retry-cert-submissions · 39105f76
```
Command for retrying failed photo verifications
```
  Julia Hansbrough committed Nov 08, 2013
  39105f76 Browse Files
- Revert "BLD-408: Don't allow users to enter video url's in http." · 0ad53f60
```
This reverts commit 6cb5c390.
```
  Valera Rozuvan committed Nov 08, 2013
  0ad53f60 Browse Files
- Merge pull request #1615 from rocha/fix-external_auth-djangostore · b72604d2
```
Fix error on external_auth djangostore
```
  Carlos Andrés Rocha committed Nov 08, 2013
  b72604d2 Browse Files
- Merge pull request #1603 from edx/nick/tab-edit · 58dccec5
```
Expand the edit_course_tabs help text
```
  Nick Parlante committed Nov 08, 2013
  58dccec5 Browse Files
- Merge pull request #1601 from edx/flowerhack/feature/course-modes-expire-datetime · f2949204
```
Added expiration_datetime field to CourseModes
```
  Julia Hansbrough committed Nov 08, 2013
  f2949204 Browse Files
- Merge pull request #1567 from edx/will/acceptance-test-asset-pipeline · 4e9de855
```
Acceptance tests use asset pipeline
```
  Will Daly committed Nov 08, 2013
  4e9de855 Browse Files
- Merge pull request #1531 from cpennington/lms-xblock-handlers · 037da321
```
Use XBlock handlers in the LMS ...
```
  Calen Pennington committed Nov 08, 2013
  037da321 Browse Files
- Response to CR · 3c7afb69
  Julia Hansbrough committed Nov 08, 2013
  
  3c7afb69 Browse Files
- Use XBlock handlers for handle_ajax in XModules · 864d831c
```
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
```
  Calen Pennington committed Nov 08, 2013
  864d831c Browse Files
- Fix pylint/pep8 errors · 8ddd8c14
  Calen Pennington committed Nov 08, 2013
  
  8ddd8c14 Browse Files
- Remove lms/lib from sys.path in favore of using it as the module lms.lib · da26ae25
  Calen Pennington committed Nov 08, 2013
  
  da26ae25 Browse Files
- Merge pull request #1610 from waheedahmed/wah/bugfix/lms1265-import-jquery · de8b378d
```
import jquery in reset password template
```
  Waheed Ahmed committed Nov 08, 2013
  de8b378d Browse Files
- Added expiration_datetime field to CourseModes · 05996a71
```
Added an expiration_datetime field to CourseModes, intended to eventually replace expiration_date.

Included relevant schema and data migration file.

LMS-1454
```
  Julia Hansbrough committed Nov 08, 2013
  05996a71 Browse Files
- Merge pull request #1249 from edx/fix/cdodge/progress-perf · a31ef26b
```
we are already being passed in the module descriptor so we don't need to...
```
  David Ormsbee committed Nov 08, 2013
  a31ef26b Browse Files
07 Nov, 2013 11 commits
- Fix error on external_auth djangostore · 28bc2e23
```
Don't raise an exception when an association is not found.
```
  Carlos Andrés Rocha committed Nov 07, 2013
  28bc2e23 Browse Files
- we are already being passed in the module descriptor so we don't need to re-fetch it (and children) · a93a848e
  Chris Dodge committed Nov 07, 2013
  
  a93a848e Browse Files
- Merge pull request #1600 from mulby/gabe/reapply-enrollment-event · bd5abc89
```
re-apply backed out enrollment event changes
```
  Gabe Mulley committed Nov 07, 2013
  bd5abc89 Browse Files
- Merge pull request #1613 from edx/db/remove-old-jasmine-resources · e8f067de
```
remove unused jasmine resources
```
  David Baumgold committed Nov 07, 2013
  e8f067de Browse Files
- Merge pull request #1543 from edx/usman/lms1309-a11y-wiki-changes · 391c03ea
```
a11y imporvements to wiki/history.html
```
  Usman Khalid committed Nov 07, 2013
  391c03ea Browse Files
- remove unused jasmine resources · 0b3199d8
  David Baumgold committed Nov 07, 2013
  
  0b3199d8 Browse Files
- a11y imporvements to wiki/history.html · e459e4d0
```
LMS-1309
```
  Usman Khalid committed Nov 07, 2013
  e459e4d0 Browse Files
- import jquery in reset password template · ebc9f742
```
LMS-1265
```
  Waheed Ahmed committed Nov 07, 2013
  ebc9f742 Browse Files
- Merge pull request #1608 from edx/oleg/fix-transcripts-protocol-validation · e4ff0d2f
```
Transcripts: Allow any part of protocol name to be lowercase or uppercase.
```
  polesye committed Nov 07, 2013
  e4ff0d2f Browse Files
- Allow any part of protocol name to be lowercase or uppercase (BLD-496). · b19c982f
  Oleg Marshev committed Nov 07, 2013
  
  b19c982f Browse Files
- Expand the edit_course_tabs help text · 61223571
  Nick Parlante committed Nov 06, 2013
  
  61223571 Browse Files
06 Nov, 2013 7 commits
- emit enrollment event · 3377cb66
  Gabe Mulley committed Nov 06, 2013
  
  3377cb66 Browse Files
- Revert "emit enrollment event" · 5aa19c08
```
This reverts commit 5734cae1.
```
  Gabe Mulley committed Nov 06, 2013
  5aa19c08 Browse Files
- Command for retrying failed photo verifications · 30dc3bc4
```
Includes test coverage
```
  Julia Hansbrough committed Nov 06, 2013
  30dc3bc4 Browse Files
- Merge pull request #1580 from edx/christina/item · cd868efc
```
Change delete_item to RESTful URL.
```
  Christina Roberts committed Nov 06, 2013
  cd868efc Browse Files
- Change delete_item to RESTful URL. · 16766a5e
```
Part of STUD-847.
```
  cahrens committed Nov 06, 2013
  16766a5e Browse Files
- Merge pull request #1533 from mulby/gabe/enrollment-event · f17ab1ec
```
emit enrollment events
```
  Gabe Mulley committed Nov 06, 2013
  f17ab1ec Browse Files
- emit enrollment event · 5734cae1
  Gabe Mulley committed Nov 06, 2013
  
  5734cae1 Browse Files
05 Nov, 2013 7 commits
- Merge pull request #1574 from edx/jmclaus/feature_tests_video_player_controls_a11y · a6c02ccc
```
 a11y tests for video player controls [BLD-386]
```
  jmclaus committed Nov 05, 2013
  a6c02ccc Browse Files
- Added tests to video player controls to check new WAI-ARIA functionality. Added… · e892c979
```
Added tests to video player controls to check new WAI-ARIA functionality. Added global custom Jasmine matcher to helper.coffee

[BLD-386]
```
  jmclaus committed Nov 05, 2013
  e892c979 Browse Files
- Merge pull request #1571 from edx/db/js-main-setup · f02df33a
```
Do JS setup immediately when possible
```
  David Baumgold committed Nov 05, 2013
  f02df33a Browse Files
- Merge pull request #1581 from antoviaque/registration-optional · 3895a3fa
```
registration-optional: Allow to hide some optional registration fields #os
```
  David Baumgold committed Nov 05, 2013
  3895a3fa Browse Files
- Merge pull request #1591 from edx/jarv/theme-name · 2e05c0da
```
setting THEME_NAME to None when it's set to an empty string
```
  John Jarvis committed Nov 05, 2013
  2e05c0da Browse Files
- Merge pull request #1585 from edx/brian/retry-email-after-dbtimeout · 93dddf8d
```
Add retries when encountering DatabaseError when updating InstructorTask.
```
  brianhw committed Nov 05, 2013
  93dddf8d Browse Files
- Add retries when encountering DatabaseError when updating InstructorTask. · 7bef11a7
  Brian Wilson committed Nov 05, 2013
  
  7bef11a7 Browse Files