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
polesye
50674a966b
BLD-457: Fix speed menu when YouTube is unavailable.
2013-11-12 21:44:06 +02: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
037da3212d
Merge pull request #1531 from cpennington/lms-xblock-handlers
...
Use XBlock handlers in the LMS ...
2013-11-08 08:37:15 -08: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
Chris Dodge
a93a848e03
we are already being passed in the module descriptor so we don't need to re-fetch it (and children)
2013-11-07 17:56:13 -05:00
Gabe Mulley
3377cb66c9
emit enrollment event
2013-11-06 15:09:33 -05:00
Gabe Mulley
5aa19c08b5
Revert "emit enrollment event"
...
This reverts commit 5734cae1c3
2013-11-06 14:35:28 -05:00
Gabe Mulley
5734cae1c3
emit enrollment event
2013-11-06 08:46:40 -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
e66f9a243b
Clarified wording in a docstring
2013-11-04 18:38:49 +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
Will Daly
9ab35759be
Added wait for problem to re-render when checking or resetting it
...
Added wait for JS on upload page
Fixed an issue where css_click wasn't waiting for JS to load
2013-11-01 14:31:37 -04:00
Calen Pennington
10ee2dea82
Clean up imports
2013-10-29 10:36:22 -04:00
Diana Huang
92c94b5317
Merge pull request #1483 from edx/diana/certs-upgrade-path
...
Verified Certificate Upsell
2013-10-28 14:28:50 -07:00
Diana Huang
8ee1807840
Fix acceptance tests
...
LMS-1127
2013-10-28 15:59:19 -04:00
Greg Price
d2e0f27a0a
Merge pull request #1510 from edx/gprice/lms-forum-perf
...
Improve forums performance
2013-10-28 10:28:37 -07: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
Greg Price
54ad411078
Remove unused code
2013-10-28 11:58:43 -04:00
Carlos Andrés Rocha
b797e34deb
Allow the export_course command to dump results to stdout
2013-10-28 11:47:44 -04:00
Diana Huang
90ad574314
Fix up acceptance tests for upsell.
...
LMS-1127
2013-10-25 15:29:44 -04:00
David Baumgold
dc589f723c
Merge remote-tracking branch 'origin/release'
2013-10-25 15:29:03 -04:00
Diana Huang
9c65d97f0a
Add new acceptance test for complete upgrade flow
2013-10-25 15:25:30 -04:00
Diana Huang
4efe4ecd11
Add acceptance tests.
2013-10-25 15:21:42 -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
