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

42569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Armstrong
6e10d2a556 Update to use Bootstrap beta release 
FEDX-375
 2017-09-06 22:49:05 -04:00
Gregory Martin
a51b9597e2 Merge pull request #15953 from edx/yro/update_cert_display_date 
Update Cert Display Date
 2017-09-06 16:10:41 -04:00
Jeremy Bowman
f15a686775 Merge pull request #15965 from edx/jmbowman/pytest_compatibility 
pytest compatibility fixes
 2017-09-06 16:03:26 -04:00
Eric Fischer
804dc36164 Merge pull request #15964 from edx/efischer/ora_again 
edx-ora2 2.1.1
 2017-09-06 15:48:49 -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
Gregory Martin
4d59eff8f6 Update cert display date 
EDUCATOR-1266
 2017-09-06 15:17:27 -04:00
Eric Fischer
179774e107 edx-ora2 2.1.1 2017-09-06 14:40:11 -04:00
Jeremy Bowman
ded294c420 pytest compatibility fixes 2017-09-06 14:20:34 -04:00
Jeremy Bowman
d342a56286 Merge pull request #15962 from edx/jmbowman/pytest_database 
Fixes for pytest database usage
 2017-09-06 14:14:07 -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
Sofiya Semenova
038d5182ec Merge pull request #15922 from edx/ssemenova/ed-1101 
"View/Request Certificate" button logic on progress page and dashboard
 2017-09-06 11:20:21 -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
Muzaffar yousaf
f1c574cf63 Merge pull request #15565 from jspayd/caption-centering 
Fix video caption centering
 2017-09-06 17:38:31 +05: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
Sofiya Semenova
f3f7e78e24 educator-1101 view/request certificate button logic on progress page and dashboard 2017-09-05 15:29:22 -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
Eric Fischer
29f6d5d610 Merge pull request #15954 from edx/ora/2.0.5 
ORA patch release
 2017-09-05 14:55:25 -04:00
Brittney Exline
89a7eb7e3e Merge pull request #15950 from edx/bexline/ENT-496_follow_up 
ENT-496 Set consent_granted to None when calling enterprise-course-enrollment endpoint
 2017-09-05 14:34:44 -04:00
Eric Fischer
a67f9ee7ff ORA patch release 2017-09-05 14:03:41 -04:00
Brittney Exline
ba597331d7 ENT-496 Set consent_granted to None when calling enterprise-course-enrollment endpoint 
Since we have a separate call to grant consent, we shouldn't try to set that value on
the enterprise course enrollment anymore, because it causes errors.
 2017-09-05 13:32:24 -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
Brian Mesick
94400d21b6 Merge pull request #15936 from edx/bmedx/oauth_token_delete_setting 
Add default OAUTH_DELETE_EXPIRED to LMS settings
 2017-09-05 11:04:13 -04:00
Harry Rein
d36304dc25 Allow social usernames to contain periods. 
LEARNER-2453
 2017-09-05 10:48:41 -04:00
Nimisha Asthagiri
01e4124377 Merge pull request #15945 from edx/ret/pin-ace-version 
PIN version number of ACE
 2017-09-01 16:20:30 -04:00
Andy Armstrong
247cbfe558 Merge pull request #15943 from edx/andya/fix-learner-profile 
Fix learner profile bug and tests that didn't catch it
 2017-09-01 14:59:04 -04:00
Nimisha Asthagiri
7953322faf PIN version number of ACE 2017-09-01 14:58:48 -04:00
Eric Fischer
94aed66128 Merge pull request #15944 from edx/efischer/revert_ora_release 
Revert "Merge pull request #15939 from edx/efischer/ora_204"
 2017-09-01 14:33:11 -04:00
Andy Armstrong
5128a4f5b7 Fix learner profile bug and tests that didn't catch it 2017-09-01 13:44:26 -04:00
Brian Mesick
1a77b98f6c Merge pull request #15904 from edx/bmedx/pdfjs_add_zh-hans 
Add zh_HANS language mapping to pdfjs
 2017-09-01 13:09:29 -04:00
Eric Fischer
44013d700e Revert "Merge pull request #15939 from edx/efischer/ora_204" 
This reverts commit a403fd1491, reversing
changes made to b31287e264.

500 errors on prod, need to rethink this fix.
 2017-09-01 12:57:39 -04:00
Brittney Exline
740aad4c77 Merge pull request #15923 from edx/saleem-latif/ENT-608 
ENT-608: edx-enterprise version upgrade to 0.42.0
 2017-09-01 12:53:57 -04:00
Attiya Ishaque
66ef2cabb7 Merge pull request #15924 from edx/ai/EDUCATOR-1267-add-logs 
EDUCATOR-1267 Add logs in importing the course.
 2017-09-01 21:37:03 +05:00
Gabe Mulley
0a9a4b1f05 Merge pull request #15942 from edx/ret/restrict-ace-deps 
restrict ace deps
 2017-09-01 11:43:13 -04:00
bmedx
bad68f8b1e Add default OAUTH_DELETE_EXPIRED to LMS settings 2017-09-01 11:06:54 -04:00
bmedx
8aabd27081 Add zh_HANS language mapping to pdfjs and EDX_README 2017-09-01 10:56:35 -04:00
Gabe Mulley
873f7cbd8d restrict ace deps 2017-09-01 10:44:05 -04:00
Saleem Latif
8fe73a9b3e edx-enterprise version upgrade to 0.42.0 2017-09-01 10:24:45 -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
Nimisha Asthagiri
c08060a0bb Merge pull request #15745 from edx/ret/triggered-email 
RET triggered emails
 2017-08-31 20:44:43 -04:00
Eric Fischer
a403fd1491 Merge pull request #15939 from edx/efischer/ora_204 
edx-ora2 2.0.4 release
 2017-08-31 19:49:26 -04:00
Eric Fischer
d02c580123 edx-ora2 2.0.4 release 2017-08-31 17:21:24 -04:00
Gabe Mulley
6a36eb0183 Use ACE to 'send' Recurring Nudge emails 2017-08-31 16:58:08 -04:00