Commits · 7669b4d7774bcb0efee03ad6e47218e6738a744c · edx / edx-platform

24 Sep, 2013 9 commits

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

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

f898f729 Browse Files
Merge pull request #1053 from edx/usman/static-book-url · 761590bc
```
Added missing test in StaticImageBookTest
```
Usman Khalid committed Sep 24, 2013
761590bc Browse Files
Merge pull request #1084 from edx/jmclaus/bugfix_focus_speed_control · 3ca74c01
```
Focus speed control
```
jmclaus committed Sep 24, 2013
3ca74c01 Browse Files
Addressed PR comments · 3a5d7d86
jmclaus committed Sep 24, 2013

3a5d7d86 Browse Files
Fixed tests · feb95eb8
jmclaus committed Sep 24, 2013

feb95eb8 Browse Files
Used Jasmine jQuery for tests instead · 2cc9679e
jmclaus committed Sep 24, 2013

2cc9679e Browse Files
Added tests · ffa49b03
jmclaus committed Sep 24, 2013

ffa49b03 Browse Files
Speed control now regains focus after a speed entry has been selected with the keyboard · 9836fd51
jmclaus committed Sep 24, 2013

9836fd51 Browse Files

23 Sep, 2013 21 commits
- Merge pull request #1102 from edx/will/disable-more-js-tests · 427386c9
```
Disable test that fails intermittently in master
```
  Will Daly committed Sep 23, 2013
  427386c9 Browse Files
- Disable test that fails intermittently in master · 5347a499
  Will Daly committed Sep 23, 2013
  
  5347a499 Browse Files
- Merge pull request #1013 from edx/jkarni/fix/import-warnings · 97cd5a85
```
Jkarni/fix/import warnings
```
  jkarni committed Sep 23, 2013
  97cd5a85 Browse Files
- Merge pull request #1087 from edx/jkarni/fix/revert-xml-comments · 199f898d
```
Jkarni/fix/revert xml comments
```
  jkarni committed Sep 23, 2013
  199f898d Browse Files
- Merge pull request #1095 from edx/dhm/asset_bug · a4ee129f
```
Fixed missing read (cut/paste f'up)
```
  Don Mitchell committed Sep 23, 2013
  a4ee129f Browse Files
- Merge pull request #1062 from cpennington/speed-up-location-creation · 63b841bc
```
Speed up Location creation returning existing locations where possible
```
  Calen Pennington committed Sep 23, 2013
  63b841bc Browse Files
- Merge pull request #1061 from cpennington/faster-location-urls · 25ea91ed
```
Turn Locations into dicts less often
```
  Calen Pennington committed Sep 23, 2013
  25ea91ed Browse Files
- Test import-export-import assets · e993a00d
  Don Mitchell committed Sep 23, 2013
  
  e993a00d Browse Files
- Merge branch 'release' · 6dcd7cdd
```
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
```
  Chris Dodge committed Sep 23, 2013
  6dcd7cdd Browse Files
- Fixed missing read (cut/paste f'up) · 3daeb59a
  Don Mitchell committed Sep 23, 2013
  
  3daeb59a Browse Files
- Turn Locations into dicts less often · cfa2b27f
  Calen Pennington committed Sep 23, 2013
  
  cfa2b27f Browse Files
- Merge pull request #1089 from edx/christina/basejs_bug · c1d63919
```
Moving unregistration of change listener into asset_index.html.

Build passed when ran manually (automatic one is running now).
```
  Christina Roberts committed Sep 23, 2013
  c1d63919 Browse Files
- Merge pull request #1085 from edx/ormsbee/ss_err_checking · 88cae543
```
Add extra error checking and logging to Software Secure callback
```
  David Ormsbee committed Sep 23, 2013
  88cae543 Browse Files
- Moving unregistration of change listener into asset_index.html. · 9b076464
```
Fixes broken integration test on master.
```
  cahrens committed Sep 23, 2013
  9b076464 Browse Files
- i18n fix · c196d189
  Julian Arni committed Sep 23, 2013
  
  c196d189 Browse Files
- Merge pull request #1065 from edx/adam/password-modal · 89c94b4f
```
manage focus to/from/within password reset modal appropriately
```
  Adam committed Sep 23, 2013
  89c94b4f Browse Files
- Fixed tests name in staticbook · 3c3edac0
  Usman Khalid committed Sep 23, 2013
  
  3c3edac0 Browse Files
- Revert "don't remove comments from xml module" · 920b7641
```
This reverts commit 343456e3.
```
  Julian Arni committed Sep 22, 2013
  920b7641 Browse Files
- Revert "Make default parser keep comments" · 303508a9
```
This reverts commit 238899fa.
```
  Julian Arni committed Sep 22, 2013
  303508a9 Browse Files
- Merge pull request #1086 from edx/giulio/self-assess-fix · e0f7d267
```
Conditionalize written feedback area.
```
  Giulio Gratta committed Sep 22, 2013
  e0f7d267 Browse Files
- conditionalize written feedback area. · 78ea6ef0
  Giulio Gratta committed Sep 22, 2013
  
  78ea6ef0 Browse Files
22 Sep, 2013 1 commit
- Add extra error checking and logging to Software Secure callback · 61e7cbb5
  David Ormsbee committed Sep 22, 2013
  
  61e7cbb5 Browse Files
21 Sep, 2013 2 commits
- Merge pull request #1081 from edx/jbau/shib-bugfixes · 730b7c62
```
Jbau/shib bugfixes
```
  Jason Bau committed Sep 20, 2013
  730b7c62 Browse Files
- Merge pull request #1072 from edx/jbau/peergrading-setting-grade-finished-assessments · b4ce6946
```
Add setting on combinedopenended to allow peergrading of finished submissions
```
  Jason Bau committed Sep 20, 2013
  b4ce6946 Browse Files
20 Sep, 2013 7 commits
- wording changes for setting help · 7c1a3e1e
  Jason Bau committed Sep 20, 2013
  
  7c1a3e1e Browse Files
- Add setting on combinedopenended to allow peergrading of finished submissions · 9c4ff9ba
  Jason Bau committed Sep 20, 2013
  
  9c4ff9ba Browse Files
- Merge pull request #1068 from edx/feature/vik/oe-save · 57fb306c
```
Implement a save button for open ended responses
```
  Vik Paruchuri committed Sep 20, 2013
  57fb306c Browse Files
- Merge pull request #1047 from edx/talbs/lms-tablesupport · 936d2e0f
```
Capa and HTML xmodules: Text Justification Styling Classes Table-based Displays
```
  Brian Talbot committed Sep 20, 2013
  936d2e0f Browse Files
- Merge pull request #1082 from edx/adam/accessible-mathjax · 6805f4bb
```
make it so that mathplayer message only appears when mathjax is on the p...
```
  Adam committed Sep 20, 2013
  6805f4bb Browse Files
- Implement a save button for open ended responses · d9ce5e07
  Vik Paruchuri committed Sep 20, 2013
  
  d9ce5e07 Browse Files
- remove forgot-password-modal class · 1f5d2223
  Adam Palay committed Sep 20, 2013
  
  1f5d2223 Browse Files