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

20747 Commits

Author SHA1 Message Date
Daniel Clemente Laboreo
902f83c12b Add some blocks to course_about.html 2018-01-04 15:17:28 +02:00
Nimisha Asthagiri
ddfeb61b08 Delete old development config files 2018-01-03 17:26:09 -05:00
Matthew Piatetsky
277407f2a6 move course upsell 2018-01-03 13:51:55 -05:00
Michael Terry
66980b53cc Merge pull request #17060 from edx/mikix/ie-login-align 
Fix login box alignment in IE
 2018-01-03 08:51:10 -05:00
Noraiz Anwar
31fb4a1b19 Revert "temporary logs to check if anonymous user is accessing courseware" 2018-01-03 14:51:30 +05:00
noraiz-anwar
9d2fad7144 fix course staff ability to perform operations on instructor dashboard 2018-01-02 14:34:38 +05:00
Saleem Latif
26cc70a7bc Move enterprise specific code in student_account views to enterprise_support 2018-01-01 16:08:41 +05:00
Michael Terry
4e05d43345 Fix login box alignment in IE 
In IE 11, the login page form was being shown right-aligned on the
page. This is because of some IE interaction with margin: auto.
Removing that and relying on flexbox flow fixes it and makes the
form centered again.

LEARNER-3001
 2017-12-29 11:36:49 -05:00
Tasawer Nawaz
abf7b26b32 Exclude enterprise learners from the welcome email 
LEARNER-3649
 2017-12-28 15:49:45 +05:00
Uzair Rasheed
2fcd2830a0 Merge pull request #16993 from edx/LEARNER-3352/GA-event 
Send student course goal event to GA
 2017-12-28 13:59:29 +05:00
John Eskew
e67171b880 Merge pull request #16944 from edx/jmbowman/PLAT-1859 
PLAT-1859 Fix LMS shard 1 tests under Django 1.9
 2017-12-27 16:22:36 -05:00
John Eskew
523b46962c Merge pull request #17037 from edx/bmedx/django111_fix_teams_tests 
Fixes to teams tests in Django 1.9+
 2017-12-27 15:03:38 -05:00
Jeremy Bowman
1aebe11afc PLAT-1859 Fix LMS shard 1 tests under Django 1.9 2017-12-27 14:38:55 -05:00
John Eskew
c7671b75e5 Merge pull request #17036 from edx/jmbowman/PLAT-1863 
PLAT-1863 Fixes for LMS shards 2 and 3 tests under Django 1.9
 2017-12-27 14:26:50 -05:00
bmedx
da0858bbdf Add fixes for shoppingcart and discussions test failures 2017-12-27 13:42:42 -05:00
bmedx
0f897a7b3f Fixes to teams tests in Django 1.9+ 
- add edx.org to lms tests KNOWN_HOSTS
- Don't check CourseTeamMembership field mutability on creation
 2017-12-27 13:42:42 -05:00
uzairr
72c834ed12 Send student course goal event to GA 
Ensure an event is fired whenever a student updates/creates
its course goal.'edx.course_goal.created' and 'edx.course_goal.updated'
should be sent after creation and updation respectively.

LEARNER-3352
 2017-12-27 23:09:30 +05:00
Sofiya Semenova
edbdb78902 Merge pull request #16943 from edx/sofiya/ora 
Educator-1280 Force grade persist on changed enrollment track
 2017-12-27 12:07:18 -05:00
Ayub khan
872f571baf Merge pull request #17045 from edx/update-translations-26-dec 
updated translations
 2017-12-27 21:53:21 +05:00
Michael Terry
dce5da581c Merge pull request #17032 from edx/mikix/LEARNER-3709 
Fix a11y issues on course dashboard
 2017-12-27 10:51:47 -05:00
rabia23
b22a656c53 EDUCATOR-1930 change log message position in set_score method 2017-12-27 13:28:49 +00:00
ayub-khan
f50af67f15 updated translations 2017-12-27 16:38:58 +05:00
Gregory Martin
832a1f2e32 Merge pull request #16972 from edx/yro/add_discussions_tracking 
Add Forum Notifications Email Tracking
 2017-12-23 17:21:16 -05:00
Jeremy Bowman
bd9c7a082e PLAT-1863 Fixes for LMS shards 2 and 3 tests under Django 1.9 2017-12-22 16:53:01 -05:00
Brian Mesick
4ceba7ad64 Merge branch 'master' into bmedx/django111_httpretty_0814 2017-12-22 16:25:25 -05:00
Jeremy Bowman
e98420dd8d Merge pull request #16979 from edx/jmbowman/PLAT-1861 
PLAT-1861 Upgrade to pyfilesystem2
 2017-12-22 15:48:48 -05:00
Brian Mesick
5acb0f989b Merge pull request #16989 from edx/bmedx/django111_update_is_authenticated 
Remove unnecessary patches to User::is_authenticated
 2017-12-22 15:39:23 -05:00
bmedx
6ece1708a6 Make sure httpretty usage cleans up after itself 2017-12-22 15:36:46 -05:00
bmedx
23503f5226 Fix test issues with new httpretty 2017-12-22 15:36:45 -05:00
Gregory Martin
455a13d1f5 Add Forum Notifications Email Tracking 2017-12-22 15:21:26 -05:00
Jeremy Bowman
65472399df PLAT-1861 Upgrade to pyfilesystem2 2017-12-22 14:44:24 -05:00
bmedx
b5d6fca44e Update is_authenticated patches to work with Django 1.10+ 2017-12-22 13:22:49 -05:00
edx-pipeline-bot
48f2431618 Merge pull request #17014 from edx/release-mergeback-to-master 
Merge release back to master
 2017-12-22 13:16:39 -05:00
Michael Terry
fe014690ef Fix a11y issues on course dashboard 
Remove a broken and unneeded aria-controls= attribute and make an
id= attribute unique.

LEARNER-3709
 2017-12-22 13:11:32 -05:00
Sofiya Semenova
dd93e67b5d Force regrade on enrollment track change. 2017-12-22 12:03:04 -05:00
bmedx
bc72c28a03 Remove unnecessary patches to User::is_authenticated 2017-12-22 11:33:35 -05:00
Michael Terry
c065707e5d Fix button alignment on program dash 
The View Course button on the program dashboard was not right-aligned
with the rest of the UI. Now it is.

LEARNER-3733
 2017-12-22 11:17:58 -05:00
Zubair Afzal
beff9f42ee Merge pull request #16919 from edx/zub/ENT-768-display-friendly-error-message-for-saml 
ENT-768 Display friendly error message for SAML rejection
 2017-12-22 18:33:30 +05:00
Fred Smith
37dc15779a Merge pull request #17013 from edx/McKenzieW/learner-3704 
fix entitlement email settings list item class
 2017-12-22 08:08:57 -05:00
zubair-arbi
d7502acc5b ENT-768 
display friendly error message for saml rejection
 2017-12-22 15:12:11 +05:00
Harry Rein
579435bcd7 Merge branch 'master' into release-mergeback-to-master 2017-12-21 16:50:24 -05:00
McKenzie Welter
9cc4b4b609 fix entitlement eemail settings list item class 2017-12-21 16:40:09 -05:00
McKenzie Welter
a422190ec9 Revert "fix list item class" 
This reverts commit 42143114a5.
 2017-12-21 16:36:04 -05:00
McKenzie Welter
42143114a5 fix list item class 2017-12-21 16:32:03 -05:00
Harry Rein
b09f4fabf1 Show more sessions coming soon for entitlements without sessions. 2017-12-21 15:38:45 -05:00
Muhammad Ammar
b6f45955f5 Merge pull request #15803 from open-craft/replaceafill/OC-2594 
Auto-advance video toggle
 2017-12-22 01:29:24 +05:00
Michael Terry
29bacacaa3 Merge pull request #17000 from edx/mikix/LEARNER-3665 
Correctly align Verify Now button
 2017-12-21 14:14:18 -05:00
Michael Terry
09468f3f0e Merge pull request #16999 from edx/mikix/LEARNER-3668 
Don't wrap enroll button text
 2017-12-21 14:14:03 -05:00
Michael Terry
484cdbde6b Correctly align Verify Now button 
LEARNER-3665
 2017-12-21 13:05:38 -05:00
Michael Terry
f722ae22fe Merge pull request #16998 from edx/mikix/LEARNER-3717 
Keep related programs when unenrolling
 2017-12-21 12:47:36 -05:00