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

6978 Commits

Author SHA1 Message Date
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
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
Adam Palay
71b70bce61 makes beta dash count active users in enrollment count [AN-115] 2013-11-08 14:11:59 -05: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
Will Daly
4e9de855d1 Merge pull request #1567 from edx/will/acceptance-test-asset-pipeline 
Acceptance tests use asset pipeline
 2013-11-08 09:39:19 -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
Waheed Ahmed
de8b378dd9 Merge pull request #1610 from waheedahmed/wah/bugfix/lms1265-import-jquery 
import jquery in reset password template
 2013-11-08 07:54:41 -08: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
bd5abc89ce Merge pull request #1600 from mulby/gabe/reapply-enrollment-event 
re-apply backed out enrollment event changes
 2013-11-07 12:38:04 -08:00
Usman Khalid
e459e4d099 a11y imporvements to wiki/history.html 
LMS-1309
 2013-11-07 21:06:40 +05:00
Waheed Ahmed
ebc9f742fb import jquery in reset password template 
LMS-1265
 2013-11-07 20:16:48 +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
f17ab1ec73 Merge pull request #1533 from mulby/gabe/enrollment-event 
emit enrollment events
 2013-11-06 10:29:44 -08:00
Gabe Mulley
5734cae1c3 emit enrollment event 2013-11-06 08:46:40 -05:00
David Baumgold
3895a3fa52 Merge pull request #1581 from antoviaque/registration-optional 
registration-optional: Allow to hide some optional registration fields #os
 2013-11-05 10:25:31 -08:00
John Jarvis
2e05c0da13 Merge pull request #1591 from edx/jarv/theme-name 
setting THEME_NAME to None when it's set to an empty string
 2013-11-05 09:38:22 -08: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
John Jarvis
f78508116f setting THEME_NAME to None when it's set to an empty string 2013-11-05 11:14:56 -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
Xavier Antoviaque
08dffa12cc registration-optional: Allow to hide some optional registration fields 
Allow to control which of the optional fields from the registration page
are being displayed to the user. Added the configuration variable
`REGISTRATION_OPTIONAL_FIELDS` to control which ones. The default value
shows all the fields as currently; to not display some of the fields,
set the configuration variable with only the fields you want to display:

```
REGISTRATION_OPTIONAL_FIELDS = [
    'level_of_education',
    'gender',
    'year_of_birth',
    'mailing_address',
    'goals'
]
```
 2013-11-05 11:50:29 +01: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
Greg Price
3256ec2df8 Merge pull request #1559 from edx/gprice/cs-commentable-ids-param 
Avoid CS search endpoint for non-search queries
 2013-11-04 13:26:11 -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
Will Daly
7830bb203f Acceptance tests use asset pipeline 2013-11-04 14:04:04 -05: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
b0fcadad31 Moved #unenroll-modal to different template 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
Adam
4b473b9b8e Merge pull request #1578 from edx/adam/fix/registration-page-wording 
"Public Display Name" -> "Public Username" on registration page [LMS-139...
 2013-11-04 09:57:00 -08:00
Giulio Gratta
5c0c7ba6bb Merge pull request #1560 from edx/giulio/a11y-user-menu 
User menu a11y changes to allow use of spacebar, escape key and arrows to navigate
 2013-11-04 08:53:46 -08: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