Commits · 560347d0efe62cbc788ad38be74ad0158e025b50 · edx / edx-platform

13 Dec, 2013 4 commits
- Merge pull request #1944 from edx/markhoeber/documentation/add-glossary-to-index · 560347d0
```
added glossary to index
```
  Mark Hoeber committed Dec 12, 2013
  560347d0 Browse Files
- added glossary to index · 49b6b9c5
```
and updated change file
```
  Mark Hoeber committed Dec 12, 2013
  49b6b9c5 Browse Files
- Merge pull request #1943 from edx/markhoeber/documentation/glossary · 39fddd1f
```
Markhoeber/documentation/glossary
```
  Mark Hoeber committed Dec 12, 2013
  39fddd1f Browse Files
- fixing header · 8ffe169a
```
fixing header
```
  Mark Hoeber committed Dec 12, 2013
  8ffe169a Browse Files
12 Dec, 2013 21 commits
- LTI revisions · c4017855
```
Revisions to LTI information based on feedback from Valera
```
  spearce committed Dec 12, 2013
  c4017855 Browse Files
- Merge pull request #1923 from edx/sarina/update-contributing-docs · 64ec4e02
```
Update CONTRIBUTING.md to be more comprehensive
```
  Sarina Canelake committed Dec 12, 2013
  64ec4e02 Browse Files
- Merge pull request #1939 from edx/nick/no-apostrophe · 6dc98391
```
Mention " vs. '  in advanced settings help
```
  Nick Parlante committed Dec 12, 2013
  6dc98391 Browse Files
- Merge pull request #1919 from tusbar/studio-email-config · 8e67645d
```
Add email configuration to cms/envs/aws.py
```
  Sarina Canelake committed Dec 12, 2013
  8e67645d Browse Files
- Fixing conflicts · 9aa2e2a1
```
didn't see conflicts noted
```
  Mark Hoeber committed Dec 12, 2013
  9aa2e2a1 Browse Files
- Glossary revisions · 05dac894
```
Extensive revisions to glossary and minor changes to Appendix E and a
couple of other files (adding links)
```
  spearce committed Dec 12, 2013
  05dac894 Browse Files
- Mention " vs. ' syntax in help text · 0931e5fb
```
Not that I could ever make such a bonehead error!
```
  Nick Parlante committed Dec 12, 2013
  0931e5fb Browse Files
- Merge pull request #1930 from carsongee/cg/ssl-check-header · c1b84728
```
Check that SSL certificate is passed before redirecting to SSL authentication.
```
  Carson Gee committed Dec 12, 2013
  c1b84728 Browse Files
- Update CONTRIBUTING.md to be more comprehensive · f932de1c
  Sarina Canelake committed Dec 12, 2013
  
  f932de1c Browse Files
- Add additional check signin to make sure an SSL certificate is passed · cec79368
```
before redirecting to SSL authentication.
```
  Carson Gee committed Dec 12, 2013
  cec79368 Browse Files
- Merge pull request #1862 from carsongee/bugfix/mitx/external_auth-retfun · 8261f2b4
```
Fix external_auth to properly use retfun for @ssl_login_shortcut()
```
  Carson Gee committed Dec 12, 2013
  8261f2b4 Browse Files
- Replaced retfun in ssl_login so that it properly redirect to dashboard · 93b03579
  Carson Gee committed Dec 12, 2013
  
  93b03579 Browse Files
- Merge pull request #1925 from edx/christina/underscore · 455a327b
```
Fix missing _ import.
```
  Christina Roberts committed Dec 12, 2013
  455a327b Browse Files
- Added comment as requested · 50e2e833
  Carson Gee committed Dec 12, 2013
  
  50e2e833 Browse Files
- Added full test coverage for ssl login decorator · caf44c36
```
I also removed conflicting implementation of SSL_AUTH_IMMEDIATE_SIGNUP
and rebased on the current master.
```
  Carson Gee committed Dec 12, 2013
  caf44c36 Browse Files
- remove @cache_if_anonymous · 07e235a0
  ichuang committed Dec 12, 2013
  
  07e235a0 Browse Files
- add missing retfun · 246fc030
  ichuang committed Dec 12, 2013
  
  246fc030 Browse Files
- fix external_auth @ssl_login_shortcut decorator to properly use retfun · e868759c
  ichuang committed Dec 12, 2013
  
  e868759c Browse Files
- Merge pull request #1924 from edx/db/turn-off-mit-auth · 74b3a8ab
```
Turn off AUTH_USE_MIT_CERTIFICATES
```
  David Baumgold committed Dec 12, 2013
  74b3a8ab Browse Files
- Merge pull request #1917 from edx/anton/fix-imageresponse-in-ie · 5eb02929
```
Fix image mapping in IE
```
  Anton Stupak committed Dec 12, 2013
  5eb02929 Browse Files
- Merge pull request #1891 from edx/anton/fix-lti-dnd · a79d79aa
```
LTI: fix reordering bug in Studio
```
  Anton Stupak committed Dec 12, 2013
  a79d79aa Browse Files
11 Dec, 2013 15 commits
- Fix another unbound underscore · cc31b5cc
  David Baumgold committed Dec 11, 2013
  
  cc31b5cc Browse Files
- Fix missing _ import. · 249aa8ef
```
Fallout from #1792.
```
  cahrens committed Dec 11, 2013
  249aa8ef Browse Files
- Revert "Fix missing _ import." · 0b161998
```
This reverts commit 82d7da82.
```
  cahrens committed Dec 11, 2013
  0b161998 Browse Files
- Fix missing _ import. · 82d7da82
```
Fallout from #1792.
```
  cahrens committed Dec 11, 2013
  82d7da82 Browse Files
- Turn off AUTH_USE_MIT_CERTIFICATES · 81bc6617
  David Baumgold committed Dec 11, 2013
  
  81bc6617 Browse Files
- Merge pull request #1922 from edx/e0d/remove-pre-wsgi-init · 258802e5
```
Removing duplicated initialization code.
```
  e0d committed Dec 11, 2013
  258802e5 Browse Files
- Draft of LTI documentation · 8fcc9ec5
```
Another draft of LTI documentation, including a table of options
available in the Studio UI
```
  spearce committed Dec 11, 2013
  8fcc9ec5 Browse Files
- Merge pull request #1920 from edx/markhoeber/documentation/stud-1007 · ce44ff89
```
Adding accessibility guidelines to "Building a Course with edX Studio" documentation 
```
  srpearce committed Dec 11, 2013
  ce44ff89 Browse Files
- Removing duplicated initialization code. · 7be524d7
  e0d committed Dec 11, 2013
  
  7be524d7 Browse Files
- Merge pull request #1913 from carsongee/cg/ssl_auth_enhancements · 6b9a3e29
```
Adds redirects for login pages and the registration page
```
  Julia Hansbrough committed Dec 11, 2013
  6b9a3e29 Browse Files
- Accessibility edits · 48fcaeb1
```
Accessibility edits
```
  Mark Hoeber committed Dec 11, 2013
  48fcaeb1 Browse Files
- Minor changes by Valera. · d31268e7
  Valera Rozuvan committed Dec 11, 2013
  
  d31268e7 Browse Files
- Add email configuration to cms/envs/aws.py · f576673a
```
This allows emails to be sent by Studio.
```
  Bertrand Marron committed Dec 11, 2013
  f576673a Browse Files
- Add default email settings · 4e641b94
```
These are the django default settings.
```
  Bertrand Marron committed Dec 11, 2013
  4e641b94 Browse Files
- Accessibilty updates · f69311f8
```
Accessibilty updates
```
  Mark Hoeber committed Dec 11, 2013
  f69311f8 Browse Files