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

19960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
a78400a8d8 Merge pull request #1970 from edx/adam/re-remove-ora-message 
re-remove ora message as part of merge conflict resolution
 2013-12-16 17:24:31 -08:00
Adam Palay
146562f3f5 re-remove ora message as part of merge conflict resolution 2013-12-16 17:13:11 -05:00
e0d
4de51c8fcc Merge pull request #1960 from edx/e0d/release-merge 
E0d/release merge
 2013-12-16 14:07:56 -08:00
David Baumgold
319091a213 Merge pull request #1966 from edx/db/update-staticfiles-commit 
Update version of django-staticfiles
 2013-12-16 13:53:59 -08:00
David Baumgold
132313c1bf Update version of django-staticfiles library 2013-12-16 16:12:15 -05:00
e0d
d52b959ff1 fixing merge conflicts 2013-12-16 15:02:14 -05:00
Don Mitchell
3cf75198c5 Merge pull request #1954 from edx/dhm/loc_mapper_memoize 
loc mapper memoize
 2013-12-16 10:34:12 -08:00
Don Mitchell
9ad7a1c1e0 Document performance optimization and auth generality changes. 2013-12-16 13:32:44 -05:00
Don Mitchell
f6de4f2186 Location map uses a separate cache and defaults to general 2013-12-16 12:31:19 -05:00
Will Daly
7bf68907f3 Merge pull request #1935 from edx/will/ignore-symlink-staticfiles 
Add ignore patterns for staticfiles to avoid processing symlink dirs
 2013-12-16 09:01:17 -08:00
Don Mitchell
3f420e3d63 loc_mapper memoize all translations 
STUD-1048
 2013-12-16 11:43:28 -05:00
John Jarvis
25958e87a2 Merge pull request #1937 from edx/hotfix/2013-12-12 
Hotfix/2013 12 12
 2013-12-16 08:33:08 -08:00
Carson Gee
a00335edd3 Merge pull request #1942 from carsongee/feature/mitx/sysadmin-dashboard 
Add sysadmin dashboard
 2013-12-16 08:01:38 -08:00
Stephen Sanchez
f1028a35bc Merge pull request #1958 from edx/sanchez/peer-grading-typo 
Fix typo in peer grading messages.
 2013-12-16 07:51:56 -08:00
Stephen Sanchez
f4e95c6a7f Fix typo in peer grading messages. 2013-12-16 10:24:19 -05:00
David Baumgold
807843d1ea Merge pull request #1959 from edx/db/revert-tusbar-merge 
Revert "Studio HTTPS fonts"
 2013-12-16 07:17:30 -08:00
David Baumgold
179a1dd44e Revert "Merge pull request #1889 from tusbar/studio-https-fonts" 
This reverts commit 540256b213, reversing
changes made to bd04ab5a08.
 2013-12-16 09:30:42 -05:00
Carson Gee
ccc87337d6 Add sysadmin dashboard 
For seeing overview of system status, for deleting and loading
courses, for seeing log of git imports of courseware.  Includes command
for importing course XML from git repositories.

Added a lot of tests for additional coverage with some minor fixes
those tests discovered
 2013-12-15 19:06:05 -05:00
David Baumgold
540256b213 Merge pull request #1889 from tusbar/studio-https-fonts 
Remove protocol from font URLs in Studio and Tiny MCE
 2013-12-13 11:52:07 -08:00
Sarina Canelake
bd04ab5a08 Merge pull request #1953 from edx/sarina/bugfix-instdash-acceptance 
Fix data dash acceptance test to wait for text
 2013-12-13 11:49:24 -08:00
David Baumgold
3d2ad59c51 Merge pull request #1907 from edx/db/whitespace-fixes 
whitespace-only changes
 2013-12-13 11:40:54 -08:00
Don Mitchell
3bd76f98e9 Use mongo indices for all queries 
STUD-1039
 2013-12-13 14:34:34 -05:00
Don Mitchell
f4beb8b8c3 Reduce sql queries for groupname tests. 
Conflicts:
	cms/djangoapps/auth/authz.py
 2013-12-13 14:33:11 -05:00
Sarina Canelake
b2fee69c08 Fix acceptance test to wait for text area to be populated 2013-12-13 13:13:21 -05:00
Christina Roberts
17b5c2126c Merge pull request #1910 from edx/christina/locations 
Create explicit Locations.
 2013-12-13 09:18:21 -08:00
Christina Roberts
258d3227ee Merge pull request #1938 from edx/christina/common-location 
Create explicit Locations.
 2013-12-13 09:15:21 -08:00
Feanil Patel
e326fd13e3 Merge pull request #1952 from tusbar/fix-auth-email-conf 
Fix auth email configuration
 2013-12-13 08:17:28 -08:00
Bertrand Marron
ddff90c1cb Fix auth email configuration 
Fix bug introduced by #1919: usage of not-yet-defined AUTH_TOKENS dict.
 2013-12-13 17:02:50 +01:00
Diana Huang
6952aec870 Merge pull request #1941 from edx/diana/openid-fullname 
Return the full name of the student as part of the OpenId response.
 2013-12-13 07:32:34 -08:00
Mark Hoeber
3d366eb06f Merge pull request #1950 from edx/markhoeber/documentation/stud-1017 
added anonymous id template info to html component
 2013-12-13 06:18:35 -08:00
Mark Hoeber
dc2dbc32ac added anonymous id template info to html component 
STUD-1017
 2013-12-13 09:17:24 -05:00
Diana Huang
68b75086f2 Clean up test conditions. 
LMS-750
 2013-12-13 09:11:00 -05:00
Calen Pennington
bcd753cf7d Merge pull request #1945 from cpennington/cache-anonymous-student-id 
Cache anonymous user id on the user object, so that queries aren't made many times over during module rendering
 2013-12-13 05:30:06 -08:00
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
Diana Huang
0057f460ec Return the full name of the student as part of the OpenId response. 
LMS-750
 2013-12-12 17:33:33 -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
cahrens
df09e99ad1 Create explicit Locations. 
Part of STUD-1030
 2013-12-12 14:37:00 -05: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
Don Mitchell
f4e69275ee Use mongo indices for all queries 
STUD-1039
 2013-12-12 12:55:39 -05:00