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

39595 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Awais Jibran
2b1598f85b Merge pull request #14123 from edx/aj/filter-unpublish-courses-from-discovery 
Fix accidentally exposed Supply Chain course run
 2016-12-13 21:21:13 +05:00
Matjaz Gregoric
3c3b4f442f Merge pull request #14044 from open-craft/mtyaka/problem-builder-bump 
Bump problem-builder to v2.6.5
 2016-12-13 07:51:27 +01:00
Ben Patterson
a15be622bb Merge pull request #14133 from edx/benp/fix-flaky-video-trans 
Flaky video translations test fix.
 2016-12-12 16:01:33 -05:00
Brian Mesick
cc91ec7d79 Merge pull request #14115 from edx/bmedx/django-1.8.17 
PLAT1122 - Upgrade Django to 1.8.17
 2016-12-12 13:48:25 -05:00
Matjaz Gregoric
86177cba7f Bump problem-builder to v2.6.5. 
It includes support for course keys longer than 50 characters.

See: https://github.com/open-craft/problem-builder/pull/131
 2016-12-12 18:01:55 +01:00
Ben Patterson
4c48e6a307 Cleanup, remove flaky decorator. 2016-12-12 11:40:25 -05:00
Jesse Shapiro
da6303ad4d Merge pull request #14053 from open-craft/haikuginger/final-consent-hooks 
[ENT-61] Changes to accommodate consent logic on Enterprise app
 2016-12-12 11:05:59 -05:00
Mark Sadecki
3468ca345e Merge pull request #14121 from edx/cptvitamin/AC-680 
removes redundant alt attribute value
 2016-12-12 11:04:01 -05:00
Ben Patterson
ec6ea40bc6 Flaky test fix. 
Sadly, I introduce a time.sleep here. The hovering over the elements is
particularly brittle, and there is no obvious signal for when the page is
done rendering. I'm putting a sleep in here so we can more-quickly support
Firefox 45.
 2016-12-12 10:23:18 -05:00
Jesse Shapiro
fc814aee95 Add data sharing consent features for EnterpriseCustomer 2016-12-12 09:30:38 -05:00
Edward Zarecor
388ed8659b Merge pull request #14131 from edx/e0d/sec-223 
Add method attribute to make sure login, registration, password_reset…
 2016-12-12 09:21:31 -05:00
Mark Sadecki
33949571b7 adds a test so this doesn't regress again 2016-12-12 08:32:43 -05:00
Ben Patterson
0795e514cf Merge pull request #14120 from edx/benp/TNL-5453 
Fix TNL-5453
 2016-12-11 09:31:19 -05:00
Anthony Mangano
296faa546f Add method attribute to make sure login, registration, password_reset, and financial_assistance forms are always submitted via POST. SEC-223 2016-12-10 20:28:37 -05:00
Eric Fischer
bf2354697b Merge pull request #14087 from edx/efischer/tnl-5995 
Go back to comparing timestamps in has_database_updated_with_new_score
 2016-12-09 15:56:14 -05:00
Eric Fischer
5a98a90eba Use timestamps in _has_database_updated_with_new_score check 
Also fixes issue where ORA grades were never updated, by including
them in this check.

TNL-5994
TNL-5995
 2016-12-09 13:46:34 -05:00
Eric Fischer
d0be0ae8ec ORA2 and edx-submissions releases 2016-12-09 13:46:34 -05:00
Carol Tong
72f4178c8e Merge pull request #14127 from edx/carol/revert13576 
Update sidebar text re Activate permissions
 2016-12-09 13:07:33 -05:00
Carol Tong
b9afdd2e7b Update sidebar text re Activate permissions 2016-12-09 11:49:41 -05:00
Sven Marnach
6e801631d8 Merge pull request #14104 from open-craft/smarnach/enterprise-enrollment 
Changes required for the Enterprise app enrollment feature.
 2016-12-09 16:01:27 +01:00
Awais Jibran
8cb27a08e1 Fix accidentally exposed Supply Chain course run 
ECOM-6452
 2016-12-09 17:10:46 +05:00
Simon Chen
2e00fd58b0 Merge pull request #14116 from edx/schen/ECOM-5790 
Support the display of downloadable PDF course certs
 2016-12-08 17:57:45 -05:00
Marco Morales
1b5597afe9 Merge pull request #14070 from edx/marco/certificates-activate-role 
Allows course team to directly activate / disable web certificates
 2016-12-08 17:05:24 -05:00
Simon Chen
6dbfb3261e Support the display of downloadable PDF course certs ECOM-5790 2016-12-08 16:52:36 -05:00
Ben Patterson
00269212f9 Merge pull request #14088 from edx/benp/dont-skip-migration-test 
Don't skip migration test
 2016-12-08 16:35:07 -05:00
Mark Sadecki
8b9506211a removes redundant alt attribute value 2016-12-08 16:12:34 -05:00
Ben Patterson
62a9dd616d Ensure makemigrations test is called. 2016-12-08 15:22:10 -05:00
Ben Patterson
e77b4e9a21 Fix TNL-5453 2016-12-08 15:07:56 -05:00
Nimisha Asthagiri
6b40e6f2a6 Merge pull request #14117 from edx/beryl/rename-inaccessible 
Grade Report rename "Not Accessible" to "Not Available".
 2016-12-08 14:58:26 -05:00
Brittney Exline
9126f9a23f Merge pull request #14086 from edx/bexline/footer_add_enterprise 
ENT-11 Adding link to enterprise page in the footer
 2016-12-08 14:51:02 -05:00
Ned Batchelder
ed83c9bced Merge pull request #14119 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-12-08 14:45:50 -05:00
Ned Batchelder
95563dc661 Update translations (autogenerated message) 2016-12-08 18:31:44 +00:00
Brittney Exline
efaca4890f Merge branch 'master' into bexline/footer_add_enterprise 2016-12-08 12:48:20 -05:00
Sven Marnach
2690a77151 Changes required for the Enterprise app enrollment feature. 2016-12-08 17:53:31 +01:00
sanfordstudent
2b2ecd74a5 Merge pull request #14005 from edx/sstudent/TNL-5045 
grading events
 2016-12-08 09:42:22 -05:00
Nimisha Asthagiri
e29ada8c04 Grade Report rename "Not Accessible" to "Not Available". 2016-12-08 09:26:52 -05:00
bmedx
3376089e5d Adding myself to AUTHORS. 2016-12-08 08:56:54 -05:00
Mushtaq Ali
bbcb6c1344 Merge pull request #14113 from edx/mushtaq/edxval-version-bump-fix 
Fix edx-val version upgrade string
 2016-12-08 12:01:32 +05:00
Brittney Exline
a42bbd57fb ENT-11 Adding link to enterprise page in the footer 
Added enterprise link, moved media kit down to second line, and adjusted styling
to avoid wrapping when possible.
 2016-12-07 15:51:30 -05:00
Sanford Student
5f2ffbe75b implementation of grading events 
for TNL-5045
 2016-12-07 14:47:08 -05:00
bmedx
a29b936d1d PLAT1122 - Upgrade Django to 1.8.17 2016-12-07 13:32:24 -05:00
Tim Krones
ff7c2f8c85 Merge pull request #14085 from open-craft/itsjeyd/xblock-poll-update 
Update xblock-poll to v1.2.3
 2016-12-07 14:15:37 +01:00
Ahsan Ulhaq
07ffcfd7cc Merge pull request #14033 from edx/ahsan/ECOM-6324 
WL Enrollees on edX.org email list
 2016-12-07 15:35:29 +05:00
Ahsan Ulhaq
eb895fae82 WL Enrollees on edX.org email list 
ECOM-6324
 2016-12-07 14:11:48 +05:00
Mushtaq Ali
bd557e14ac Fix edx-val version upgrade string 2016-12-07 11:59:02 +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