Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5629 Commits

Author SHA1 Message Date
Brian Mesick
e46c7fc516 Merge pull request #17096 from edx/bmedx/django111_lms_unit_1_failures 
Small fixes to LMS unit 1 failures in Django 1.11 tests
 2018-01-08 11:30:21 -05:00
Brian Mesick
9bb67e7f41 Merge pull request #17104 from edx/bmedx/django111_lms_unit_2_failures 
Small fixes to LMS unit 2 failures in Django 1.11 tests
 2018-01-08 10:47:52 -05:00
bmedx
95e76dcafe Small fixes to LMS unit 1 failures in Django 1.11 tests 2018-01-08 10:20:30 -05:00
Ahsan Ulhaq
1b2fdc058d Rate limited /oauth2/access_token/ 
There has been some reports about attack on /oauth2/access_token/.
This cause LMS to be down. This is being resolved by rate limiting the
endpoint.
LEARNER-3393
 2018-01-08 16:58:16 +05:00
Hasnain Naveed
c7743d41f9 Merge pull request #17071 from edx/hasnain-naveed/WL-1395 
WL-1395 | Added User profile for service users.
 2018-01-08 13:02:06 +05:00
Asad Iqbal
d894850513 Merge pull request #16950 from edx/asadiqbal08/ENT-772-Update-singin-UI 
ENT-772 - UI Updated to Support Ent Data Synchronization message
 2018-01-08 12:55:24 +05:00
bmedx
f7a36aae64 Small fixes to LMS unit 2 failures in Django 1.11 tests 2018-01-05 10:41:07 -05:00
Gabe Mulley
1a9434f967 fix analytics docs for the schedules app 2018-01-05 09:59:31 -05:00
asadiqbal
5d92b42fe3 UI Updates to Support Ent Data Synchronization 2018-01-05 17:16:02 +05:00
Matthew Piatetsky
57c45c6453 Merge pull request #16969 from edx/LEARNER-3058 
LEARNER-3058 Move hero upsell to sidebar
 2018-01-04 14:48:18 -05:00
Diana Huang
dd80638736 Merge pull request #17086 from edx/diana/i18n-sock 
Mark sock strings for translation.
 2018-01-04 11:29:15 -05:00
Diana Huang
b4e7d35095 Mark sock strings for translation. 2018-01-04 09:34:14 -05:00
Hasnain
2305fd9688 WL-1395 | Added User profile for service users. 2018-01-04 18:09:56 +05:00
Nimisha Asthagiri
2d6c9d459d Merge pull request #17039 from edx/pacing/upsell-date-translation 
Schedules: Fix date translation of upsell messaging
 2018-01-03 14:16:33 -05:00
Matthew Piatetsky
277407f2a6 move course upsell 2018-01-03 13:51:55 -05:00
Alex Dusenbery
792d0db5da Convert weekly highlights exception to warning. 2018-01-03 13:11:46 -05:00
Nimisha Asthagiri
a1047794e8 Schedules: Fix date translation of upsell messaging 2018-01-03 11:53:09 -05:00
Saleem Latif
26cc70a7bc Move enterprise specific code in student_account views to enterprise_support 2018-01-01 16:08:41 +05:00
Christopher Lee
96977fe2de Merge pull request #17058 from edx/clee/LEARNER-2353 
Use user's language preference on bookmark page
 2017-12-29 14:18:49 -05:00
christopher lee
02a98a7232 Use user's language preference on bookmark page 2017-12-29 13:11:00 -05:00
Awais Jibran
13d738fbb6 Improving logging over generate cert button on progress page. 
EDUCATOR-2017.
 2017-12-28 15:19:42 +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
bmedx
39ad7efcbf Add a fix to CourseOverviews::pre_requisite_courses 2017-12-27 13:42:42 -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
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
Matt Tuchfarber
486f9578b7 Merge pull request #16856 from open-craft/mtyaka/template-block-overrides 
Allow theme template block overrides.
 2017-12-22 09:14:02 -05:00
zubair-arbi
d7502acc5b ENT-768 
display friendly error message for saml rejection
 2017-12-22 15:12:11 +05:00
Chandrakant Gopalan
f6f29ca49e Allow theme template block overrides. 
This allows an overridding template from a theme to inherit from the
same corresponding standard template.

This is useful when you only want to override one or more named blocks,
but otherwise make no modifications to the standard template.
 2017-12-22 09:41:35 +01:00
Harry Rein
579435bcd7 Merge branch 'master' into release-mergeback-to-master 2017-12-21 16:50:24 -05:00
Harry Rein
b09f4fabf1 Show more sessions coming soon for entitlements without sessions. 2017-12-21 15:38:45 -05:00
Harry Rein
55c740cb01 Don't show unpulished or un-upgradable seats in available sessions. 2017-12-21 13:04:58 -05:00
Harry Rein
cd892e51d2 Don't show unpulished or un-upgradable seats in available sessions. 2017-12-21 11:35:19 -05:00
Tasawer Nawaz
82051d0312 zendesk proxy and front end of support form updated + filuploading is disbaled 
LEARNER-3594
 2017-12-20 22:16:31 +05:00
Hasnain Naveed
9f921bf618 Merge pull request #16227 from edx/hasnain-naveed/WL-1282 
(WIP) WL-1282 | Created management command for automation of theme setup.
 2017-12-20 14:58:08 +05:00
Bessie Steinberg
a4fa04ec3e Merge pull request #16931 from edx/bessiesteinberg/WL-1288-registration-page-customization 
Add Job Title field to Registration Page
 2017-12-19 09:49:53 -05:00
Jeremy Bowman
1dbdee9c54 Revert "PLAT-1858 Better capture of deprecation warnings" 2017-12-18 21:18:02 -05:00
Harry Rein
5e2c3e4bf5 Merge pull request #16933 from edx/HarryRein/LEARNER-3636-dont-show-expired-entitlements-unenrolled 
Do not show expired, unfulfilled entitlements on dashboards.
 2017-12-18 16:26:43 -05:00
Jeremy Bowman
0e52b4581f Merge pull request #16915 from edx/jmbowman/PLAT-1858 
PLAT-1858 Better capture of deprecation warnings
 2017-12-18 16:23:58 -05:00
Bessie Steinberg
b340174e12 Add Job Title field to Registration Page 
Add 'Job Title' as configurable field on the registration page.
Job Title will be saved to the 'meta' field of the 'userprofile' table.
 2017-12-18 16:20:11 -05:00
Harry Rein
75aa736dcf Do not show expired, unfulfilled entitlements on course/programs dashboard. 
LEARNER-3636
 2017-12-18 15:16:35 -05:00
Jeremy Bowman
b26fe5fd24 PLAT-1858 Better capture of deprecation warnings 2017-12-18 14:59:05 -05:00
Michael Terry
4fe60eb1e4 Show programs for expired entitlements 
The dashboard was not showing related programs for expired but
fulfilled entitlements.

LEARNER-3608
 2017-12-18 14:41:20 -05:00
Michael Frey
d48a1d5f46 Merge pull request #16926 from edx/mjfrey/LEARNER-3606 
Get only the first program from the list of matching entitlements.
 2017-12-18 07:41:52 -05:00
Saleem Latif
79d95e9caf Merge pull request #16691 from edx/saleem-latif/ENT-760 
[ENT-760]:  Disable linking of personal accounts to enterprise customers via SSO
 2017-12-18 16:31:51 +05:00
Saleem Latif
86da9c1c63 Disable linking of personal accounts to enterprise customers via SSO 2017-12-18 15:12:42 +05:00
Adeel Khan
5773001f75 Fix certificate's course title for xss tags injection. 
This fix would enable course author to selectively add
basic html tags to course title, while removing any
other injected tags that could execute javascript.

LEARNER-3491
 2017-12-18 14:08:22 +05:00
Michael Frey
3305a7c3ff Get only the first program from the list of matching entitlements. 
LEARNER-3606
 2017-12-17 17:32:52 -05:00
Waheed Ahmed
cd65d720ad Add save button with profile visibility dropdown. 
When a learner changes this dropdown from Full to Limited or
vice versa, nothing happens. This creates confusion, to fix
that add save button.

LEARNER-3239
 2017-12-15 13:03:33 +05:00
Jeremy Bowman
7ba83dd533 Merge pull request #16908 from edx/jmbowman/PLAT-1847 
PLAT-1847 Fix cms tests under Django 1.9
 2017-12-14 13:49:55 -05:00
Hasnain
1af7ee7433 WL-1282 | Created management command for automation of theme setup. 2017-12-14 17:24:39 +05:00