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

42735 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Brian Beggs
0971a2784a Allow watch_assets observer to use custom timeout value 
This has the effect of making the observer poll less regularly, which
allows developers to choose between rapid asset updates and resource
usage.
 2017-09-20 14:38:41 -04:00
Michael Roytman
282220dae5 refactor and add multiple filter functionality 2017-09-20 12:06:12 -04:00
Douglas Hall
bf3ecc6715 Revert "Initialize enterprise api client with provided user" 2017-09-20 11:24:45 -04:00
Douglas Hall
247f2835c1 Merge pull request #16060 from edx/revert-16001-zub/ENT-624-access-enterprise-api-with-request-user 
Revert "Initialize enterprise api client with provided user"
 2017-09-20 11:04:10 -04:00
Sofiya Semenova
b40ba4437b Merge pull request #16042 from edx/ssemenova/ed-1233 
Replace flakey PreRequisiteCourseTest.test_dashboard_message with Python unit test
 2017-09-20 10:22:11 -04:00
Brian Mesick
bf47ba855f Merge pull request #16014 from edx/bmedx/upgrade_django_openid_auth 
Upgrade edx-django-openid-auth
 2017-09-20 09:56:19 -04:00
Douglas Hall
610a4100af Revert "Initialize enterprise api client with provided user" 2017-09-20 09:55:02 -04:00
Awais Jibran
3e06d68112 Merge pull request #16025 from edx/aj/handle-rate-limit-s3 
BOTO:S3 handle rate limit exceed and do not expose 500 errors
 2017-09-20 18:47:50 +05:00
Noraiz Anwar
c25925c0e4 Merge pull request #16055 from edx/noraiz/EDUCATOR-1218 
upgrade lti-consumer xblock
 2017-09-20 16:04:32 +05:00
noraiz-anwar
6f5a4d54c2 upgrade lti-consumer xblock 2017-09-20 14:43:05 +05:00
Uman Shahzad
0ffac802e8 Bump edx-enterprise to 0.46.4. 2017-09-20 05:16:52 +05:00
Sofiya Semenova
b6aff95ab1 Removed flakey test 2017-09-19 16:36:03 -04:00
Sofiya Semenova
19e7d1e0cf Ed-1233 replace flaky bokchoy test with python test 2017-09-19 16:12:40 -04:00
Alex Dusenbery
42829bd272 EDUCATOR-1103 | Restrict the number of courses to run a single opt-in query for. 2017-09-19 15:27:54 -04:00
Ned Batchelder
7a87509660 Merge pull request #16050 from edx/nedbat/fix-early-translation 
Have to use ugettext_lazy for import-time translations
 2017-09-19 15:17:02 -04:00