Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

4136 Commits

Author SHA1 Message Date
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
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
Carson Gee
cbb6e5e686 Changed default user to be anonymous in both has_access and student.views.index 
Replaced existing test_none_user_index_access_with_startdate_fails
test with new test now that the tested function has changed and
was causing the original test to fail.
 2013-12-15 09:56:37 -05: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
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
polesye
39e97225ff Fix tests. 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
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
Sarina Canelake
874d7a02d6 Fix LTI acceptance tests 2013-12-09 18:28:41 -05:00
Valera Rozuvan
9072b9cc5d e-reader error when popping out window 
Moving work on BLD-465 from PR 1811.
Fixing missing import clause in Python.
Addressing DB's comment.

BLD-465.
 2013-12-09 10:38:57 +02:00
Ned Batchelder
488923fd5c Add a test for Django-based file uploads to problems. 2013-12-07 19:53:23 -05:00
Ned Batchelder
faa8f16fff Merge pull request #1877 from edx/ned/hotfix-2013-12-04-with-temp-stuff-removed 
Update 12/3 RC branch with the part of the hotfix we want permanently.
 2013-12-06 07:49:46 -08:00
David Baumgold
d15391fdfa Update factory_boy to 2.2.1 2013-12-05 15:50:49 -05:00
Julia Hansbrough
83f42f5691 Response to CR 2013-12-05 19:14:45 +00:00
Julia Hansbrough
8c612ba975 Quick fix 2013-12-05 19:14:45 +00:00
Julia Hansbrough
e8196d9761 Events for entering verified flow & buying 2013-12-05 19:10:27 +00:00
Alexander Kryklia
bceadd4830 Merge pull request #1819 from edx/anton/fix-lti-scores 
Fix LTI max_score method.
 2013-12-05 02:40:19 -08:00
Александр
e96108629d Fix LTI tests. 2013-12-04 15:55:47 -05:00
David Baumgold
e26fc08d2b Update logging.getLogger() calls to use edx instead of mitx 2013-12-04 15:18:15 -05:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
69899e24df Merge pull request #1823 from edx/db/mitxmako-edxmako 
mitxmako => edxmako
 2013-12-03 11:36:50 -08:00
David Ormsbee
f10df353d2 Add basic tests of gradeset iteration. 2013-12-03 14:23:12 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Александр
1cd9325ef5 Fix LTI tests. 2013-12-03 19:04:21 +02:00
Ned Batchelder
c8a7b259ff Resolve conflicts merging master to rc/2013-11-21 2013-11-27 11:55:44 -05:00
Jay Zoldak
341875bb18 Remove code related to Pearson Testing Centers 2013-11-26 17:04:19 -05:00
Calen Pennington
11bbf4c182 Add grading functionality to LTI xmodule 
Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
[BLD-384]
 2013-11-26 16:30:55 -05:00
Calen Pennington
52ab2b1313 Make FieldDataCache use the user from scope_ids, rather than its pre-configured user 
Co-author: Ned Batchelder <ned@edx.org>
 2013-11-26 16:29:35 -05:00
Calen Pennington
1205173d6f Add a per-course anonymous student id 
This does not yet replace the existing per-student anonymous id, but
is intended to do so in the future.

Co-author: Alexander Kryklia <kryklia@edx.org>
Co-author: Ned Batchelder <ned@edx.org>
Co-author: Oleg Marchev <oleg@edx.org>
Co-author: Valera Rozuvan <valera@edx.org>
Co-author: polesye
 2013-11-26 16:29:35 -05:00
Calen Pennington
6d613f9d4e Enable un-authenticated handler urls 
Updates to depend on the latest version of XBlock, which includes
support for service-to-service (thirdparty) handler urls, which aren't
authenticated with a user (unlike handler requests coming from the
xblock client-side javascript).

Co-author: Ned Batchelder <ned@edx.org>
 2013-11-26 16:29:34 -05:00
Ned Batchelder
9a106a32d5 Merged master to rc/2013-11-21 2013-11-25 14:56:09 -05:00
Adam Palay
24aa0decb4 fix OrgInstructorRole definition and add tests 2013-11-22 13:00:45 -05:00
Calen Pennington
c0f570ceab Fix [LMS-1528] (500 error when checking for beta access) 2013-11-22 13:00:45 -05:00
Calen Pennington
820e771171 Add failing test for [LMS-1528] 
Also cleans up test_view_authentication to use user factories for
various user classes
 2013-11-22 13:00:45 -05:00
Adam Palay
cf524906e0 more granular transactions in grading [LMS-1480] 
remove field_data_cache from grades.grade and grades.progress_summary

cleans grading code by adding wrappers
 2013-11-22 12:02:35 -05:00
David Ormsbee
a99fd08004 Fix error case where we have items in our grading csv output 
that are not present in a given student's gradeset.

General code cleanup and addition of comments.

Instructor dashboard API unit tests.

LMS-58
 2013-11-22 10:06:28 -05:00
David Ormsbee
e0aa8cf78a Grade report celery task and direct file push to S3 from the new instructor dashboard. 
Hook up display of grade files ready for download to new instructor dashboard.

LMS-58
 2013-11-22 10:06:10 -05:00
Jason Bau
835893c2ed Merge pull request #1736 from edx/jbau/fix/cw-migrations 
Fix 0010 courseware migration
 2013-11-21 13:54:09 -08:00
Jason Bau
f0874d41c4 Fix 0010 courseware migration 2013-11-20 20:39:40 -08:00
Adam Palay
7b72a18551 more granular transactions in grading [LMS-1480] 
remove field_data_cache from grades.grade and grades.progress_summary

cleans grading code by adding wrappers
 2013-11-20 14:40:32 -05:00
cahrens
705ccd01bc An empty category will result in InvalidLocationErrors. 2013-11-19 13:41:44 -05:00
Will Daly
257021c63b Merge pull request #1661 from edx/will/certificate-test-fix 
Added explicit wait for payment page to load
 2013-11-13 12:10:44 -08:00
Will Daly
a758ec782a Added explicit wait for payment page to load 2013-11-13 14:48:10 -05:00
Calen Pennington
061a46beef Formalize various access roles as objects 
This centralizes the logic for group membership, and means that we
don't need to make queries to find out whether the legacy groups names exist.
 2013-11-13 13:42:37 -05:00
Calen Pennington
68c182c055 Optimize and cache the query to find the list of groups a user is in 2013-11-13 09:03:02 -05:00