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

1647 Commits

Author SHA1 Message Date
Andy Armstrong
6e10d2a556 Update to use Bootstrap beta release 
FEDX-375
 2017-09-06 22:49:05 -04:00
Andy Armstrong
2d40854391 Merge pull request #15957 from edx/andya/learner-certificate-filtering 
Only show passing certificates on a learner profile
 2017-09-06 15:21:25 -04:00
Jeremy Bowman
97f5fe035b Fixes for pytest database usage 2017-09-06 13:15:34 -04:00
Jeremy Bowman
cebf6d3ea9 Merge pull request #15960 from edx/jmbowman/fragile_test_fixes 
Fixes for test order dependence
 2017-09-06 13:06:04 -04:00
Andy Armstrong
d05b62a283 Only show passing certificates on a learner profile 
LEARNER-2486
 2017-09-06 12:32:15 -04:00
Diana Huang
50c287ad90 Merge pull request #15949 from edx/diana/update-sock-copy 
Update sock copy.
 2017-09-06 12:16:27 -04:00
Jeremy Bowman
6fb7d63c9e Fixes for test order dependence 2017-09-06 11:31:37 -04:00
Jeremy Bowman
ae44f1840c Merge pull request #15951 from edx/jmbowman/ddt_cleanup 
ddt usage cleanup
 2017-09-06 11:19:39 -04:00
Harry Rein
d6e89e7bde Merge pull request #15956 from edx/HarryRein/LEARNER-2485-profile-issues 
LEARNER-2485: Fix styling issues on learner profile.
 2017-09-06 11:02:19 -04:00
Jeremy Bowman
fd6af6b05e ddt usage cleanup 2017-09-05 17:25:51 -04:00
Alex Dusenbery
0137e38e97 EDUCATOR-1241 | make a separate file to make decisions about auto generated certs. 2017-09-05 16:15:43 -04:00
Harry Rein
d0bc499f66 Fix styling issues on learner profile. 
LEARNER-2485

1) Joined Date is shown in bold and there is no line below to separate
it from the next section.
2) The bio shows up below the certificates.
3) Switching to 'limited profile' does not correctly hide the language,
location and joined date fields.
 2017-09-05 15:15:07 -04:00
Harry Rein
92d9327bab Merge pull request #15948 from edx/HarryRein/LEARNER-2453-social-link-period 
LEARNER-2453: Allow social usernames to contain periods.
 2017-09-05 11:51:57 -04:00
Diana Huang
020c027ff6 Update sock copy. 2017-09-05 11:06:09 -04:00
Harry Rein
d36304dc25 Allow social usernames to contain periods. 
LEARNER-2453
 2017-09-05 10:48:41 -04:00
Andy Armstrong
5128a4f5b7 Fix learner profile bug and tests that didn't catch it 2017-09-01 13:44:26 -04:00
Andy Armstrong
ff5c6f0c30 Merge pull request #15868 from edx/andya/profile-certificates 
LEARNER-1860: Course certificates on the learner profile
 2017-09-01 07:12:03 -04:00
Andy Armstrong
6f888d6995 Add course certificates on the learner profile 
LEARNER-1860
 2017-08-31 20:58:35 -04:00
Gabe Mulley
6a36eb0183 Use ACE to 'send' Recurring Nudge emails 2017-08-31 16:58:08 -04:00
Albert (AJ) St. Aubin
44b0738c84 Merge pull request #15928 from edx/aj/LEARNER-2420 
update to resolver complete my program purchase to work with no-id-pr…
 2017-08-31 14:51:22 -04:00
Albert St. Aubin
004f4b75a4 update to resolver complete my program purchase to work with no-id-professional 
LEARNER-2420
 2017-08-31 13:54:33 -04:00
Brittney Exline
c79be5bbc1 Merge pull request #15929 from edx/bexline/clean_saml_usernames 
ENT-619 Clean usernames coming from identity providers
 2017-08-31 13:09:42 -04:00
Brittney Exline
716a608f76 adding suggested test case 2017-08-31 10:56:07 -04:00
Clinton Blackburn
0a6029f7a7 Added verified upgrade hero to course run homepage 
Audit learners are now shown a prompt to upgrade to the verified track
of the course run. This message goes away after the learner upgrades.
 2017-08-30 17:01:27 -04:00
Bessie Steinberg
b1c7cdf415 Add profession & specialty fields to register page 
The site configurations can now set 'Profession' and 'Specialty' as
fields on the registration page.  The list of potential professions and
specialties to choice from can also be set from the site configurations
by setting 'PROFESSION_OPTIONS' and 'SPECIALTY_OPTIONS'.

WL-1098
 2017-08-30 14:20:11 -04:00
Brittney Exline
f844510b71 ENT-619 Clean usernames coming from identity providers 
Since we have started integrating with more clients, we have found that the usernames
that get passed are not compatible with our username restrictions. This PR introduces
a function to clean usernames to make them compatible, particularly in the auto registration
case.
 2017-08-30 13:36:57 -04:00
Jeremy Bowman
fa623f3faf Merge pull request #15919 from edx/jmbowman/testcase_usage 
Clean up TestCase subclassing
 2017-08-30 10:16:07 -04:00
Hasnain Naveed
e4deef9dd6 Merge pull request #15451 from edx/mjevtic/remove-waffle-switches 
LEARNER-1146 | Remove populate-multitenant-programs waffle switch
 2017-08-30 15:06:46 +05:00
Jeremy Bowman
32000c7a98 Clean up TestCase subclassing 2017-08-29 15:38:48 -04:00
Harry Rein
f42e6f1c5d Merge pull request #15826 from edx/HarryRein/LEANER-1859-social-profile-links 
LEARNER-1859: social profile links
 2017-08-29 14:43:30 -04:00
Harry Rein
9f88427f9b Add social links to learner profile. 
LEARNER-1859

Added fields to add social links to the user account settings file.
Added icons to the user profile when these links are set, only shown
when users show their entire profile. Added jasmine tests for account
settings and learner profile pages. Added python unit tests to test
validation on the user account.
 2017-08-29 13:53:08 -04:00
Jeremy Bowman
0d7806e0cd Fix tests that depend on execution order 2017-08-29 11:08:47 -04:00
Alex Dusenbery
9009a5b0d3 may_certify_for_course checks if course is self_paced. 2017-08-25 14:37:53 -04:00
Diana Huang
086e15c9b6 Update event naming for course sock. 
Only show course sock to English readers.
 2017-08-24 16:36:28 -04:00
Albert (AJ) St. Aubin
eff07af1c1 Merge pull request #15891 from edx/aj/LEARNER-2352 
Corrected issue with missing Certificated on Program Dashboard View
 2017-08-24 13:42:35 -04:00
Albert St. Aubin
eab62e786f Corrected issue with missing Certificated on Program Dashboard View 
LEARNER-2352
 2017-08-24 11:17:43 -04:00
Adam
5bc66274c3 Merge pull request #15849 from edx/fix-cg-dangling-pointer 
have coursegraph cache nodes on block_ids rather than locations (EDUC…
 2017-08-24 11:13:24 -04:00
Calen Pennington
9d2d98e2c8 Merge pull request #15882 from edx/ret/improve-site-config-factory 
Make SiteConfigurationFactory more useable
 2017-08-23 15:28:24 -04:00
Eric Fischer
599de36066 Merge pull request #15881 from edx/efischer/EDU-1189 
EDUCATOR-1189
 2017-08-23 15:17:56 -04:00
Calen Pennington
efcc154ab4 Make SiteConfigurationFactory more useable 2017-08-23 14:18:50 -04:00
Eric Fischer
5d44693603 EDUCATOR-1189 2017-08-23 10:41:21 -04:00
Jeff LaJoie
87db8fcff1 adds in null check for swap from auto track cohort management command 2017-08-23 08:59:44 -04:00
Hasnain
bb33a3aa25 LEARNER-1146 | Removed the flag and their corresponding code. 2017-08-23 14:58:47 +05:00
Diana Huang
40a5b066dc Merge pull request #15843 from edx/robrap/LEARNER-1858-show-join-date-2 
Support for joined date to profile.
 2017-08-22 15:43:49 -04:00
ayub-khan
e737728cde Updated Country Label and help text 
Country Label was causing confusions for learners if it was country of origin or in which they
are living so changed it to a more appropriate message.
LEARNER-174
Also updated some other error messages to some more appropriate error messages.
 2017-08-22 23:20:35 +05:00
Robert Raposa
7cc9400b91 Support for joined date to profile. 
LEARNER-1858
 2017-08-22 12:52:37 -04:00
Diana Huang
cb381a7cff Use an X icon instead of text. 2017-08-22 09:13:48 -04:00
McKenzie Welter
3e4d20e0d4 bundle purchase tracking 2017-08-21 11:22:52 -04:00
Andy Armstrong
82f7d6ee64 Convert /update_lang/ page to use Bootstrap 
LEARNER-1922
 2017-08-18 16:15:38 -04:00
Adam Palay
67d2ef6ebb have coursegraph cache nodes on block_ids rather than locations (EDUCATOR-1133) 2017-08-18 11:51:11 -04:00