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

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hasnain
4454899821 WL-615 | Fix the preview certificate link. 2016-11-10 14:15:03 +00: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
Ibrahim
daf6314782 make password reset message customizable 2016-11-10 17:18:17 +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
Clinton Blackburn
5122b27967 Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for copy_id_photo_from field 2016-11-09 20:44:35 -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
Douglas Hall
2b9e921bd0 Merge pull request #13964 from edx/patch/2016-11-09 
Patch Release 2016-11-09 Allow for not showing course modes on student dashboard
 2016-11-09 17:45:10 -05:00
Douglas Hall
a97a56af58 Merge pull request #13962 from edx/release-candidate 
Release candidate hotfix-2016-11-08
 2016-11-09 17:44:16 -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
Douglas Hall
0dd673b0c2 Allow for not showing course modes on student dashboard 2016-11-09 16:34:00 -05: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
Christopher Lee
2da026996d Merge pull request #13938 from open-craft/hotfix/2016-11-08 
Updates problem-builder to v2.6.1
 2016-11-09 13:20:06 -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
Brandon DeRosier
8c9aa7d3f3 Allow configuring TLS for celery broker 2016-11-09 12:14:42 -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
wajeeha-khalid
7ae05625ee MA-2871: return response_count on thread patch 2016-11-09 15:07:00 +05:00
Ibrahim
122f718ce5 fix inconsistent capitalization in education drop down 2016-11-09 14:58:15 +05:00
E. Kolpakov
f6ac90e873 Bumped DnDv2 to v2.0.12 (+fixed grading test, as DnDv2 now properly participates in scoring) 2016-11-09 12:35:57 +03: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
e6240c56fc Update generate_course_blocks management command. 2016-11-08 19:47:21 -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