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

14265 Commits

Author SHA1 Message Date
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
Diana Huang
0018568799 Merge pull request #1555 from edx/diana/certs-reverification-path 
Verified Certificate Reverification Path
 2013-11-04 08:31:56 -08:00
Greg Price
2123d5e7ae Merge pull request #1570 from edx/gprice/forum-staff-label 
Remove label from forum posts by global staff
 2013-11-01 13:10:54 -07: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
Greg Price
c4cdb457de Remove label from forum posts by global staff 
The motivation for this change is performance. The forums UI code gets
the list of users for each role and renders the staff label based on
those lists. The list for the staff role is expensive to compute because
there is no index on the is_staff attribute, and we cannot create one
because the User model is built into django.

Users with is_staff=True are still assigned the Moderator role upon
enrolling in a course, so this change will have no practical effect
except that a user who is granted staff privileges after enrolling in a
course will have to be made a Moderator in order for their posts to be
labeled.

Additionally, the UI did not use the list of users with the Student
role, so that list has been removed as well.
 2013-11-01 14:16:55 -04:00
John Jarvis
f0b074b880 also adding insecure option to regenerate_user command 2013-11-01 12:05:59 -04:00
John Jarvis
ff8c58f5ee adds a new option to ungenerated_certs to use http in the callback url 2013-11-01 11:49:12 -04:00
Sarina Canelake
fff36275db Implement background email tasks on student dash 
LMS-1244
 2013-11-01 09:20:34 -04:00
Diana Huang
17610edf77 Code cleanup due to review comments 
* make `user_status` more intelligent
* remove some logic from the templates
* rename `parse_error_msg` to `parsed_error_msg`
* fix up and add more tests

LMS-1387
 2013-10-31 15:01:39 -04:00
Diana Huang
5389d6b7cf Remove DAYS_GOOD_FOR from being a class variable. 
LMS-1387
 2013-10-31 15:01:39 -04:00
Victor Shnayder
d939a61e93 Update error messages and copy for re-verification flow 2013-10-31 15:01:39 -04:00
Julia Hansbrough
70b7ac41c0 Merge pull request #1493 from edx/flowerhack/fix/wiki-textarea-trap 
Fixing accessibility bug where users could not tab through on wiki
 2013-10-31 10:02:29 -07:00
Brian Wilson
782a07e0ea Add datadog stats for duplicate subtask and subtask update errors. 2013-10-30 17:09:40 -04:00
Sarina Canelake
b86e912905 Make event handlers fire properly 
Respond to review comments

LMS-1242
 2013-10-30 13:43:39 -04:00
Sarina Canelake
57a57e8af7 Move PIT code into util.coffee 
Add testing coverage
LMS-1242

Add "Edit This Course In Studio" link for studio courses
LMS-1291
 2013-10-30 13:43:39 -04:00
Sarina Canelake
123e18109d Reorganize Course Info dash section 
LMS-1242
 2013-10-30 13:43:39 -04:00
Sarina Canelake
9330ef65a8 Enable Pending Tasks section on new dash 
Add Pending Tasks section to the following tabs:
* Course Info
* Student Email
* Data Download
* Email

LMS-1242
 2013-10-30 13:43:39 -04:00
Greg Price
87e0ddf398 Fix a typo that caused an error to be raised 2013-10-30 11:18:27 -04:00
Sarina Canelake
9cea6ab599 Copy changes to Inst Dash email 2013-10-30 10:03:29 -04:00
Don Mitchell
80c83f0b88 Merge pull request #1508 from edx/dhm/expect_json 
Change expect_json to put parsed json in new attr
 2013-10-29 14:02:32 -07:00
Don Mitchell
45453fae61 Change expect_json to put parsed json in new attr 2013-10-29 16:13:58 -04:00