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

15712 Commits

Author SHA1 Message Date
alisan617
73e030dee6 Merge pull request #14554 from edx/alisan/xsy-img-TNL-6563 
remove space around xsy avatar image
 2017-02-23 09:15:03 -05:00
Matt Drayer
685524bb70 Merge pull request #14541 from edx/mattdrayer/direct-idp-login 
ENT-228: Allow tpa_hint to match hidden providers
 2017-02-22 17:10:54 -05:00
Eric Fischer
4e464ec658 Merge pull request #14550 from edx/efischer/tnl-6559 
Short-term fix for TNL-6559 task failures
 2017-02-22 16:08:46 -05:00
sanfordstudent
c9f1742898 Merge pull request #14511 from edx/sstudent/TNL-6351 
moving tabindex
 2017-02-22 15:40:32 -05:00
Eric Fischer
06c3445609 Short-term fix for TNL-6559 task failures 2017-02-22 14:34:36 -05:00
edx-pipeline-bot
95aa2b61ba Merge pull request #14549 from edx/release-mergeback-to-master 
Merge release back to master
 2017-02-22 10:08:23 -05:00
sanfordstudent
d0ddfe80eb Merge pull request #14555 from edx/sstudent/update-grades-mgmt 
reset grades management command choose database table
 2017-02-22 09:39:41 -05:00
Sanford Student
c4461191bc reset grades management command choose database 2017-02-21 16:00:33 -05:00
Matt Drayer
6e661404a4 mattdrayer/direct-idp-login: Allow tpa_hint to match hidden providers 2017-02-21 14:57:43 -05:00
alisan617
fd51a7de8c do not allow space around xsy avatar image 2017-02-21 13:22:55 -05:00
Simon Chen
f62b66022c Merge pull request #14525 from edx/schen/ECOM-7119 
Update embargo message with better language ECOM-7119
 2017-02-21 12:24:49 -05:00
Ben Patterson
c0dd2b878f Lettuce-on-Xenial CMS fix. Iterate through a list to avoid quotation string confusion. 
Also change some selenium settings (they were not necessary at this time).
 2017-02-20 17:22:36 -05:00
Ben Patterson
0e596dd517 Multi-thread stub servers. 2017-02-20 17:22:23 -05:00
Ben Patterson
e7b0c28d57 Fixes for chrome reliability in selenium. 
Fix for rendering timing issue. See https://bugs.chromium.org/p/chromedriver/issues/detail?id=1552
 2017-02-20 17:22:02 -05:00
Ben Patterson
452a1f1fbb Refactor click since it was resulting in timeout errors; use correct id for one of the LTI stub's buttons. 2017-02-20 17:21:42 -05:00
Ben Patterson
c58e514231 Properly wait for LTI stub's buttons to render 2017-02-20 17:21:41 -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 St. Aubin
8e1fc5f5d3 Updated the focus order for the action bar 2017-02-17 22:46:17 -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
umar-nawaz
d2f370dd38 Sailthru cookie name statements in add_email_marketing_cookies function 2017-02-17 16:35:39 +05:00
Albert St. Aubin
13ee3056ff update session cookie with the course id 2017-02-16 14:41:37 -05:00
Ned Batchelder
9614b6eb07 Update translations (autogenerated message) 2017-02-16 16:51:11 +00:00
Ned Batchelder
318ae7b869 Update translations (autogenerated message) 2017-02-16 16:08:24 +00: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
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
Simon Chen
5ca0ebcc56 Update embargo message with better language ECOM-7119 2017-02-15 12:51:17 -05:00
Ned Batchelder
98b250b66e A new django app for unicorn migrations 2017-02-15 11:40:05 -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
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
Nimisha Asthagiri
b99e9ae252 Block Transformers: Transformers Version Hash 
TNL-6519
 2017-02-14 11:34:29 -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
noraiz-anwar
6f447d0b51 Hide Add a post during discussion blackout period 2017-02-14 11:18:12 +05:00
Hasnain
41f3bba058 Backend code for program detail page. 
This adds functions to the catalog utils which munge data
collected from the program endpoint and LMS database to construct
data structures that are ready for use by view and templates
related to the Open EdX marketing pages that live in LMS.

WL-766
 2017-02-13 20:37:56 -05:00
Douglas Hall
58f0154ee2 Add support for multi-org sites 
WL-926
 2017-02-13 19:33:47 -05:00
Nimisha Asthagiri
6626725781 Merge pull request #14504 from edx/beryl/cbs_transformer_versions 
Block Transformers: distinguish between READ and WRITE versions
 2017-02-13 13:32:05 -05:00
Nimisha Asthagiri
71cce9bb73 Block Transformers: distinguish between READ and WRITE versions 
TNL-6522
 2017-02-13 12:20:22 -05:00
Ayesha Baig
61f2067935 [YONK-513]: Add feature flag which allows for disabling of account creation 2017-02-13 12:28:57 +05:00
J. Cliff Dyer
be8a898e68 Add logging to recalculate grades base task. 
TNL-6294

* Use external celery_utils in edx-platform (TNL-6454)
* Remove old openedx.core celery_utils implementation.
 2017-02-10 16:07:51 -05:00
syed-awais-ali
31f178ea59 Merge pull request #14498 from edx/aali/OPS-1407_celery_max_ttl 
added ttl setting
 2017-02-10 23:38:11 +05:00
Christina Roberts
62cb3ad50e Merge pull request #14486 from edx/christina/wiki-round-2 
Fix more wiki a11y issues
 2017-02-10 13:08:11 -05:00
cahrens
a15d89c8bf Fix a11y issues. 
TNL-6440, TNL-6439
 2017-02-10 09:43:26 -05:00
sanfordstudent
fd7de0cab5 Merge pull request #14477 from edx/sstudent/TNL-6349 
only show nav utils if populated
 2017-02-10 09:09:12 -05:00
Albert (AJ) St. Aubin
c1e2d39b38 Merge pull request #14444 from edx/aj/TNL-6381_upsell_msg 
Aj/tnl 6381 upsell msg
 2017-02-10 07:25:23 -05:00