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

7162 Commits

Author SHA1 Message Date
Valera Rozuvan
0079243746 LTI additional Python tests. LTI must use HTTPS for lis_outcome_service_url. 
BLD-564.
 2013-12-17 12:47:49 +02:00
Adam Palay
146562f3f5 re-remove ora message as part of merge conflict resolution 2013-12-16 17:13:11 -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
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
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
f4e95c6a7f Fix typo in peer grading messages. 2013-12-16 10:24:19 -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
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
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
258d3227ee Merge pull request #1938 from edx/christina/common-location 
Create explicit Locations.
 2013-12-13 09:15:21 -08: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
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
cahrens
df09e99ad1 Create explicit Locations. 
Part of STUD-1030
 2013-12-12 14:37:00 -05:00
Don Mitchell
f4e69275ee Use mongo indices for all queries 
STUD-1039
 2013-12-12 12:55:39 -05:00
Don Mitchell
985417fcf6 Auth converting to new course_id syntax 2013-12-12 12:35:23 -05:00
Christina Roberts
455a327bb7 Merge pull request #1925 from edx/christina/underscore 
Fix missing _ import.
 2013-12-12 07:42:02 -08:00
Will Daly
4c842409f7 Add ignore patterns for staticfiles to avoid processing symlink dirs 2013-12-12 10:33:38 -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
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
polesye
2ea166313b Fix comment. 2013-12-11 16:52:46 +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
Julia Hansbrough
421f02518b Merge pull request #1744 from edx/flowerhack/feature/verified-cert-events 
Events for entering verified flow & buying
 2013-12-10 11:47:47 -08:00
David Baumgold
2bc4198760 Merge pull request #1853 from edx/db/update-comments 
Updating comments and docs for MITx -> edX transition
 2013-12-10 11:10:37 -08:00
Calen Pennington
80fd12b9aa Merge pull request #1692 from cpennington/pure-xblock-handler-urls 
Update handler_url support to match the latest in the xblock repo, for both js and python runtimes
 2013-12-10 10:54:55 -08:00
Julia Hansbrough
2f9380c296 response to cr 2013-12-10 18:51:45 +00:00
Julia Hansbrough
5b5fa7c202 response to cr 2013-12-10 18:45:34 +00:00
David Baumgold
fb13bed947 Updating comments and docs for MITx -> edX transition 2013-12-10 13:21:18 -05:00
Calen Pennington
d937da8d47 Update handler_url support to match the latest in the xblock repo, for both js and python runtimes 
[LMS-1613]
 2013-12-10 12:04:18 -05:00
David Baumgold
28f22393bf whitespace-only changes 2013-12-10 11:45:49 -05:00
Don Mitchell
7e4820af52 Reduce sql queries for groupname tests. (STUD-1039) 
Conflicts:
	cms/djangoapps/auth/authz.py
 2013-12-10 11:17:23 -05:00
Greg Price
c84164510e Merge pull request #1882 from edx/gprice/remove-moderator-toggle 
Remove forum user profile moderator toggle button
 2013-12-10 07:40:39 -08:00
Greg Price
8f9f3bb914 Merge pull request #1883 from edx/gprice/markdown-button-keypress 
Activate Markdown editor buttons on keypress
 2013-12-10 07:38:15 -08:00
Will Daly
9b4b3dfa12 Merge pull request #1903 from edx/will/fix-underscore-staff-grading 
Add underscore to staff grading template
 2013-12-10 06:29:46 -08:00
Will Daly
8374989c11 Add underscore to staff grading template 2013-12-09 23:55:29 +00:00
Sarina Canelake
874d7a02d6 Fix LTI acceptance tests 2013-12-09 18:28:41 -05:00
Sarina Canelake
b406ba0f83 Acceptance tests for grades download 
Refactor instructor dash acceptance tests.
Add additional acceptance tests for buttons on 'Data Download' tab.

LMS-58
 2013-12-09 18:28:41 -05:00
Sarina Canelake
c547ac7286 Fix bulk email acceptance test 2013-12-09 18:28:41 -05:00
Diana Huang
1ee6d151e2 Merge pull request #1894 from edx/diana/remove-extraneous-text 
Remove extraneous refund text
 2013-12-09 13:24:09 -08:00
David Baumgold
b784979976 Merge pull request #1792 from edx/man2life-i18n-no-forums 
i18n (no forums)
 2013-12-09 11:28:18 -08:00
Diana Huang
12a771e2f3 Remove extraneous refund text 
Bug: LMS-1603
 2013-12-09 11:29:10 -05:00