jmclaus
8e2c5bca7b
Added focus tracking to play/pause button. This fixes a bug where the tabbing, in certain condition, would get stuck on speed button.
2013-09-06 09:22:33 +02:00
jmclaus
578e02b589
Speed button know behaves like the volume button when tabbing forward or backward.
2013-09-06 09:22:33 +02:00
chrisndodge
9aa024b585
Merge pull request #845 from edx/bugfix/ichuang/fix-capa-optioninput-for-inline
...
Fix capa optioninput template to honor inline flag
2013-09-05 15:51:30 -07:00
Christina Roberts
a78c913d5e
Merge pull request #872 from edx/christina/about-page
...
Don't show course about page link when we have the marketing site.
2013-09-05 12:40:51 -07:00
Adam Palay
25ce1fe745
Merge branch 'release'
2013-09-05 14:56:25 -04:00
David Baumgold
d20359aa44
Merge pull request #634 from antoviaque/vagrant-provisioning-resume
...
vagrant: Add flag to ensure install is completed at least once
2013-09-05 11:41:32 -07:00
cahrens
4e67783644
Don't show course about page link when we have the marketing site.
...
STUD-733
2013-09-05 14:26:08 -04:00
chrisndodge
545d5770d5
Merge pull request #871 from edx/fix/cdodge/re-enable-enrollment-start-stop
...
due to the MixedModuleStore pending release, we need to make enrollment ...
2013-09-05 11:02:00 -07:00
Chris Dodge
4a12cb60c9
due to the MixedModuleStore pending release, we need to make enrollment start/end dates editable in Studio
2013-09-05 12:43:24 -04:00
Xavier Antoviaque
0a5b68263e
vagrant: Add flag to ensure install is completed at least once
...
The provisioning script used to check for the existence of the
`/opt/edx/node_modules` folder to decide if the installation has already
been completed. However, since additional instructions were executed
by the installer afterwards, any installation error (eg. download
timeouts on low quality connections) happening between the creation of
that folder and the end of the installation wouldn't be recovered from
on the next vagrant instance boot.
2013-09-05 13:10:48 -03:00
Anton Stupak
5d55714cad
Fix test.
2013-09-05 10:27:41 -04:00
Anton Stupak
961bd4c9cb
Fix selector.
2013-09-05 10:27:29 -04:00
polesye
5658e6bc22
Merge pull request #868 from edx/hotfix/lose_header_bug
...
Fix bug when editing video causes other components to lose their header
2013-09-05 07:26:09 -07:00
Anton Stupak
d93215c0b9
Fix test.
2013-09-05 17:02:53 +03:00
Anton Stupak
af6d0eb145
Fix selector.
2013-09-05 10:49:42 +03:00
ichuang
69f72989c5
consistently use inline=False as default in capa inputtypes
2013-09-04 23:13:05 -04:00
Jason Bau
08168ec67f
Merge pull request #859 from edx/jbau/studio-link-in-instructor-panel
...
Add link in lms legacy instructor dashboard to cms course_index
2013-09-04 13:03:21 -07:00
Jason Bau
ec989e4999
Address review comments for lms_link_to_cms
...
* Uses override_settings to provide test variable
* Move location of cms link to upper right
* PEP8 / Pylink
2013-09-04 11:29:22 -07:00
Ned Batchelder
ac2b7a3ac1
Merge pull request #863 from edx/ned/fix-simple-things-because,-damn
...
fix simple things because, damn
2013-09-04 09:12:43 -07:00
Sarina Canelake
577aeed35a
Don't fetch the editor for XML courses
2013-09-04 11:31:52 -04:00
Ned Batchelder
3a5f718a32
fix simple things because, damn
2013-09-04 11:10:05 -04:00
Adam Palay
fb84541bbe
add nltk to sandbox reqs
2013-09-04 10:15:39 -04:00
Adam
0916957812
Merge pull request #861 from edx/fix/adam/add-edge-reqs
...
add requests and nltk to sandbox reqs
2013-09-04 07:14:59 -07:00
Adam Palay
6078f4c67e
add nltk to sandbox reqs
2013-09-04 10:12:44 -04:00
Will Daly
b2b23fa9c5
Pass in harvest args to fasttest_acceptance, not the args array
2013-09-04 08:34:52 -04:00
Will Daly
75b588e018
Merge pull request #858 from edx/will/harvest-args-fix
...
Pass in harvest args to fasttest_acceptance, not the args array
2013-09-04 05:29:46 -07:00
Will Daly
9b1a5b49a7
Pass in harvest args to fasttest_acceptance, not the args array
2013-09-03 21:17:15 -04:00
Sarina Canelake
51fcb5247d
Merge pull request #855 from edx/sarina/bulkemail-violations
...
Cleanup bulk email app
2013-09-03 14:25:36 -07:00
Adam
ef042c39aa
Merge pull request #853 from edx/fix/adam/pylint-pep8
...
fix pep8 and pylint errors
2013-09-03 14:22:11 -07:00
Adam
3cc793b01b
Merge pull request #856 from edx/adam/merge-conflicts
...
Adam/merge conflicts
2013-09-03 14:20:15 -07:00
Sarina Canelake
bfebe684b3
Cleanup bulk email app
2013-09-03 16:11:34 -04:00
Adam Palay
67890b3c66
resolve merge conflict with hotfix branch
2013-09-03 16:00:24 -04:00
Adam
6787fbbf04
Merge pull request #851 from edx/hotfix/release-multiple-video-bug
...
Hotfix/release multiple video bug
2013-09-03 12:23:00 -07:00
Will Daly
e284ac682a
Merge pull request #837 from edx/will/faster-acceptance-test-startup
...
Skip migrations if running acceptance in fasttest mode
2013-09-03 11:58:43 -07:00
Adam Palay
300f7f13a6
fix pep8 and pylint errors
...
Conflicts:
cms/djangoapps/contentstore/views/course.py
common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
lms/envs/common.py
2013-09-03 14:55:11 -04:00
Adam
c7a537e412
Merge pull request #848 from edx/fix/adam/add-edge-reqs
...
Fix/adam/add edge reqs
2013-09-03 09:53:21 -07:00
Will Daly
a081746661
Merge pull request #849 from edx/will/acceptance-test-static-files
...
Fix for acceptance test static file issue
2013-09-03 09:50:59 -07:00
Anton Stupak
a09e610403
Fix multiple video bug
2013-09-03 18:49:46 +03:00
Will Daly
e94515df80
Fix for acceptance test static file issue
2013-09-03 11:36:23 -04:00
Adam Palay
a7159d8afd
add pyparsing to edx requirements
2013-09-03 10:49:04 -04:00
Adam Palay
1ab59a2c3d
add pyparsing explicitly to sandbox requirements
2013-09-03 10:00:46 -04:00
Will Daly
39bd98703c
Merge pull request #847 from edx/will/fix-diff-cover
...
Incremented diff cover version to fix 100% coverage bug.
2013-09-03 06:06:11 -07:00
Will Daly
93656a253d
Incremented diff cover version to fix 100% coverage bug.
2013-09-03 07:51:49 -04:00
Will Daly
24d3d9492a
Merge pull request #836 from edx/will/fix-video-caption-tests
...
Updated acceptance tests to match new behavior in video captions.
2013-09-02 10:31:45 -07:00
Will Daly
1f2f0bf348
Skip acceptance test DB migrations if the DB already exists and running fasttest_acceptance
2013-09-02 09:58:08 -04:00
ichuang
d7fdcd904a
fix capa optioninput template to honor inline flag
2013-08-31 15:14:05 -04:00
Jason Bau
b0f9fd0df5
Add link in lms legacy instructor dashboard to cms course_index
...
A one-click way of getting to editing the course
2013-08-31 01:07:34 -07:00
Sarina Canelake
6defd7baf1
Merge pull request #790 from edx/unanswered-on-input
...
Unanswered on input
2013-08-30 14:25:21 -07:00
Peter Baratta
fe47dcb122
Acceptance tests for visual correctness reset feature
2013-08-30 17:24:33 -04:00
Jason Bau
b7e8af65be
Merge pull request #841 from edx/jbau/bulk-email-faster-tests
...
Jbau/bulk email faster tests
2013-08-30 14:12:12 -07:00
