Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Patterson
c3887b0b6b Fix lettuce tests for Xenial compatibility and newer Chrome version. 2017-02-20 17:21:29 -05:00
David Ormsbee
351c34816c Select related users when returning enrollments. 
Modify CourseEnrollment.enrollments_for_user to select the related user
object. This saves us from a bunch of redundant queries on the student
dashboard.
 2017-02-20 09:38:44 -05:00
Umar Nawaz
e6e32d7964 Merge pull request #14521 from edx/unawaz/ECOM-6949-sailthru-cookie-test 
Unawaz/ecom 6949 sailthru cookie test
 2017-02-19 23:19:09 -08:00
Albert (AJ) St. Aubin
18e03fbc88 Merge pull request #14502 from edx/TNL-6355_Button_Focus 
Updated the focus order for the action bar
 2017-02-18 12:54:25 -05:00
Albert St. Aubin
8e1fc5f5d3 Updated the focus order for the action bar 2017-02-17 22:46:17 -05:00
Simon Chen
f69e77e4fe Merge pull request #14540 from edx/schen/ECOM-6463 
Revert "edx.org/login?next= should not be able to point to an asset"
 2017-02-17 15:53:03 -05:00
Simon Chen
c38de9638c Revert "edx.org/login?next= should not be able to point to an asset" 
This reverts commit bc418c47c5.
 2017-02-17 14:53:57 -05:00
Eric Fischer
e04dbbe1e5 Merge pull request #14529 from edx/efischer/unclean_grades 
Unclean Grades
 2017-02-17 14:16:38 -05:00
Albert (AJ) St. Aubin
e3fe2f9780 Merge pull request #14533 from edx/aj/TNL-6552_upgrade_cookie 
update session cookie with the course id
 2017-02-17 11:09:42 -05:00
Eric Fischer
7d82f32f5b Fix issue with test ordering 
The second test here is not idempotent, so we must needs reset the
course before each test.
 2017-02-17 09:48:56 -05:00
Eric Fischer
fd1ed2ce6d Remove unneeded validation on grades model 
These checks are causing SQL query numbers to scale linearly with the
number of subsections being created/updated, and the errors they
check for have not been seen in prod.

TNL-6225
 2017-02-17 09:48:56 -05:00
Saleem Latif
be887833c3 Merge pull request #14538 from edx/saleem-latif/ENT-181 
ENT-181: Update edx-enterprise version to 0.22.0
 2017-02-17 18:30:25 +05:00
umar-nawaz
d2f370dd38 Sailthru cookie name statements in add_email_marketing_cookies function 2017-02-17 16:35:39 +05:00
Saleem Latif
d3082ddb2b Update edx-enterprise version to 0.22.0 2017-02-17 11:17:35 +05:00
Albert St. Aubin
13ee3056ff update session cookie with the course id 2017-02-16 14:41:37 -05:00
Diana Huang
d4b713caea Merge pull request #14536 from edx/diana/update-proctoring 
Update proctoring version.
 2017-02-16 13:38:37 -05:00
Jesse Zoldak
066704d6d1 Merge pull request #14534 from edx/zoldak/update-bok-choy 
Update bok-choy version to get performance improvements in FF
 2017-02-16 13:23:07 -05:00
Ned Batchelder
37218a0acc Merge pull request #14535 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-02-16 13:20:46 -05:00
Diana Huang
30d9324c44 Update proctoring version. 2017-02-16 12:56:50 -05:00
Ned Batchelder
9614b6eb07 Update translations (autogenerated message) 2017-02-16 16:51:11 +00:00
Jesse Zoldak
a4be39f96d Update bok-choy version to get performance improvements in FF 2017-02-16 11:10:19 -05:00
Ned Batchelder
318ae7b869 Update translations (autogenerated message) 2017-02-16 16:08:24 +00:00
Douglas Hall
bd678b4a17 Merge pull request #14531 from edx/hasnain-naveed/WL-979 
WL-979 | fix the "get_value_for_org" for str and list org.
 2017-02-16 10:25:01 -05:00
Ned Batchelder
833f82dce9 Merge pull request #14519 from edx/nedbat/idempotent-email-uniqueness-constraint 
An idempotent migration to add an email uniqueness constraint
 2017-02-16 09:58:07 -05:00
Sanford Student
0a5ec53189 moving main 2017-02-16 09:20:44 -05:00
Sanford Student
7fd5278060 just seeing what happens if i do this 2017-02-16 09:20:44 -05:00
Sanford Student
3df7286d72 moving tabindex 2017-02-16 09:20:44 -05:00
Hasnain
679f01303b fix the "get_value_for_org" for str and list org. 2017-02-16 16:26:17 +05:00
Ahsan Ulhaq
19d6e21a13 Merge pull request #14419 from edx/ahsan/ECOM-6463-login-should-not-point-asset 
edx.org/login?next= should not be able to point to an asset
 2017-02-16 15:56:58 +05:00
Ahsan Ulhaq
bc418c47c5 edx.org/login?next= should not be able to point to an asset 
ECOM-6463
 2017-02-16 14:44:01 +05:00
Christina Roberts
81ab0d81b9 Merge pull request #14524 from edx/christina/flaky-import-tests 
Update flaky decorators related to file upload.
 2017-02-15 13:24:58 -05:00
Simon Chen
5ca0ebcc56 Update embargo message with better language ECOM-7119 2017-02-15 12:51:17 -05:00
cahrens
76ee612862 Update flaky decorators related to file upload. 
PLAT-1186
 2017-02-15 12:04:03 -05:00
Ned Batchelder
98b250b66e A new django app for unicorn migrations 2017-02-15 11:40:05 -05:00
Stu Young
1bd30cffb8 Merge pull request #14492 from edx/estute/mark-flaky-bokchoy-tests 
Estute/mark flaky bokchoy tests
 2017-02-15 09:08:27 -05:00
Ned Batchelder
04557bbff3 Make this no-op migration be a true no-op. 2017-02-15 07:16:10 -05:00
Ned Batchelder
169414b734 An idempotent migration to add an email uniqueness constraint 2017-02-15 07:16:10 -05:00
noraiz-anwar
38a6e8b0d0 Merge pull request #14494 from edx/noraiz/TNL-6470 
TNL-6470-Hide Add a post during discussion blackout period
 2017-02-15 10:24:44 +05:00
stu
cb7e260c97 fix flaky progress page and note tests 2017-02-14 21:20:28 -05:00
Gregory Martin
be0e2d0a11 Merge pull request #14517 from edx/yro_ora2-release 
bump ora2 version
 2017-02-14 14:52:38 -05:00
Nimisha Asthagiri
a4f70ba4da Merge pull request #14505 from edx/beryl/cbs_tranformer_version_hash 
Block Transformers: Version Hash
 2017-02-14 14:44:35 -05:00
Gregory Martin
8c9918da23 bump ora2 version 2017-02-14 14:05:20 -05:00
Ned Batchelder
52ca02fdc4 model_name can be non-None, and model is still None 2017-02-14 12:50:12 -05:00
Jesse Shapiro
5d068cec1f Merge pull request #14496 from open-craft/haikuginger/remove-consent-from-logistration 
[ENT-173] Remove data sharing consent from logistration
 2017-02-14 11:51:53 -05:00
Nimisha Asthagiri
b99e9ae252 Block Transformers: Transformers Version Hash 
TNL-6519
 2017-02-14 11:34:29 -05:00
Ned Batchelder
583cd26f11 Merge pull request #14515 from edx/nedbat/neuter-email-constraint-migration 
No-op a migration that needs to be more clever
 2017-02-14 10:50:29 -05:00
Ned Batchelder
1e6a74e777 No-op a migration that needs to be more clever 2017-02-14 10:01:03 -05:00
Douglas Hall
3055f9b259 Merge pull request #14339 from edx/hasnain-naveed/program-backend/WL-912 
WL-766 Program marketing page data layer
 2017-02-14 04:53:53 -05:00
Douglas Hall
9dcc6ddcd8 Merge pull request #14471 from edx/douglashall/WL-962 
WL-926 Add support for multi-org sites
 2017-02-14 04:53:13 -05:00
noraiz-anwar
6f447d0b51 Hide Add a post during discussion blackout period 2017-02-14 11:18:12 +05:00