Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,907 Commits 1 Branch 0 Tags
41dfa3e5527bc3e446d2fb2f0e15962b0ac28d2f
Commit Graph

19907 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
41dfa3e552 Cache anonymous user id on the user object, so that queries aren't made many times over during module rendering 2013-12-12 21:45:22 -05:00
Mark Hoeber
560347d0ef Merge pull request #1944 from edx/markhoeber/documentation/add-glossary-to-index 
added glossary to index
 2013-12-12 17:12:03 -08:00
Mark Hoeber
49b6b9c514 added glossary to index 
and updated change file
 2013-12-12 20:11:21 -05:00
Mark Hoeber
39fddd1f4c Merge pull request #1943 from edx/markhoeber/documentation/glossary 
Markhoeber/documentation/glossary
 2013-12-12 17:03:58 -08:00
Mark Hoeber
8ffe169a03 fixing header 
fixing header
 2013-12-12 20:03:19 -05:00
spearce
c401785576 LTI revisions 
Revisions to LTI information based on feedback from Valera
 2013-12-12 17:29:33 -05:00
Sarina Canelake
64ec4e0296 Merge pull request #1923 from edx/sarina/update-contributing-docs 
Update CONTRIBUTING.md to be more comprehensive
 2013-12-12 14:03:32 -08:00
Nick Parlante
6dc98391eb Merge pull request #1939 from edx/nick/no-apostrophe 
Mention " vs. '  in advanced settings help
 2013-12-12 14:02:52 -08:00
Sarina Canelake
8e67645d1a Merge pull request #1919 from tusbar/studio-email-config 
Add email configuration to cms/envs/aws.py
 2013-12-12 13:48:24 -08:00
Mark Hoeber
9aa2e2a1d1 Fixing conflicts 
didn't see conflicts noted
 2013-12-12 16:39:45 -05:00
spearce
05dac89481 Glossary revisions 
Extensive revisions to glossary and minor changes to Appendix E and a
couple of other files (adding links)
 2013-12-12 15:19:10 -05:00
Nick Parlante
0931e5fbe2 Mention " vs. ' syntax in help text 
Not that I could ever make such a bonehead error!
 2013-12-12 11:53:52 -08:00
Carson Gee
c1b8472869 Merge pull request #1930 from carsongee/cg/ssl-check-header 
Check that SSL certificate is passed before redirecting to SSL authentication.
 2013-12-12 11:22:45 -08:00
Sarina Canelake
f932de1ca5 Update CONTRIBUTING.md to be more comprehensive 2013-12-12 14:06:44 -05:00
Carson Gee
cec793680d Add additional check signin to make sure an SSL certificate is passed 
before redirecting to SSL authentication.
 2013-12-12 11:26:57 -05:00
Carson Gee
8261f2b4b1 Merge pull request #1862 from carsongee/bugfix/mitx/external_auth-retfun 
Fix external_auth to properly use retfun for @ssl_login_shortcut()
 2013-12-12 08:22:07 -08:00
Carson Gee
93b0357978 Replaced retfun in ssl_login so that it properly redirect to dashboard 2013-12-12 10:49:20 -05:00
Christina Roberts
455a327bb7 Merge pull request #1925 from edx/christina/underscore 
Fix missing _ import.
 2013-12-12 07:42:02 -08:00
Carson Gee
50e2e833a2 Added comment as requested 2013-12-12 09:35:46 -05:00
Carson Gee
caf44c3685 Added full test coverage for ssl login decorator 
I also removed conflicting implementation of SSL_AUTH_IMMEDIATE_SIGNUP
and rebased on the current master.
 2013-12-12 09:35:46 -05:00
ichuang
07e235a0c4 remove @cache_if_anonymous 2013-12-12 09:29:11 -05:00
ichuang
246fc030bd add missing retfun 2013-12-12 09:29:10 -05:00
ichuang
e868759ceb fix external_auth @ssl_login_shortcut decorator to properly use retfun 2013-12-12 09:29:10 -05:00
David Baumgold
74b3a8ab7e Merge pull request #1924 from edx/db/turn-off-mit-auth 
Turn off AUTH_USE_MIT_CERTIFICATES
 2013-12-12 04:55:47 -08:00
Anton Stupak
5eb029293c Merge pull request #1917 from edx/anton/fix-imageresponse-in-ie 
Fix image mapping in IE
 2013-12-12 03:58:03 -08:00
Anton Stupak
a79d79aa12 Merge pull request #1891 from edx/anton/fix-lti-dnd 
LTI: fix reordering bug in Studio
 2013-12-12 02:57:41 -08:00
David Baumgold
cc31b5cce6 Fix another unbound underscore 2013-12-11 14:38:36 -05:00
cahrens
249aa8ef23 Fix missing _ import. 
Fallout from #1792.
 2013-12-11 14:33:18 -05:00
cahrens
0b161998a1 Revert "Fix missing _ import." 
This reverts commit 82d7da8253.
 2013-12-11 14:30:02 -05:00
cahrens
82d7da8253 Fix missing _ import. 
Fallout from #1792.
 2013-12-11 14:29:22 -05:00
David Baumgold
81bc6617a6 Turn off AUTH_USE_MIT_CERTIFICATES 2013-12-11 14:23:23 -05:00
e0d
258802e591 Merge pull request #1922 from edx/e0d/remove-pre-wsgi-init 
Removing duplicated initialization code.
 2013-12-11 10:52:43 -08:00
spearce
8fcc9ec55e Draft of LTI documentation 
Another draft of LTI documentation, including a table of options
available in the Studio UI
 2013-12-11 13:41:47 -05:00
srpearce
ce44ff898d Merge pull request #1920 from edx/markhoeber/documentation/stud-1007 
Adding accessibility guidelines to "Building a Course with edX Studio" documentation
 2013-12-11 10:39:58 -08:00
e0d
7be524d769 Removing duplicated initialization code. 2013-12-11 12:59:07 -05:00
Julia Hansbrough
6b9a3e2976 Merge pull request #1913 from carsongee/cg/ssl_auth_enhancements 
Adds redirects for login pages and the registration page
 2013-12-11 09:07:32 -08:00
Mark Hoeber
48fcaeb1bc Accessibility edits 
Accessibility edits
 2013-12-11 10:38:32 -05:00
Valera Rozuvan
d31268e790 Minor changes by Valera. 2013-12-11 17:27:23 +02:00
Bertrand Marron
f576673a87 Add email configuration to cms/envs/aws.py 
This allows emails to be sent by Studio.
 2013-12-11 16:11:23 +01:00
Bertrand Marron
4e641b946d Add default email settings 
These are the django default settings.
 2013-12-11 16:11:23 +01:00
Mark Hoeber
f69311f848 Accessibilty updates 
Accessibilty updates
 2013-12-11 10:01:33 -05:00
polesye
2ea166313b Fix comment. 2013-12-11 16:52:46 +02:00
David Baumgold
d1cb40def1 Merge pull request #1915 from edx/anton/fix-author-name 
Fix author name.
 2013-12-11 06:49:41 -08:00
polesye
79519b7a07 Address comments. 2013-12-11 16:25:07 +02:00
polesye
418d6fa9e1 BLD-413: Add rounding of coordinates. 2013-12-11 15:20:05 +02:00
polesye
38276972a5 Fix author name. 2013-12-11 13:59:07 +02:00
polesye
e5f583294a Address comments. 2013-12-11 13:28:34 +02:00
polesye
39e97225ff Fix tests. 2013-12-11 13:28:33 +02:00
polesye
2e87b1a66f BLD-543: Fix bug with reordering in Studio. 2013-12-11 13:28:33 +02:00
Carson Gee
484602ad61 Adds redirects for login pages and the registration page so that 
they go through the SSL login process in branding when that feature
is enabled.
 2013-12-10 18:06:26 -05:00