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

356 Commits

Author SHA1 Message Date
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
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
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
cahrens
705ccd01bc An empty category will result in InvalidLocationErrors. 2013-11-19 13:41:44 -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
Will Daly
336d648eef Merge pull request #1644 from edx/will/remove-load-test 
Removed custom response load test
 2013-11-12 07:08:46 -08:00
Will Daly
b55ffde4c3 Removed custom response load test 2013-11-09 20:26:28 -05:00
Adam Palay
4d1eebc557 fixes Edit Course In Studio link on instr dash (LMS-1455) 
add DOC_STORE_CONFIG to test settings
 2013-11-08 15:42:51 -05:00
Calen Pennington
864d831ce3 Use XBlock handlers for handle_ajax in XModules 
Adds xblock handler_url support to the LMS, and makes handle_ajax use
that code.

[LMS-230] [LMS-229]
 2013-11-08 11:08:48 -05:00
Calen Pennington
8ddd8c14a4 Fix pylint/pep8 errors 2013-11-08 11:08:48 -05:00
Calen Pennington
da26ae2529 Remove lms/lib from sys.path in favore of using it as the module lms.lib 2013-11-08 11:08:48 -05:00
Sarina Canelake
939dbb6c9d Merge pull request #1579 from edx/sarina/enhance-user-factories 
Sarina/enhance user factories
 2013-11-05 07:31:00 -08:00
Julia Hansbrough
1a3f4cb8f8 Moved can_refund logic to CourseEnrollment 2013-11-04 18:48:43 +00:00
Julia Hansbrough
c375666d88 Added new copy, small CR fixes 
* Changed text for "Are you sure you want to refund"...
* Addressed a CR comment adding clarity to student view code
* Converted UTC to pytz.utc
 2013-11-04 18:38:46 +00:00
Julia Hansbrough
7ab8142e82 Response to Dave & Diana's CR 2013-11-04 18:38:44 +00:00
Julia Hansbrough
bf916b6624 Fixes from Daian's CR 2013-11-04 18:38:43 +00:00
Julia Hansbrough
fcab46b138 Refactored to use signals; full test coverage 2013-11-04 18:38:42 +00:00
Julia Hansbrough
63940141c8 End-to-end refunding with tests 2013-11-04 18:37:55 +00:00
Julia Hansbrough
045e69f3c5 Can check verified-ness and expiration date 2013-11-04 18:37:54 +00:00
Sarina Canelake
198452cd1c Adds Staff and Instructor factories 2013-11-04 11:38:43 -05:00
Calen Pennington
10ee2dea82 Clean up imports 2013-10-29 10:36:22 -04:00
Carlos Andrés Rocha
eebfe57c68 Merge pull request #1505 from rocha/allow-course-export-to-write-to-stdout 
Allow the export_course command to dump results to stdout
 2013-10-28 09:21:34 -07:00
Carlos Andrés Rocha
b797e34deb Allow the export_course command to dump results to stdout 2013-10-28 11:47:44 -04:00
David Baumgold
dc589f723c Merge remote-tracking branch 'origin/release' 2013-10-25 15:29:03 -04:00
Calen Pennington
c3d25e1e61 Prevent unbounded nesting of lms field_datas 
Previously, whenever a XModule was created from a XDescriptor, we
created another level of nesting of FieldData objects. This change
prevents that nesting.

[TKTS-393]
 2013-10-25 12:21:05 -04:00
Carlos Andrés Rocha
7d76f36018 Make course xml export work for all modulestores 
Also let xml import work on modulestores that don't use write signaling
 2013-10-25 11:58:17 -04:00
Alexander Kryklia
0da81e2a56 Update IsoTIme to be timedelta and update tests. 2013-10-23 13:03:55 +03:00
Calen Pennington
12cc4a19c0 Merge pull request #1224 from cpennington/lms-xblock-js-execution 
Add an XBlock javascript runtime, and use it to run XModules
 2013-10-21 05:53:36 -07:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules 
[LMS-57]
 2013-10-18 16:31:32 -04:00
Don Mitchell
978c19dd2c Merge pull request #1325 from edx/dhm/paginate_assets 
Add asset pagination
 2013-10-17 07:16:09 -07:00
Don Mitchell
214a3bd251 pylint/pep8 cleanups 2013-10-17 09:52:13 -04:00
Carlos Andrés Rocha
7852b10753 Add command to dump a course to stdout as a tar.gz file 2013-10-15 10:48:59 -04:00
Carlos Andrés Rocha
8cc8608276 Add command to dump the structure of a course as a JSON 2013-10-15 10:48:59 -04:00
Carlos Andrés Rocha
956a960c63 Add command to dump the course_ids available to the LMS 2013-10-15 10:48:59 -04:00
Valera Rozuvan
134eab8c13 Adding fix for failing Python unit test. 2013-10-14 13:58:18 +03:00
Alexander Kryklia
a03c5be6de New feature for lti module. 
Add ability to display LTI module in a new
window. Iframe will be still supported.

Fix python test
Update acceptance tests
Fix in acceptance tests, they are stable now
Fix Acceptance tests.
Adding Jasmine tests for LTI.
Fixing Jasmine tests. Adding the rest of Jasmine tests.
 2013-10-14 13:58:17 +03:00
Brian Wilson
03b4330c04 Update tests with more complete coverage. 2013-10-10 15:34:16 -04:00
chrisndodge
82e42cc580 Merge pull request #1156 from edx/feature/cdodge/add-preview-configs-via-middleware 
add some middleware to determine whether draft modulestore or non-draft ...
 2013-10-10 10:24:51 -07:00
Chris Dodge
8f9d815f10 add some middleware to determine whether draft modulestore or non-draft modulestore should be used 
change to use regex to do the domain mappings. Also add config to AWS to be able to set from configuration file.

handle cases where HTTP_HOST is none, like in unit tests

add linefeed at end

fix up regex matches

switch to use thread local storage to hold the request itself

.

.

convert over to use open source 3rd party library

convert over to use django-cum

add unit test

remove comment

.

add comment to config setting

fix comment

use better regex for localdev

no need to break

no need to wrap an imported function, it's visible to any file that is importing us

add comment

add unit test

clean up test

use a separate env file to set the preview hostname
 2013-10-09 11:53:26 -04:00