Commit Graph

3035 Commits

Author SHA1 Message Date
Julia Hansbrough
dac5d2ac0e Merge pull request #1634 from edx/flowerhack/feature/refactor-to-track-enrollment
Flowerhack/feature/refactor to track enrollment
2013-11-19 06:27:22 -08:00
Julia Hansbrough
b075143d62 Small fix 2013-11-15 20:44:29 +00:00
David Adams
ed980f2189 Port of invitation/enroll/unenroll email functionality
into beta dashboard.

Also includes new functionality, in both legacy and beta
dashboard, to include appropriate email text for a
Shibboleth course.
2013-11-15 10:10:04 -08:00
Julia Hansbrough
f950ea106d response to CR 2013-11-15 15:38:21 +00:00
Julia Hansbrough
e73489ec31 Response to CR 2013-11-14 22:34:18 +00: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
Usman Khalid
e370fb9585 Merge pull request #1502 from edx/usman/lms1355-wiki-permissions
Stricter permissions for the wiki
2013-11-13 02:44:14 -08:00
Usman Khalid
9542230afd Added granular permissions for managing wiki articles
LMS-1355
2013-11-13 01:40:23 +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
Adam
3dfdab1a23 Merge pull request #1629 from edx/adam/fix/enrollment-count-intr-dash
makes beta dash count active users in enrollment count [AN-115]
2013-11-12 05:58:23 -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
Julia Hansbrough
39105f7662 Merge pull request #1598 from edx/flowerhack/feature/command-retry-cert-submissions
Command for retrying failed photo verifications
2013-11-08 12:38:12 -08:00
Julia Hansbrough
8042332cda purchased_callback now uses the change_mode method 2013-11-08 20:33:52 +00:00
Adam Palay
71b70bce61 makes beta dash count active users in enrollment count [AN-115] 2013-11-08 14:11:59 -05:00
Julia Hansbrough
73af5d017e Changed create_enrollment to create_or_update_enrollment 2013-11-08 19:01:51 +00:00
Julia Hansbrough
f294920473 Merge pull request #1601 from edx/flowerhack/feature/course-modes-expire-datetime
Added expiration_datetime field to CourseModes
2013-11-08 09:54:16 -08: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
Julia Hansbrough
3c7afb69d2 Response to CR 2013-11-08 16:27:42 +00: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
Julia Hansbrough
05996a71df Added expiration_datetime field to CourseModes
Added an expiration_datetime field to CourseModes, intended to eventually replace expiration_date.

Included relevant schema and data migration file.

LMS-1454
2013-11-08 15:30:37 +00: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
Julia Hansbrough
30dc3bc415 Command for retrying failed photo verifications
Includes test coverage
2013-11-06 18:56:59 +00:00
Gabe Mulley
5734cae1c3 emit enrollment event 2013-11-06 08:46:40 -05:00
brianhw
93dddf8dc3 Merge pull request #1585 from edx/brian/retry-email-after-dbtimeout
Add retries when encountering DatabaseError when updating InstructorTask.
2013-11-05 08:18:58 -08:00
Brian Wilson
7bef11a7f1 Add retries when encountering DatabaseError when updating InstructorTask. 2013-11-05 11:18:08 -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
Sarina Canelake
ea529b8841 Fix instructor api tests 2013-11-05 09:26:32 -05:00
Julia Hansbrough
1e2c0f50f7 Merge pull request #1529 from edx/flowerhack/feature/refunds-for-certificates
Flowerhack/feature/refunds for certificates
2013-11-04 13:33:10 -08:00
John Jarvis
471e439fc3 Merge pull request #1565 from edx/jarv/ungencertificates-http-optione
adds a new option to ungenerated_certs to use http in the callback url
2013-11-04 13:16:36 -08:00
Julia Hansbrough
448f5cc41f Response to CR 2013-11-04 20:32:47 +00: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
81661385fb More response to Dave's PR 2013-11-04 18:38:45 +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
Sarina Canelake
eb0e09d63f Clean up some instructor dash code 2013-11-04 11:38:43 -05:00