Commits · 370872f27491e8b3c0d5e77a70666cb507e4ffe2 · edx / edx-platform

25 Sep, 2013 22 commits
- ui changes from design team feedback on studio assets page · 370872f2
  Frances Botsford committed Sep 25, 2013
  
  370872f2 Browse Files
- Add the ability to lock assets. · c64e04d8
  cahrens committed Sep 25, 2013
  
  c64e04d8 Browse Files
- Merge pull request #1127 from edx/diana/modes-expiration-dates · 78829a37
```
Add the ability to set expiration dates on course modes.
```
  Diana Huang committed Sep 25, 2013
  78829a37 Browse Files
- Merge pull request #829 from edx/renzo/ab-testing · c124a330
```
Split Testing
```
  Renzo Lucioni committed Sep 25, 2013
  c124a330 Browse Files
- Update CHANGELOG · ac0e65ab
  Renzo Lucioni committed Sep 25, 2013
  
  ac0e65ab Browse Files
- Merge pull request #1124 from edx/dhm/asset_policy · 82af8d4b
```
Just write the loc name as the key in the policy file
```
  Don Mitchell committed Sep 25, 2013
  82af8d4b Browse Files
- Add the ability to set expiration dates on course modes. · 37d906e4
  Diana Huang committed Sep 25, 2013
  
  37d906e4 Browse Files
- Test importing exported course over a new course · f9328814
  Don Mitchell committed Sep 25, 2013
  
  f9328814 Browse Files
- Just write the loc name as the key in the policy file · ef26e8ba
  Don Mitchell committed Sep 25, 2013
  
  ef26e8ba Browse Files
- Merge pull request #1112 from edx/will/shard-acceptance-tests · 47621b56
```
Added tags to acceptance tests to define multiple shards.
```
  Will Daly committed Sep 25, 2013
  47621b56 Browse Files
- Merge pull request #1126 from edx/will/fix-openid-test · 2338ed2d
```
Fix intermittent failure in OpenID test
```
  Will Daly committed Sep 25, 2013
  2338ed2d Browse Files
- Merge pull request #1060 from cpennington/lazy-textbooks · f4b37b28
```
Make Textbooks properly lazy
```
  Calen Pennington committed Sep 25, 2013
  f4b37b28 Browse Files
- Fix intermittent failure in OpenID test · 2b549222
  Will Daly committed Sep 25, 2013
  
  2b549222 Browse Files
- Merge pull request #597 from edx/feature/msteele/scrollup · 7bd54546
```
Add scroll-to-top when switching verticals from bottom nav buttons.
```
  jkarni committed Sep 25, 2013
  7bd54546 Browse Files
- Merge pull request #1123 from edx/zoldak/speedy-cms-acceptance · 6b7cb42e
```
Knock 10 more seconds off the acceptance tests.
```
  Jay Zoldak committed Sep 25, 2013
  6b7cb42e Browse Files
- Merge pull request #1120 from edx/valera/fix_for_unnecessary_outline_around_video · a8349a06
```
Fix for bug BLD-359: Unnecessary focus outline around Video Player.
```
  Valera Rozuvan committed Sep 25, 2013
  a8349a06 Browse Files
- Knock 10 more seconds off the acceptance tests. · cae6e82b
  Jay Zoldak committed Sep 25, 2013
  
  cae6e82b Browse Files
- Merge pull request #1115 from edx/diana/verify-pep8-pylint · 19ee540a
```
Clean up some old pep8/pylint violations
```
  Diana Huang committed Sep 25, 2013
  19ee540a Browse Files
- Merge pull request #1107 from edx/dhm/bug_attrs · dd788c8f
```
Ensure location is valid before trying to fetch
```
  Don Mitchell committed Sep 25, 2013
  dd788c8f Browse Files
- Fix for bug BLD-359: Unnecessary focus outline around Video Player. · 8b448923
  Valera Rozuvan committed Sep 25, 2013
  
  8b448923 Browse Files
- Refactor tab tests · e7e03f10
  Renzo Lucioni committed Sep 25, 2013
  
  e7e03f10 Browse Files
- Integrate split testing and LMS tabs experiments · f1ccf1c0
  Renzo Lucioni committed Sep 25, 2013
  
  f1ccf1c0 Browse Files
24 Sep, 2013 18 commits

Merge pull request #1091 from edx/assets/persist_lock · fd06640d
```
Export asset attrs to a policy file
```
Don Mitchell committed Sep 24, 2013
fd06640d Browse Files
Clean up some old pep8/pylint violations · 4ee9ef61
```
Also, deletes some unused code.
```
Diana Huang committed Sep 24, 2013
4ee9ef61 Browse Files
Add documentation and comments. · 20e4d585
Don Mitchell committed Sep 24, 2013

20e4d585 Browse Files
Test asset import/export roundtrip w/ lock setting. · 8e7fc153
Don Mitchell committed Sep 24, 2013

8e7fc153 Browse Files
Import/export static content properties · d1a82f2a
```
Even though xml based courses will ignore.
```
Don Mitchell committed Sep 24, 2013
d1a82f2a Browse Files
Merge branch 'release' · 7275f852
Greg Price committed Sep 24, 2013

7275f852 Browse Files
Merge pull request #1090 from edx/jkarni/feature/middleware-locked-assets · ad939b1e
```
Jkarni/feature/middleware locked assets
```
jkarni committed Sep 24, 2013
ad939b1e Browse Files
Review fixes · 1a0b752a
Julian Arni committed Sep 24, 2013

1a0b752a Browse Files

Namespace the acceptance tests so they show up nicely in jenkins · 7669b4d7

Conflicts:
	cms/djangoapps/contentstore/features/advanced-settings.feature
	cms/djangoapps/contentstore/features/checklists.feature
	cms/djangoapps/contentstore/features/component.feature
	cms/djangoapps/contentstore/features/course-overview.feature
	cms/djangoapps/contentstore/features/course-settings.feature
	cms/djangoapps/contentstore/features/course-team.feature
	cms/djangoapps/contentstore/features/course-updates.feature
	cms/djangoapps/contentstore/features/courses.feature
	cms/djangoapps/contentstore/features/discussion-editor.feature
	cms/djangoapps/contentstore/features/grading.feature
	cms/djangoapps/contentstore/features/html-editor.feature
	cms/djangoapps/contentstore/features/problem-editor.feature
	cms/djangoapps/contentstore/features/section.feature
	cms/djangoapps/contentstore/features/signup.feature
	cms/djangoapps/contentstore/features/static-pages.feature
	cms/djangoapps/contentstore/features/subsection.feature
	cms/djangoapps/contentstore/features/textbooks.feature
	cms/djangoapps/contentstore/features/upload.feature
	cms/djangoapps/contentstore/features/video-editor.feature
	cms/djangoapps/contentstore/features/video.feature
	lms/djangoapps/courseware/features/certificates.feature
	lms/djangoapps/courseware/features/help.feature
	lms/djangoapps/courseware/features/high-level-tabs.feature
	lms/djangoapps/courseware/features/homepage.feature
	lms/djangoapps/courseware/features/login.feature
	lms/djangoapps/courseware/features/lti.feature
	lms/djangoapps/courseware/features/navigation.feature
	lms/djangoapps/courseware/features/problems.feature
	lms/djangoapps/courseware/features/registration.feature
	lms/djangoapps/courseware/features/signup.feature
	lms/djangoapps/courseware/features/video.feature
	lms/djangoapps/courseware/features/word_cloud.feature

committed Sep 24, 2013

7669b4d7 Browse Files

Merge pull request #1083 from edx/zoldak/speedy-lms-acceptance · 73e03883
```
Speed up lms acceptance tests
```
Jay Zoldak committed Sep 24, 2013
73e03883 Browse Files
Merge pull request #809 from edx/event_spec_update · 6d41669b
```
Update event doc from wiki
```
stroilova committed Sep 24, 2013
6d41669b Browse Files
Merge pull request #1075 from edx/zoldak/xunit-acceptance-reports · c3995123
```
Zoldak/xunit acceptance reports
```
Jay Zoldak committed Sep 24, 2013
c3995123 Browse Files
Write xunit reports for acceptance tests · 6ebb7538
```
Refactor rake tasks for acceptance tests
Address PR comments
```
Jay Zoldak committed Sep 24, 2013
6ebb7538 Browse Files
Merge pull request #1113 from edx/christina/fix-asset-index · 908371ea
```
Put the non-Backboned assets JavaScript back into its own file.
```
Christina Roberts committed Sep 24, 2013
908371ea Browse Files
Put assets JavaScript code back in something that goes through pipelining. · ab6af2b5
cahrens committed Sep 24, 2013

ab6af2b5 Browse Files
Added tags to acceptance tests to define multiple shards. · f898f729
Will Daly committed Sep 24, 2013

f898f729 Browse Files

Update event doc from wiki · 818f4f23

    update to grid table
    Cleaned up formatting to use `` instead of :code:
    Added Instructor Events and cleaned up outline
    Added instructor events. Cleaned up outline.
    Moved out correct_map table to addendum
    Removed deprecated/undocumented events

committed Sep 24, 2013

818f4f23 Browse Files

Speed up waiting for elements not present on remote webdriver sessions. · 002f3ef9
Jay Zoldak committed Sep 24, 2013

002f3ef9 Browse Files