Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Raposa
fb1d688670 Merge pull request #16091 from edx/robrap/LEARNER-2641 
LEARNER-2641: Add course goals bokchoy test.
 2017-09-26 11:30:49 -04:00
John Eskew
fe8f7f553d Merge pull request #16022 from edx/jeskew/toxify_edx_platform_testing 
Add tox testing to edx-platform.
 2017-09-26 11:14:11 -04:00
Tasawer Nawaz
d414693c1f Merge pull request #16074 from edx/tasawer/learner-2296/single-support-form-dynamic-elements 
Make username and courses dropdown dynamic  on single support form
 2017-09-26 19:46:09 +05:00
Robert Raposa
06aa8d8f38 Merge pull request #16097 from edx/robrap/fix-bokchoy-docker 
Fix bokchoy on docker.
 2017-09-26 10:44:29 -04:00
Diana Huang
d696677ce8 Merge pull request #15968 from edx/diana/header-updates 
LEARNER-2318: As a learner I should have an easy way to get to my learner profile
 2017-09-26 10:40:41 -04:00
Daniel Clemente Laboreo
adb6a5ac55 Use correct protocol in shared links (https/http) 2017-09-26 17:23:50 +03:00
Daniel Clemente Laboreo
7f7643b7b4 Encode URLs in shared links 
E.g. in "course-v1:edX+DemoX+Demo_Course" the "+" will become "%2B"
 2017-09-26 17:23:50 +03:00
Robert Raposa
407a43f827 Add course goals bokchoy test. 
LEARNER-2641
 2017-09-26 09:12:50 -04:00
Nimisha Asthagiri
9a07227ed2 Merge pull request #16082 from edx/naa/remove-old-waffles 
Remove unneeded WRITE_ONLY_IF_ENGAGED waffle switch
 2017-09-26 08:40:47 -04:00
tasawernawaz
9d827b7e0c make username and courses dropdown dynamic 
LEARNER-2679
 2017-09-26 16:51:14 +05:00
Uman Shahzad
ff0374e695 Remove any trace of enterprise_customer_users in ENT API. 2017-09-26 15:22:18 +05:00
Diana Huang
c8706044cc Merge pull request #16090 from edx/diana/remove-waffle-flag 
LEARNER-2443 Remove waffle flag for showing certs on profile.
 2017-09-25 17:52:32 -04:00
Robert Raposa
cec406e9dd Fix bokchoy on docker. 2017-09-25 17:21:02 -04:00
Diana Huang
de7e1ead7d Clicking the logo brings the user back to the dashboard. 2017-09-25 17:06:08 -04:00
Diana Huang
d26694fb5a Update help link for profile. 2017-09-25 17:06:08 -04:00
Diana Huang
1cfefe2457 Modify the header to show the learner profile. 
Remove the profile from the user dropdown.

LEARNER-2318
 2017-09-25 17:06:08 -04:00
Nimisha Asthagiri
083ccdb95a Remove unneeded WRITE_ONLY_IF_ENGAGED waffle switch 2017-09-25 16:13:07 -04:00
Uman Shahzad
a27688afd0 Bump to edx-enterprise to 0.48.1 2017-09-26 00:43:09 +05:00
Diana Huang
b5a0d0ce0a Remove waffle flag for showing certs on profile. 
Certs are displayed by default to everyone.
 2017-09-25 15:38:16 -04:00
Gabe Mulley
a2dc27e6b1 fix multi-course emails and update ACE 2017-09-25 14:07:08 -04:00
Sofiya Semenova
71ab4eccef Merge pull request #16087 from edx/ssemenova/ed-1315 
Educator-1315 Don't show processing message on dashboard if course is self-paced
 2017-09-25 13:59:59 -04:00
Sofiya Semenova
bfb61093a5 Educator-1315 Don't show processing message on dashboard if course is self-paced 2017-09-25 12:41:01 -04:00
John Eskew
be14aef51c Add tox.ini to enable tox testing. 2017-09-25 10:33:15 -04:00
John Eskew
4de2ad4c25 Upgrade lxml to use pre-built pkg - no longer requires Cython. 2017-09-25 10:33:15 -04:00
John Eskew
617085b5d1 Move psutil req from paver to base - used in non-test code. 2017-09-25 10:33:15 -04:00
John Eskew
550c1e0725 Use simpler contract spec to fix parsing error. 2017-09-25 10:33:14 -04:00
John Eskew
2194d390c8 Remove memory dump signal until meliae packaging issues are resolved. 2017-09-25 10:33:14 -04:00
John Eskew
9d93c75089 Remove unused EASE requirement. 2017-09-25 10:33:14 -04:00
John Eskew
8eb5945e39 Move Django requirement into separate file to enable tox testing. 2017-09-25 10:33:14 -04:00
Douglas Hall
167472da84 Merge pull request #16072 from open-craft/uman/ent-0.46.8 
[ENT-644] Bump edx-enterprise to 0.46.8.
 2017-09-25 10:09:35 -04:00
Brian Beggs
2d19136beb Merge pull request #16009 from edx/jmbowman/pytest_unit_tests 
PLAT-1677 Switch to pytest for unit tests
 2017-09-25 08:57:01 -04:00
Cliff Dyer
eb463bbd0d Merge branch 'master' into cliff/pb-v2.7.7 2017-09-22 16:29:08 -04:00
Diana Huang
c1bdc75c0c Merge pull request #16080 from edx/HarryRein/profile-section-stacking-issue 
LEARNER-2649: Fix issue with stacking on learner profile.
 2017-09-22 16:11:52 -04:00
Jeremy Bowman
ca97e946a6 Switch to pytest for unit tests 2017-09-22 16:07:53 -04:00
Diana Huang
ab44ea2b26 Merge pull request #16079 from edx/HarryRein/messaging-within-messaging-bug 
Fix issue with course message classes.
 2017-09-22 16:01:41 -04:00
Harry Rein
2ed389c7b0 Fix issue with stacking on learner profile. 2017-09-22 15:01:27 -04:00
Diana Huang
925cc7b850 Merge pull request #16078 from edx/diana/hide-explore-courses 
LEARNER-2521 - Only show 'Explore New Courses' button when courses are browsable.
 2017-09-22 14:44:51 -04:00
Harry Rein
fcf5f03b2d Fix issue with course message classes. 2017-09-22 14:38:04 -04:00
Nimisha Asthagiri
56676d821d Merge pull request #16077 from edx/naa/grades-refactor 
Grades: move out of temporary new folder
 2017-09-22 14:03:05 -04:00
Diana Huang
f7b5066bf9 Only show 'Explore New Courses' button when courses are browsable. 2017-09-22 13:50:55 -04:00
Harry Rein
75c22f563b Merge pull request #16071 from edx/HarryRein/LEARNER-2471-safari-sock-issue 
Fixing sock issue on master in safari.
 2017-09-22 13:09:54 -04:00
Gabe Mulley
3088c70f25 only override the upgrade deadline in self-paced courses 2017-09-22 12:48:38 -04:00
Harry Rein
2fa8fa2249 Merge branch 'master' into HarryRein/LEARNER-2471-safari-sock-issue 2017-09-22 12:17:15 -04:00
Harry Rein
990a8cbfe6 Merge pull request #16008 from edx/HarryRein/LEARNER-2307-course-goal-messaging 
LEARNER-2307: Course Goal Messaging
 2017-09-22 11:53:11 -04:00
Nimisha Asthagiri
22edaf7d24 Grades: move out of temporary new folder 
EDUCATOR-1400
 2017-09-22 11:49:46 -04:00
Nimisha Asthagiri
bdb078d027 Merge pull request #16075 from edx/naa/grades-remove-old-commands 
Grades: remove unneeded management commands
 2017-09-22 11:43:02 -04:00
Harry Rein
afe35acf80 Fixing sock issue on master in safari. 2017-09-22 11:02:36 -04:00
Alex Dusenbery
00dadc3a3a EDUCATOR-1402 | Fix flaky generate_course_overview test. 2017-09-22 09:59:56 -04:00
Harry Rein
bc76ffe5dc Add message for setting course goal. 
LEARNER-2307
 2017-09-22 09:56:27 -04:00
Nimisha Asthagiri
b2c6a53448 Grades cleanup: remove no longer needed management commands 
EDUCATOR-178
 2017-09-22 09:18:43 -04:00