Commits · 1d0ce64b10f490cb5d59765344c09f62c75143a4 · edx / edx-platform

17 Dec, 2013 1 commit
- Update to the latest version of lettuce · 1d0ce64b
  Calen Pennington committed Dec 17, 2013
  
  1d0ce64b Browse Files
16 Dec, 2013 1 commit
- Revert "Merge pull request #1889 from tusbar/studio-https-fonts" · 179a1dd4
```
This reverts commit 540256b2, reversing
changes made to bd04ab5a.
```
  David Baumgold committed Dec 16, 2013
  179a1dd4 Browse Files
13 Dec, 2013 18 commits
- Merge pull request #1889 from tusbar/studio-https-fonts · 540256b2
```
Remove protocol from font URLs in Studio and Tiny MCE
```
  David Baumgold committed Dec 13, 2013
  540256b2 Browse Files
- Merge pull request #1953 from edx/sarina/bugfix-instdash-acceptance · bd04ab5a
```
Fix data dash acceptance test to wait for text
```
  Sarina Canelake committed Dec 13, 2013
  bd04ab5a Browse Files
- Merge pull request #1907 from edx/db/whitespace-fixes · 3d2ad59c
```
whitespace-only changes
```
  David Baumgold committed Dec 13, 2013
  3d2ad59c Browse Files
- Fix acceptance test to wait for text area to be populated · b2fee69c
  Sarina Canelake committed Dec 13, 2013
  
  b2fee69c Browse Files
- Merge pull request #1910 from edx/christina/locations · 17b5c212
```
Create explicit Locations.
```
  Christina Roberts committed Dec 13, 2013
  17b5c212 Browse Files
- Merge pull request #1938 from edx/christina/common-location · 258d3227
```
Create explicit Locations.
```
  Christina Roberts committed Dec 13, 2013
  258d3227 Browse Files
- Merge pull request #1952 from tusbar/fix-auth-email-conf · e326fd13
```
Fix auth email configuration
```
  Feanil Patel committed Dec 13, 2013
  e326fd13 Browse Files
- Fix auth email configuration · ddff90c1
```
Fix bug introduced by #1919: usage of not-yet-defined AUTH_TOKENS dict.
```
  Bertrand Marron committed Dec 13, 2013
  ddff90c1 Browse Files
- Merge pull request #1941 from edx/diana/openid-fullname · 6952aec8
```
Return the full name of the student as part of the OpenId response.
```
  Diana Huang committed Dec 13, 2013
  6952aec8 Browse Files
- Merge pull request #1950 from edx/markhoeber/documentation/stud-1017 · 3d366eb0
```
added anonymous id template info to html component
```
  Mark Hoeber committed Dec 13, 2013
  3d366eb0 Browse Files
- added anonymous id template info to html component · dc2dbc32
```
STUD-1017
```
  Mark Hoeber committed Dec 13, 2013
  dc2dbc32 Browse Files
- Clean up test conditions. · 68b75086
```
LMS-750
```
  Diana Huang committed Dec 13, 2013
  68b75086 Browse Files
- Merge pull request #1945 from cpennington/cache-anonymous-student-id · bcd753cf
```
Cache anonymous user id on the user object, so that queries aren't made many times over during module rendering
```
  Calen Pennington committed Dec 13, 2013
  bcd753cf Browse Files
- Cache anonymous user id on the user object, so that queries aren't made many… · 41dfa3e5
```
Cache anonymous user id on the user object, so that queries aren't made many times over during module rendering
```
  Calen Pennington committed Dec 12, 2013
  41dfa3e5 Browse Files
- 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 20 commits
- Return the full name of the student as part of the OpenId response. · 0057f460
```
LMS-750
```
  Diana Huang committed Dec 12, 2013
  0057f460 Browse Files
- 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
- Create explicit Locations. · df09e99a
```
Part of STUD-1030
```
  cahrens committed Dec 12, 2013
  df09e99a 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