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

1074 Commits

Author SHA1 Message Date
sanfordstudent
07ad189b9d Merge pull request #15263 from edx/sstudent/grade-override 
Learner grade override
 2017-07-18 14:33:27 -04:00
Sanford Student
932776159c EDUCATOR-165 instructor task and UI for overriding learner grades. 2017-07-18 13:51:56 -04:00
Andy Armstrong
33bee3f70b Refactor learner profile into openedx/features directory 
LEARNER-1855
 2017-07-18 12:30:12 -04:00
Albert St. Aubin
427967ea83 Working tests for the new Group moderator error messaging 2017-07-14 15:48:12 -04:00
Albert (AJ) St. Aubin
c78b84ca3f Merge pull request #15480 from edx/staubina/ed-592 
Staubina/ed 592
 2017-07-12 17:24:53 -04:00
Albert St. Aubin
b8b0110d15 Ui updates, Error messaging shown when discussion scheme is not selected 2017-07-12 12:49:54 -04:00
cahrens
bddc29a850 Remove last Mustache usage. 2017-07-12 12:08:59 -04:00
Ned Batchelder
5c4ece2968 Update translations (autogenerated message) 2017-07-06 15:17:35 +00:00
Harry Rein
7ea3b013ad Style LMS header, footer and nav for Bootstrap. 2017-07-04 17:24:12 -04:00
Ibrahim
33f9c46e1b fix issue where video modal is not closed by clicking outside the video 2017-07-03 17:20:21 +05:00
Sven Marnach
3460adc824 Merge pull request #14831 from open-craft/smarnach/immutable-emails 
Add feature flag to disable email address changes.
 2017-06-26 16:49:52 +02:00
Brittney Exline
611af39d53 ENT-447 Add ability to hide auth warnings for enterprise context. 
When a user comes in through an sso provider and arrives at the login
or registration page, there is a warning message that comes up to indicate
that the user has to take an action to sign in and register and thus
link their sso account to their edx account. However, it is confusing,
particularly for the enterpise context. This diff disables these messages
from being rendered if these pages are being shown in an enterprise context.
 2017-06-23 14:03:53 -04:00
Marko Jevtic
d48100d386 [LEARNER-1367] Move Program Marketing page from private themes repo to edx platform repo 
[LEARNER-311] Enable a purchase button on the Program page - platform (WL)
 2017-06-23 16:27:37 +02:00
Diana Huang
3d09290c14 Add a dismiss button to welcome message. 
Store user's preference indefinitely.
 2017-06-22 18:26:50 -04:00
Ned Batchelder
8dab37122c Update translations (autogenerated message) 2017-06-21 14:36:35 +00:00
Sven Marnach
f127a29d62 Add feature flag to disable email address changes. 2017-06-21 15:15:52 +02:00
cahrens
31d99e8d2d ED-549 Assign learner to a cohort before registration. 2017-06-16 10:23:13 +00:00
Andy Armstrong
0096c80a13 Refactor course search into openedx/features 2017-06-13 15:30:09 -04:00
Dmitry Viskov
0272b84fd0 Open Response Assessment tab for Instructor Dashboard - bugfix (prevent loading ORA Block more than one time) 2017-06-13 12:58:19 -04:00
Ned Batchelder
b5ed816be1 Update translations (autogenerated message) 2017-06-08 14:55:44 +00:00
Albert St. Aubin
99b6c3950e update to correct timing bug with render of Discussions 2017-06-07 12:09:52 -04:00
cahrens
32d445e06d Fix radio button layout issues. 
EDUCATOR-557
 2017-06-07 09:11:06 -04:00
Albert St. Aubin
fd7ac21608 Working publisher/subscriber events for Cohorts and discussions 2017-06-06 13:58:54 -04:00
cahrens
36c51450c2 Adds in radio button patch request and text for page 
EDUCATOR-229
 2017-06-05 13:00:31 -04:00
Albert St. Aubin
c23c0b991b EDUCATOR-141: Moved the Discussions Mgt to its own tab and updated tests 2017-06-05 12:59:51 -04:00
Uman Shahzad
13ac08a41f Allow configurable password reset support link. 
Defaults to SUPPORT_SITE_LINK intentionally.
Also fixed surrounding quality tests, and overall
quality improvements.
 2017-06-05 19:42:18 +05:00
Douglas Cerna
eaa02db6ae Added Terms of Service modal 2017-05-29 11:57:04 -06:00
Renzo Lucioni
2955a6e639 Remove credential listing from program list view 
The new design for the program detail page introduced a sidebar which includes a program-specific listing of credentials. This is an improvement over the old list of credentials found on the program list page and is meant to replace it. The new detail page is stable, so the credential listing on the program list page can be removed.

LEARNER-492
 2017-05-22 16:07:37 -04:00
Douglas Hall
52fbe6f1c7 Merge pull request #15144 from edx/saleem-latif/ENT-329 
ENT-329: Success Message for Account Activation for logged out users.
 2017-05-22 14:48:04 -04:00
Renzo Lucioni
a29a118cd1 Only allow enrollment in published runs on the program detail page 
Course runs indicated to be upcoming are also restricted to those runs that are published.

LEARNER-942
 2017-05-22 11:18:53 -04:00
Saleem Latif
727dd9f90b Success Message for Account Activation for logged out users. 2017-05-22 16:38:47 +05:00
AlasdairSwan
a929f09013 LEARNER-1040 Only show congratulations message on the program details page once the program certificate has been earned. 2017-05-19 12:31:14 -04:00
sanfordstudent
3278fcf1d6 Merge pull request #15045 from edx/neem/handle_unrescorable 
400 for non-rescorable blocks
 2017-05-16 10:36:33 -04:00
Renzo Lucioni
5314784a4d Handle expired enrollments on the program detail page 
Learners should be able to enroll in future runs of courses in which they have an expired enrollment. Previously, the course card model populated itself by selecting the first course run in which the user was enrolled. When the user tried to enroll in another run, nothing would happen because they were already enrolled in the run the page was trying to enroll them in.

Instead of blindly choosing the first run in which the user is enrolled, we now fall through to the same behavior we use for courses in which the user is not enrolled when the user has expired enrollments.

LEARNER-933
 2017-05-16 10:02:28 -04:00
Sanford Student
8cfff9a883 400 for non-rescorable blocks 2017-05-16 09:45:37 -04:00
Matthew Piatetsky
131cc0bdbb Remove old program detail page and Waffle switch gating the new page 
The new page is released and stable. The switch and old code are no longer necessary.

ECOM-7482
 2017-05-15 16:35:03 -04:00
Brittney Exline
69d85dc103 Merge pull request #14985 from open-craft/jill/update-registration-login 
ENT-332/ENT-333 Updates Register and Login as per new design
 2017-05-12 11:07:10 -04:00
Jillian Vogel
71ba54a963 Updates combined Register, Login, and Password Reset views as per new design 
* Reorders form fields, and updates labels, placeholders, and tip text
* Increases clickable area for links and labels.
* Removes "*" markers from required fields, and instead adds
  "(optional)" labels to visible optional fields.
* Updates font colors and sizes, and removes box shadows
* Adds custom drop-down styles
* Improves responsive design scaling for small screens
* Make Terms of Service and Honor Code open in new window to avoid losing form
  field values.
 2017-05-12 09:18:36 -04:00
Ned Batchelder
25aa711ec8 Update translations (autogenerated message) 2017-05-12 06:28:34 -04:00
Matthew Piatetsky
21c24eb99e Fix check for image url on program detail page 
LEARNER-886
 2017-05-09 16:02:56 -04:00
Matthew Piatetsky
e8c90847ce Add view course button 
This reverts commit 55268dec72.
 2017-05-03 16:37:26 -04:00
Christina Roberts
61316c3807 Merge pull request #14972 from edx/christina/ed11 
Renaming prep for allow discussions to be divided by enrollment tracks
 2017-04-28 11:00:09 -04:00
Matthew Piatetsky
a46453fc6a Merge pull request #14995 from edx/minor_tweaks 
ECOM-6602 Minor program progress fixes
 2017-04-27 15:22:53 -04:00
cahrens
31fbde9c1f Rename cohort methods to divided. 2017-04-27 14:58:08 -04:00
Matthew Piatetsky
fb0e9b7574 Minor program progress fixes 
ECOM-6602
 2017-04-27 14:02:32 -04:00
Matthew Piatetsky
ada78f5d3b Fix failing karma test 
ECOM-6602
 2017-04-27 11:31:51 -04:00
Ned Batchelder
44dd7be5b6 Update translations (autogenerated message) 2017-04-27 12:16:29 +00:00
Brittney Exline
2b48a5e7c5 Merge pull request #14920 from edx/bexline/registration_email 
ENT-304 Add confirm email field to registration
 2017-04-26 07:59:29 -04:00
attiyaishaque
4316731f70 TNL-4412 user is not enrolled as a beta tester when account is unactivated. 2017-04-26 10:54:15 +05:00
Brittney Exline
c2df64c3f8 ENT-304 Add confirm email field to registration 2017-04-25 18:35:29 +00:00