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

40260 Commits

This Branch
This Branch
All Branches
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
Peter Pinch
aa4716df98 Merge pull request #14513 from mitodl/pdpinch/bump-sga-xblock-version 
bump edx-sga XBlock to v0.6.2
 2017-02-23 09:14:10 -05:00
Stu Young
786444958f Merge pull request #14548 from edx/mzfr/fix-webOb-tnl6553 
Adding text param to webob response for 1.7.1.
 2017-02-23 08:54:12 -05:00
Peter Pinch
2ed57b9206 bumping edx-sga to v0.6.2 
use PyPI version of edx-sga and move to base.txt
 2017-02-23 08:23:22 -05:00
raeeschachar
61a12b4b0d Merge pull request #14558 from edx/raees/LT54-page-object-to-platform_part1 
Moving upgraded e2e page objects to platform
 2017-02-23 16:52:57 +05:00
raeeschachar
ea3797c365 Moving upgraded e2e page objects to platform 2017-02-23 10:58:28 +00: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
Clinton Blackburn
fc8e7fe241 Updated edx-organizations to 0.4.3 
ECOM-7098
 2017-02-22 14:04:05 -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
muzaffaryousaf
f16550519e Defining charset to "utf8". 
TNL-6553
 2017-02-22 17:39:13 +05:00
Douglas Hall
31bd5cd1d5 Merge pull request #14544 from edx/hasnain-naveed/WL-977 
WL-977 | Set 'created_on_site' UserAttribute on account creation
 2017-02-22 06:29:12 -05:00
Hasnain
2f1d405146 Set 'created_on_site' UserAttribute on account creation. 
We need to be able to track which site a given user account was created on. This
change will create a UserAttribute model with a key of 'created_on_site' and a value
containing the domain of the site on which the user accounted was created.

WL-977
 2017-02-22 05:12:21 -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
Michael Youngstrom
067348b858 Allow Pa11ycrawler to run against a single url 
Utilize scrapy parse

specify custom callback and add port

Getting rid of scrapy parse. A modified crawl will work

remove log

Remove unnecessary input options

Remove extra empty line

version bump v1.5.9

Reduce duplicate code

add in port and simplify further

clean command further

add port to basic command

Bump Pa11yversion to the newest version
 2017-02-21 15:53:53 +00:00
muzaffaryousaf
e50a3c57b6 Adding text param to webob response for 1.7.1. https://github.com/Pylons/webob/issues/304 
TNL-6553
 2017-02-21 20:31:40 +05:00
Ben Patterson
0c53f6c88e Merge pull request #14491 from edx/benp/lettuce-fixes-chrome-stub-servers 
Fix lettuce tests for Xenial compatibility and newer Chrome version.
 2017-02-20 20:01:32 -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
0e7e9468eb Solve open sans quotation issue with tests. 2017-02-20 17:21:42 -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
840efb238c Workaround for intermittent chromedriver hangs upon start. 2017-02-20 17:21:41 -05:00
Ben Patterson
c58e514231 Properly wait for LTI stub's buttons to render 2017-02-20 17:21:41 -05:00
Ben Patterson
c3887b0b6b Fix lettuce tests for Xenial compatibility and newer Chrome version. 2017-02-20 17:21:29 -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