Commits · 89608c3b1184d9d6342f286b97d27b0884081a14 · edx / edx-platform · GitLab

30 Jul, 2015 2 commits
- Merge pull request #9132 from edx/sarina/cypress-course-disc · 89608c3b
```
disable course discovery feature by default in devstack.
```
  Sarina Canelake committed Jul 30, 2015
  89608c3b Browse Files
- disable course discovery feature by default in devstack. · 8e25523f
  jsa committed Jul 30, 2015
  
  8e25523f Browse Files
24 Jul, 2015 4 commits
- Merge pull request #9049 from edx/sarina/cypress-ytapi-upgrade · f0754175
```
Sarina/cypress ytapi upgrade
```
  Sarina Canelake committed Jul 24, 2015
  f0754175 Browse Files
- Fix test failing on Cypress · 1680cf25
  Sarina Canelake committed Jul 24, 2015
  
  1680cf25 Browse Files
- Skipping the failing tests; which are also failing in master · f933871e
```
Can see if we remove skipIf from video base class.

TNL-2413
```
  muzaffaryousaf committed Jul 24, 2015
  f933871e Browse Files
- Using youtube api (v3) instead of v2 to get the video duration . · fc32820f
```
TNL-2413
```
  muzaffaryousaf committed Jul 24, 2015
  fc32820f Browse Files
20 Jul, 2015 3 commits
- Merge pull request #8968 from mitocw/cg/cypress/paver-fix · 82f937b9
```
Fix the Paver run_all_servers method.
```
  David Baumgold committed Jul 20, 2015
  82f937b9 Browse Files
- Merge pull request #8975 from edx/zoldak/cypress-skip-test · f10f8791
```
Cypress - skip test that had a hardcoded date expectation
```
  David Baumgold committed Jul 20, 2015
  f10f8791 Browse Files
- Skip test that had a hardcoded date expectation MA-1038 · bbc5d4ff
  Jesse Zoldak committed Jul 20, 2015
  
  bbc5d4ff Browse Files
17 Jul, 2015 8 commits
- Fix the Paver run_all_servers method. · f1528421
```
This command was broken by 85814f0b because multi-character short
options were introduced with `--asset_settings_lms` and
`--asset_settings_cms`.
```
  Brandon DeRosier committed Jul 17, 2015
  f1528421 Browse Files
- Merge pull request #8961 from edx/cypress-setuptools · cf24d4d7
```
lxml and setuptools for Cypress
```
  David Baumgold committed Jul 17, 2015
  cf24d4d7 Browse Files
- Fix setuptools infinite loop bug triggered by python-saml · 9ff958fe
  David Baumgold committed Jul 17, 2015
  
  9ff958fe Browse Files
- Upgrade MySQL-python to 1.2.5 · 06b3b7d4
```
This reverts commit 2ff0f636.
```
  David Baumgold committed Jul 17, 2015
  06b3b7d4 Browse Files
- Upgrade setuptools to 18.0.1 · 530de6c5
```
This reverts commit 1a3f0958.
```
  David Baumgold committed Jul 17, 2015
  530de6c5 Browse Files
- Update edx-ora2 and ease for lxml version compatibility · 97b5a08f
  David Baumgold committed Jul 17, 2015
  
  97b5a08f Browse Files
- Update lxml to 3.4.4 · 3e365062
  David Baumgold committed Jul 17, 2015
  
  3e365062 Browse Files
- Merge pull request #8956 from edx/zoldak/cypress-migrations · d887af10
```
Remove open source release backwards incompatible migration
```
  Jesse Zoldak committed Jul 17, 2015
  d887af10 Browse Files
16 Jul, 2015 2 commits
- Remove open source release backwards incompatible migration · c0a6f17a
  Carson Gee committed Jul 16, 2015
  
  c0a6f17a Browse Files
- Update bok choy DB cache for cypress · e9087828
  Jesse Zoldak committed Jul 16, 2015
  
  e9087828 Browse Files
14 Jul, 2015 7 commits
- Merge pull request #8922 from edx/things-to-tack-on-cypress · 6e069ed2
```
Things to tack on cypress
```
  Adam committed Jul 14, 2015
  6e069ed2 Browse Files
- Merge pull request #8920 from edx/feanil/cypress_update · b0c7c2d7
```
Update Cypress RC
```
  Feanil Patel committed Jul 14, 2015
  b0c7c2d7 Browse Files
- add data_dir to bok_choy test settings · 3969607c
  Adam Palay committed Jul 14, 2015
  
  3969607c Browse Files
- address quality violation · e57f69f5
  Adam Palay committed Jul 14, 2015
  
  e57f69f5 Browse Files
- when removing field from _field_data_cache when rebinding a module to a new… · 4c4afb4e
```
when removing field from _field_data_cache when rebinding a module to a new user, also remove it from _dirty_fields (TNL-2640)
```
  Adam Palay committed Jul 14, 2015
  4c4afb4e Browse Files
- update to course import (TNL-2270) · ab3c9e92
  Adam Palay committed Jul 14, 2015
  
  ab3c9e92 Browse Files
- Update student migration 0035 to add a dependency. · 783e0898
```
This migration instantiates the modulestore which is now dependent
the xblock_django database config settings.  So the initial migration
for that has to run before this migration.
```
  Feanil Patel committed Jul 14, 2015
  783e0898 Browse Files
09 Jul, 2015 4 commits
- Upgrade Django 1.4 to the latest point release · 5bf5cdc2
  Sarina Canelake committed Jul 09, 2015
  
  5bf5cdc2 Browse Files
- Fix 'stuck in publish issue' when deleting an item after dicarding the changes · dc0c6040
  mushtaqali committed Jul 09, 2015
  
  dc0c6040 Browse Files
- Fix hinted login view to be compatible with secondary providers. · 05001bbb
  Braden MacDonald committed Jul 09, 2015
  
  05001bbb Browse Files
- Remove the DjDT profiling panel from devstack.py. It appears to cause… · f1829eb1
```
Remove the DjDT profiling panel from devstack.py. It appears to cause horrendeous performance issues, while offering very little benefit.
```
  Chris Dodge committed Jul 09, 2015
  f1829eb1 Browse Files
07 Jul, 2015 10 commits
- Merge pull request #8814 from mitocw/bdero/revert-import-export · 0abc27ee
```
Revert Import/Export changes
```
  Sarina Canelake committed Jul 07, 2015
  0abc27ee Browse Files
- Revert "edX Course/Library Import/Export API" · ae6baf2a
```
This reverts commit c94abd27.
```
  Brandon DeRosier committed Jul 07, 2015
  ae6baf2a Browse Files
- Revert "Add feature flag for Import/Export API in LMS" · b4e8ab90
```
This reverts commit 85b3bfe4.
```
  Brandon DeRosier committed Jul 07, 2015
  b4e8ab90 Browse Files
- Merge pull request #8810 from edx/cherrypick-hotfix-2015-07-07-to-rc · 0158ebca
```
Cherrypick hotfix-2015-07-07 into release candidate
```
  Will Daly committed Jul 07, 2015
  0158ebca Browse Files
- Merge pull request #8801 from edx/awais786/ECOM-1829-regen-cert-link-bug · bd5c0451
```
ECOM-1829 Removing the regen link.
```
  Will Daly committed Jul 07, 2015
  bd5c0451 Browse Files
- Merge pull request #8808 from edx/rc/2015-07-08-mattdrayer · a31ae128
```
rc/2015-07-08-mattdrayer: Hide button behind feature flag
```
  Matt Drayer committed Jul 07, 2015
  a31ae128 Browse Files
- Cherrypick hotfix-2015-07-07 into release candidate · 407e7f43
```
Includes the changes from 897fddba.
Those changes were introduced while resolving a merge
conflict from release back into master.
```
  Will Daly committed Jul 07, 2015
  407e7f43 Browse Files
- rc/2015-07-08-mattdrayer: Hide button behind feature flag · ba7422da
  Matt Drayer committed Jul 07, 2015
  
  ba7422da Browse Files
- Merge pull request #8803 from edx/clintonb/commerce-api-fix · f9ce8264
```
Corrected path to Commerce API
```
  Clinton Blackburn committed Jul 07, 2015
  f9ce8264 Browse Files
- Corrected path to Commerce API · 5d356d29
```
XCOM-312
```
  Clinton Blackburn committed Jul 07, 2015
  5d356d29 Browse Files