Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,549 Commits 1 Branch 0 Tags
5f2ffbe75bed60dc8958bbce90eefb4aebb84a30
Commit Graph

39549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanford Student
5f2ffbe75b implementation of grading events 
for TNL-5045
 2016-12-07 14:47:08 -05:00
Brittney Exline
5d4514d716 Merge pull request #14099 from edx/release 
Hotfix Dec-1-2016 and Release Dec-6-2016
 2016-12-06 15:59:46 -05:00
Brian Jacobel
dcfbfd5d25 Merge pull request #14106 from edx/bjacobel/certificate-icons 
Fix sharing icons on certificate page at narrower resolutions
 2016-12-06 15:43:12 -05:00
Brittney Exline
9e137b943b Merge pull request #14091 from edx/release-candidate 
Release Candidate rc/2016-12-06
 2016-12-06 14:45:22 -05:00
sanfordstudent
09281a31fb Merge pull request #14105 from edx/sstudent/TNL-6065 
move course version repopulation to runtime layer
 2016-12-06 13:39:40 -05:00
Sanford Student
44074f30a2 move course version repopulation to runtime layer 
for TNL-6065
 2016-12-06 10:22:13 -05:00
Jeremy Bowman
7a7c73de85 Merge pull request #14109 from edx/user_tasks_upgrade 
Upgrade django-user-tasks to resolve makemigrations issue
 2016-12-06 09:29:47 -05:00
Mushtaq Ali
d34d0b02ad Merge pull request #14110 from edx/mushtaq/edxval-version-bump 
edx-val version bump
 2016-12-06 19:01:17 +05:00
Mushtaq Ali
313493b75c edx-val version bump to 0.0.11 -TNL-6094 2016-12-06 15:24:16 +05:00
Brian Jacobel
a7f4720881 Merge pull request #14101 from edx/bjacobel/node6 
Prepare sub-dependencies for NPM 3 transition
 2016-12-05 22:36:54 -05:00
jmbowman
56defd4872 Upgrade django-user-tasks to resolve makemigrations issue 2016-12-05 21:46:18 +00:00
Christina Roberts
7b2239b5d2 Merge pull request #14072 from edx/christina/jsinput_title 
Allow passing through title to iFrame.
 2016-12-05 15:00:25 -05:00
cahrens
156b43ec0f Allow passing through title to iFrame. 
Also changes section to div.

TNL-6044
 2016-12-05 12:53:57 -05:00
Eric Fischer
3994615d2d Merge pull request #14090 from edx/efischer/alt_queues 
Get alternate queues from ENV_TOKENS
 2016-12-05 12:51:59 -05:00
Brian Jacobel
5cf59019f9 Fix sharing icons on certificate page at narrower resolutions 2016-12-05 12:12:44 -05:00
Max Rothman
30051a9e2c Merge pull request #14082 from edx/edx-django-release-util/0.2.0 
Change edx-django-release-util version.
 2016-12-05 11:07:42 -05:00
Brandon DeRosier
097b6417e1 Merge pull request #13958 from edx/bdero/celery-broker-tls 
Allow configuring TLS for celery broker
 2016-12-03 12:18:25 -05:00
Brian Jacobel
f7d2b8db68 Add deps brought in by UITK as top-level deps (peerDeps, eventually) 2016-12-03 12:15:00 -05:00
Nimisha Asthagiri
2bba4c2e80 Merge pull request #14093 from edx/naa/oops-grades-migration-fix 
Allow grades app to be zero-migrated
 2016-12-02 19:56:53 -05:00
Eric Fischer
8a4165f2d7 Allow grades app to be zero-migrated 2016-12-02 11:59:36 -05:00
Calen Pennington
b24c22804e Merge pull request #14047 from cpennington/safer-opaque-keys 
Safer opaque keys
 2016-12-02 10:44:36 -05:00
Eric Fischer
b610215e08 Get alternate queues from ENV_TOKENS 2016-12-02 10:32:00 -05:00
Ned Batchelder
d2b6c9ebad Merge pull request #14084 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-12-01 13:49:35 -05:00
Calen Pennington
42617545ec Remove paver handling for --failed (because nose already handles it) 2016-12-01 13:04:31 -05:00
Calen Pennington
fd0d69594a Upgrade to the latest version of opaque-keys 2016-12-01 13:04:31 -05:00
Ned Batchelder
7c46a850c0 Update translations (autogenerated message) 2016-12-01 16:12:20 +00:00
Christina Roberts
81ff20c029 Merge pull request #14080 from edx/christina/delete-javascriptinput 
Delete javascriptinput and javascriptresponse.
 2016-12-01 11:02:25 -05:00
Brian Beggs
6d593b5c07 Updating edx-django-release-util requirement to version 0.2.0 2016-12-01 10:36:45 -05:00
Eric Fischer
6ed02f3b73 Merge pull request #14067 from edx/efischer/staff_v_instructor 
Clarify instructor vs staff accessible features on dashboard
 2016-12-01 09:31:01 -05:00
cahrens
a949efc6b5 Delete javascriptinput and javascriptresponse. 
TNL-6034
 2016-12-01 09:14:04 -05:00
Attiya Ishaque
68166f3108 Merge pull request #14062 from edx/TNL-6017-checkbox-in-discussion 
TNL-6017 Receive Updates checkbox saved in discussion forums.
 2016-12-01 12:51:22 +05:00
attiyaishaque
be32d74afe TNL-6017 Receive Updates checkbox saved in discussion forums. 2016-12-01 11:25:44 +05:00
Nimisha Asthagiri
b2cd0359e5 Merge pull request #14032 from edx/beryl/unattempted-grade-report 
Update grade report to distinguish between Not Attempted and 0
 2016-11-30 18:03:07 -05:00
Eric Fischer
d294a91fb1 Clarify instructor vs staff accessible features on dashboard 
Using the guideline "Course staff should have access to features related to
individual learners, but not course-wide modifications", most tools on the
student admin sub-tab of the instructor dashboard should be available to
staff as well as instructors.

TNL-5907
 2016-11-30 15:36:37 -05:00
Gregory Martin
41e852fed5 Merge pull request #14059 from edx/yro_fix-montevideo-tz 
Yro fix montevideo tz
 2016-11-30 15:25:31 -05:00
Eric Fischer
264d1940bf Merge pull request #13989 from proversity-org/proversity/fix-removed-in-django-19-warning-studio 
Remove warning RemovedInDjango19Warnings in Studio
 2016-11-30 15:06:30 -05:00
Eric Fischer
bf64d17f0a Merge pull request #14071 from edx/efischer/reversify_migration 
Allow grades app to be zero-migrated
 2016-11-30 15:01:51 -05:00
Cliff Dyer
876cb596f0 Merge pull request #14065 from edx/cdyer/flakies-2016-11-29 
Mark flaky tests flaky
 2016-11-30 13:39:33 -05:00
Eric Fischer
33273eed4e rectify old require.js hackery 2016-11-30 12:48:21 -05:00
Nimisha Asthagiri
aca69f78f2 Update Subsection Grade Report to differentiate Not Attempted and 0 
TNL-5990
 2016-11-30 12:36:26 -05:00
Nimisha Asthagiri
3bb5617abd fixup! review comments 2016-11-30 12:36:25 -05:00
Nimisha Asthagiri
2aac2b9d86 Update Grade Report to distinguish between Not Attempted and 0 2016-11-30 12:36:25 -05:00
Nimisha Asthagiri
e87388e24c Grades cleanup before updating grade report 
Remove deprecated SingleSectionGrader.  TNL-5987
Remove display_name and module_id from Scores objects
Update CourseGradeFactory.__init__ to not be user-specific
Update some callers to use CourseGrade class instead of "summary" dict
Remove no longer needed course_grades.py module.
Renamed django signal from GRADES_UPDATED to COURSE_GRADE_CHANGED
 2016-11-30 12:36:25 -05:00
Ben Patterson
73c3066976 Merge pull request #14056 from edx/benp/fix-flaky-paver-test-pep8 
Fix flaky paver test pep8
 2016-11-30 12:33:45 -05:00
Kevin Falcone
1956e2cf4d Merge pull request #14077 from edx/jibsheet/upgrade-new-relic 
7 Months of bugfixes and features
 2016-11-30 12:06:09 -05:00
Gregory Martin
83cfeb9d88 update pytz, update ora-2 2016-11-30 11:44:48 -05:00
sanfordstudent
c740111b9c Merge pull request #14066 from edx/sstudent/TNL-5993 
Separating problem raw score changed and problem weighted score changed
 2016-11-30 11:19:08 -05:00
Kevin Falcone
2b88cf8300 7 Months of bugfixes and features 
https://docs.newrelic.com/docs/release-notes/agent-release-notes/python-release-notes
 2016-11-30 10:50:03 -05:00
Eric Fischer
47afbcf832 Allow grades app to be zero-migrated 2016-11-30 10:30:32 -05:00
Sanford Student
4eb5311ece Separating problem raw score changed and problem weighted score changed signals 
For TNL-5993
 2016-11-30 10:15:07 -05:00