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

39315 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
562b48cfb2 Merge pull request #13911 from edx/benp/nodeenv 
Use nodeenv to manage node version in Jenkins builds
 2016-11-10 12:46:29 -05:00
Cliff Dyer
2c86a6ddd6 Merge pull request #13963 from edx/beryl/date-passed 
Add date_passed column to PersistentCourseGrade model
 2016-11-10 11:26:19 -05:00
Ned Batchelder
781d3c9b30 Merge pull request #13925 from stvstnfrd/up/settings/zendesk 
Fallback to default ZENDESK_URL when not in JSON
 2016-11-10 11:12:49 -05:00
J. Cliff Dyer
2bc35396fb Add date_passed column to PersistentCourseGrade model. 
The column is populated with the current timestamp when a passing grade
is persisted for the first time.  "Passing grade" is defined as having a
non-blank value for letter_grade.

TNL-5888
 2016-11-10 10:27:03 -05:00
Ben Patterson
c643c124c8 Merge pull request #13855 from edx/benp/correct-verbose-settings-i18ntests 
param typo
 2016-11-10 10:23:01 -05:00
Ben Patterson
b3a3d729a1 Use nodeenv to manage node version in Jenkins builds 
This change:
* gives us the flexibility of managing node from pull-request to pull-request. It'll be a huge lift to folks that want to test out node upgrades like @bjacobel or @andy-armstrong
* Sets us up for a port to Xenial, which will be accomplished in part by using nodeenv for managing the node environment. See a companion PR on the configuration repo for edxapp: edx/configuration#3444

This pull request does not:
* Attempt to solve any stability issues in builds related to node.
* Make node installs any faster
* Create any caching infrastructure to speed up node installs. They will be approximately as fast as they were before. Downloading the node bits build-to-build adds about 3 seconds, which is worth it for the added flexibility.
 2016-11-10 10:02:32 -05:00
Vedran Karačić
7e4c7d8c33 Merge pull request #13942 from edx/clintonb/verification-status-api 
[SOL-2126] Verification status endpoint
 2016-11-10 15:02:34 +01:00
Awais Jibran
e26849891d Merge pull request #13939 from edx/aj/fix-discussion-user-roles 
Fix discussion user roles
 2016-11-10 18:41:12 +05:00
Awais Jibran
92b99c7dc3 Fix discussion user roles 2016-11-10 17:11:52 +05:00
Muhammad Ammar
71cc602d93 Merge pull request #13863 from edx/ammar/tnl-4163-reduce-annotatorjs-search-calls 
Single search request to fetch notes per unit
 2016-11-10 16:23:59 +05:00
Douglas Hall
3224c027e3 Merge pull request #13955 from edx/ibrahimahmed443/WL-669-education-dropdown-capitalization 
fix inconsistent capitalization in education drop down
 2016-11-10 05:46:00 -05:00
Clinton Blackburn
12e2650630 Added photo verification status API endpoint 
ECOM-2470 & SOL-2126
 2016-11-10 10:26:23 +00:00
Douglas Hall
47a22b23bc Merge pull request #13940 from edx/hasnain-naveed/WL-613 
Wl-613 | Removing the example theme.
 2016-11-09 20:55:10 -05:00
alisan617
edd66a7f46 Merge pull request #13951 from edx/alisan/fix-minor-wrap-new-post-discussion 
Teams tab inline discussion new post form text wrap
 2016-11-09 20:26:54 -05:00
Ned Batchelder
496aaa5455 Merge pull request #13959 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-11-09 18:18:37 -05:00
Ned Batchelder
8a1825a4d0 Update translations (autogenerated message) 2016-11-09 22:24:10 +00:00
Ned Batchelder
6bf2c37144 Update translations (autogenerated message) 2016-11-09 21:47:55 +00:00
Jeremy Bowman
f05899b2ba Merge pull request #13930 from edx/PLAT-1074 
PLAT-1074 Add support for django-user-tasks
 2016-11-09 15:11:26 -05:00
Douglas Hall
92995b42ec Merge pull request #13935 from edx/douglashall/WL-798 
WL-798 Allow for hiding course mode banners on student dashboard
 2016-11-09 14:36:04 -05:00
Jeremy Bowman
3ee8fc130c PLAT-1074 Add support for django-user-tasks 2016-11-09 14:12:09 -05:00
Attiya Ishaque
9728759df2 Merge pull request #13662 from edx/atiya/TNL-5621-Duplicate-discussion 
TNL-5621 Fix discussion topics in MIT course.
 2016-11-09 23:30:24 +05:00
attiyaishaque
76e1d4a75c TNL-5621 Fix discussion topics in MIT course. 2016-11-09 22:26:48 +05:00
M. Rehan
c873be0f55 Merge pull request #13868 from edx/mrehan/tnl-5721-nonetype-no-attr-course-id 
TNL-5721 – Fix check source module access before appending it to required modules
 2016-11-09 22:19:59 +05:00
Douglas Hall
ec7245537a Allow for not showing course modes on student dashboard 2016-11-09 11:39:29 -05:00
Ned Batchelder
a0c5cc7e4f Update translations (autogenerated message) 2016-11-09 15:55:41 +00:00
Qubad786
c7364a06a4 handle if required module(s) for conditional module are staff only 2016-11-09 20:11:33 +05:00
Ibrahim
122f718ce5 fix inconsistent capitalization in education drop down 2016-11-09 14:58:15 +05:00
Hasnain
a29a2d4dbb Wl-613 | Removing the example theme. 2016-11-09 06:51:50 +00:00
Mushtaq Ali
237ef00a2b edxnotes stub server to support multiple usage id search - TNL-5605 2016-11-09 11:13:15 +05:00
Brian Beggs
07b2b1a919 Merge pull request #13944 from edx/bbeggs/pillow-upgrade 
Upgrade Pillow CVE-2016-9190 CVE-2016-9189
 2016-11-08 23:46:32 -05:00
Nimisha Asthagiri
2d4feeac43 Merge pull request #13943 from edx/beryl/opt-grade-task 
Optimize async grades computation
 2016-11-08 22:22:01 -05:00
Nimisha Asthagiri
266bfb1ab3 Optimize async grades computation 
TNL-5909
 2016-11-08 19:22:30 -05:00
Brian Beggs
55e4813f3a Upgrade Pillow CVE-2016-9190 CVE-2016-9189 2016-11-08 16:58:34 -05:00
alisan617
f47b4cd8ff no float 2016-11-08 15:46:09 -05:00
Christopher Lee
8a784eef24 Merge pull request #13949 from edx/release-2016-11-08-conflict 
Release 2016 11 08 conflict
 2016-11-08 15:32:16 -05:00
alisan617
371c5a244e Merge pull request #13843 from edx/alisan/testing-discussion 
Refactor discussion tab UI code into parts to be reusable for inline discussions TNL-5669
 2016-11-08 15:30:39 -05:00
muhammad-ammar
753d78210a single search request to fetch notes for HTML components per unit 
TNL-4163
 2016-11-09 01:28:13 +05:00
sanfordstudent
1c5d1f1c0d Merge pull request #13867 from edx/efischer/grades_bug_bash 
Update course grade query parameters and check scores when updating subsection grade
 2016-11-08 15:16:47 -05:00
Brian Jacobel
f796cf7262 Merge pull request #13860 from edx/bjacobel/susy 
Update to UXPL 0.17 (grids compilation performance work)
 2016-11-08 15:15:45 -05:00
John Eskew
cd522358f2 Merge pull request #13706 from edx/jeskew/move_embargo_out_of_common 
Move embargo from common to openedx/core/djangoapps.
 2016-11-08 14:38:24 -05:00
christopher lee
d3c3a9a63d Merge branch 'release' into release-2016-11-08-conflict 2016-11-08 14:23:57 -05:00
alisan617
e80d9b5792 Refactor discussion tab UI code into parts to be reusable for inline discussions 
TNL-5669
 2016-11-08 14:17:01 -05:00
Sanford Student
6e52fd791f fixes from robust grades bug bash 
Update course grade query parameters and check scores when updating subsection grade

For TNL-5861
 2016-11-08 14:16:03 -05:00
Jesse Zoldak
246bd19ee4 Merge pull request #13948 from edx/revert-13936-clintonb/verification-admin-update 
Revert "Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for id_copy_id_photo_from field"
 2016-11-08 13:33:42 -05:00
Jesse Zoldak
3027db4b5b Revert "Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for id_copy_id_photo_from field" 2016-11-08 13:31:14 -05:00
Christopher Lee
af71a2710b Merge pull request #13919 from edx/release-candidate 
Release Candidate rc/2016-11-08
 2016-11-08 12:55:52 -05:00
Clinton Blackburn
ba1aadca99 Merge pull request #13936 from edx/clintonb/verification-admin-update 
Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for id_copy_id_photo_from field
 2016-11-08 12:33:38 -05:00
Clinton Blackburn
fd0880ae23 Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for id_copy_id_photo_from field 2016-11-08 11:38:27 -05:00
Gregory Martin
08c5a35899 Merge pull request #13923 from edx/yro_fix-PR-13794 
Yro fix PR 13794
 2016-11-08 10:06:16 -05:00
Toby Lawrence
f29a508d4f Merge pull request #13928 from edx/bugfix/forums-enable-data-migration 
Provide a default configuration for forums if none already exists.
 2016-11-08 09:16:56 -05:00