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

42750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Eric Fischer
a58df6c0fa Merge pull request #16027 from edx/dahlia/waffle 
Waffle flag for studio-frontend
 2017-09-22 08:06:12 -04:00
Uman Shahzad
a8df3d8844 Bump edx-enterprise to 0.46.8. 
This removes the `require_account_level_consent` field
without a migration.

The migration comes next.
 2017-09-22 15:09:38 +05:00
Douglas Hall
10a065990b Merge pull request #16064 from open-craft/uman/ent-0.46.5 
[ENT-644] Bump edx-enterprise to 0.46.7.
 2017-09-22 05:47:16 -04:00
Uman Shahzad
6355604b51 Ignore pending migrations for edx-enterprise temporarily. 2017-09-22 05:17:18 +05:00
sanfordstudent
5c88600fbf Merge pull request #16048 from edx/sstudent/EDUCATOR-1288 
Sstudent/educator 1288
 2017-09-21 16:48:46 -04:00
Eric Fischer
ac80183343 Add studio-frontend to studio, if waffle flag set 2017-09-21 16:45:12 -04:00
Eric Fischer
a830073bb2 Add waffle flag for NewAssetsPage 2017-09-21 16:45:12 -04:00
Sanford Student
d0e68f2d24 recalculate course grade on user partition change 2017-09-21 15:32:07 -04:00
McKenzie Welter
cc15081399 Merge pull request #16068 from edx/McKenzieW/learner-2457 
Fixing util to gather course_run data from catalog
 2017-09-21 14:27:05 -04:00
Gabe Mulley
fab1769be4 update nudge templates 2017-09-21 13:41:51 -04:00
McKenzie Welter
f846442233 language --> content_language and get_fields() actually returns 2017-09-21 13:25:40 -04:00
Andy Armstrong
de0380ca0e Merge pull request #16017 from edx/diana/profile-messaging 
LEARNER-2530: Messaging changes on Learner Profile
 2017-09-21 11:35:42 -04:00
Alex Dusenbery
d89afa0832 EDUCATOR-1207 | Run generate_course_overview command via celery task, in batches. 2017-09-21 11:26:59 -04:00
Fred Smith
74f1975afb Merge pull request #16063 from edx/release-mergeback-to-master 
Merge release back to master
 2017-09-21 11:19:48 -04:00
Feanil Patel
c66c04d937 Merge pull request #16059 from open-craft/cliff/pb-v2.7.6 
Bump problem-builder to 2.7.6.
 2017-09-21 11:00:50 -04:00
Diana Huang
cbfea6515d Add new info message to profile page. 2017-09-21 10:19:40 -04:00
Uman Shahzad
69a875a0de Bump edx-enterprise to 0.46.7. 2017-09-21 18:27:56 +05:00
Tasawer Nawaz
39cf0b44b5 Merge pull request #16056 from edx/tasawer/learner-2580/add-single-support-form 
Add single support form HTML and CSS
 2017-09-21 16:48:55 +05:00
tasawernawaz
07db2613d7 add single support form for contact us, html and css only 
LEARNER-2580
 2017-09-21 15:17:03 +05:00
Uman Shahzad
e785074560 Merge pull request #16053 from open-craft/uman/ent-0.46.4 
[ENT-428] Bump edx-enterprise to 0.46.4.
 2017-09-21 13:51:32 +05:00
Andy Armstrong
c68ad09773 Merge pull request #16002 from edx/andya/studio-sass-linting 
Fix validation issues with Studio Sass files
 2017-09-20 20:57:37 -04:00
Eric Fischer
673c60d4b0 Merge pull request #16051 from edx/efischer/build_on_bbeggs 
Efischer/build on bbeggs
 2017-09-20 15:43:48 -04:00
Sofiya Semenova
2faf3b1dfe Merge pull request #16052 from edx/ssemenova/flakey-test 
Remove flaky SettingsMilestonesTest.test_enable_entrance_exam_for_course
 2017-09-20 14:59:14 -04:00
Michael Roytman
f7a7fbd39b Merge pull request #16006 from edx/mroytman/EDU-1165 
refactor and add multiple filter functionality to assets.py
 2017-09-20 14:41:25 -04:00