Commit Graph

23975 Commits

Author SHA1 Message Date
Minh-Tue Vo
ca045aaa3d Merge pull request #4139 from edx/mvo/removing-dots
Removing dot in scenario names
2014-06-17 14:43:03 -04:00
Jay Zoldak
b835ccf912 Merge pull request #4140 from edx/zoldak/disable-courses-page-test
Temporarily disable the studio bok-choy CoursePagesTest
2014-06-17 14:37:07 -04:00
srpearce
0c540e6cc5 Merge pull request #4129 from edx/sylvia/docs/BLD-933
Sylvia/docs/bld 933
2014-06-17 14:25:44 -04:00
Sylvia Pearce
4f2e18026a Add information about creating a video table of contents 2014-06-17 14:25:10 -04:00
Jay Zoldak
e52c948135 Temporarily disable the studio bok-choy CoursePagesTest 2014-06-17 13:28:10 -04:00
Ben Patterson
086373388b Merge pull request #4126 from edx/benp/remove-old-jenkins-scripts
Remove deprecated Jenkins script paths.
2014-06-17 11:24:26 -04:00
Mathew Peterson
a6fb2ac826 Merge pull request #4110 from edx/mathewpeterson/invalid_characters_error
courseware/views.py index function position value integer error correction and test
2014-06-17 11:23:00 -04:00
muhammad-ammar
95769fe442 Merge pull request #4123 from edx/ammar/reduce-captions-wait-time
Reduce captions wait time.
2014-06-17 20:15:47 +05:00
muhammad-ammar
ac26f27898 Merge pull request #4125 from edx/ammar/improve-certificates-test-time
Improve certificates test time
2014-06-17 18:45:35 +05:00
Jay Zoldak
14a80e9c3c Merge pull request #4114 from edx/zoldak/fix-negative-assertion
Speed up test by fixing negative assertion
2014-06-17 09:12:11 -04:00
Jay Zoldak
6d53bf710d Merge pull request #4115 from edx/zoldak/fix-test-captions-closed
Speed up test for closed caption state
2014-06-17 09:11:47 -04:00
Don Mitchell
17210d18ad Merge pull request #4078 from edx/dhm/heartbeat
Refactor heartbeat to delegate to the modulestores and sql
2014-06-17 08:44:37 -04:00
Dave St.Germain
0b37c987c6 Merge pull request #3908 from edx/dcs/support-dashboard
Added manual refund page for support.
PR-615
2014-06-17 08:27:34 -04:00
Dave St.Germain
f2fb57e196 Added manual refund page for support.
PR-615
2014-06-17 08:24:02 -04:00
Ben Patterson
bfbd9deafc Remove deprecated Jenkins script paths.
These now exist under scripts/
2014-06-17 08:08:26 -04:00
zubair-arbi
3a26e813bf Merge pull request #3898 from edx/zub/bugfix/std1629-annotationtool
fix reply/return to annotation links
2014-06-17 16:35:13 +05:00
Anton Stupak
bf8876e198 Merge pull request #4106 from edx/anton/fix-seek-log
Video: fix seek tracking log.
2014-06-17 12:05:20 +03:00
Muhammad Ammar
346164189f Improve certificates test time 2014-06-17 08:54:52 +00:00
Muhammad Ammar
d907d24fa5 Reduce captions wait time. 2014-06-17 07:39:12 +00:00
zubair-arbi
6cb6680139 fix reply/return to annotation links
STUD-1629
2014-06-17 12:16:07 +05:00
polesye
af67873b7b Fix seek log. 2014-06-17 08:59:11 +03:00
Sarina Canelake
8191d3c77e fixup! Fix i18n translation issues 2014-06-16 23:10:03 -04:00
Minh Tue Vo
ae9955b290 changing dot into v 2014-06-16 17:40:28 -04:00
Mat Peterson
06dbb68e75 courseware/views.py index function position value integer error correction and test
LMS-2844
2014-06-16 20:30:06 +00:00
Jim Abramson
0b398c8976 Merge pull request #4118 from edx/jsa/bugfix-cc-user
bugfix: avoid side-effects when overriding User.default_retrieve_params
2014-06-16 16:24:15 -04:00
jsa
51f3b94f53 bugfix: avoid side-effects when overriding User.default_retrieve_params 2014-06-16 16:01:13 -04:00
Diana Huang
6808790306 Merge pull request #4108 from edx/diana/update-choose-form
Revise course mode choose page.
2014-06-16 14:51:21 -04:00
Diana Huang
2dbf9442a6 Revise course mode choose page.
LMS-2796
2014-06-16 14:08:40 -04:00
Jay Zoldak
4ac1079a99 Speed up test for closed caption state 2014-06-16 13:59:19 -04:00
Jay Zoldak
c33261aefc Speed up test by fixing negative assertion 2014-06-16 13:47:14 -04:00
Don Mitchell
3c9b10112f Refactor heartbeat to delegate to the modulestores and sql
LMS-2801
2014-06-16 13:16:32 -04:00
zubair-arbi
b60b7c7e5a Merge pull request #4054 from edx/zub/bugfix/std1775-uploadpdfbutton
trigger change event for file field while uploading pdf
2014-06-16 20:17:14 +05:00
Jay Zoldak
b47e397d64 Merge pull request #4089 from edx/zoldak/courses-test
Fix the CoursePagesTest
2014-06-16 10:45:39 -04:00
Jim Abramson
c74b34c1a8 Merge pull request #4041 from edx/jsa/forums-search-users
implement forums endpoint for searching users.
2014-06-16 10:15:01 -04:00
jsa
c2ebfde429 implement forums endpoint for searching users 2014-06-16 10:12:52 -04:00
Alexander Kryklia
1d5f5db9c6 Merge pull request #4104 from edx/alex/return_html5_video_sources_in_docstring_for_easy_testing
Add examples of html5 videos to docstrings.
2014-06-16 13:37:16 +03:00
Alexander Kryklia
e032ab1877 Add examples of html5 videos to docstrings. 2014-06-16 12:46:13 +03:00
zubair-arbi
8e47219a8d trigger change event for file field while uploading pdf
STUD-1775
2014-06-16 14:06:33 +05:00
e0d
f1bc7a162d Merge pull request #4098 from edx/e0d/paver-shim
shim to update ruby/node, not python reqs
2014-06-14 10:36:53 -04:00
Andy Armstrong
5d1c5ca5f8 Merge pull request #4059 from edx/andya/xblocks-as-advanced-problems
Allow xblocks to be added as advanced problem types
2014-06-14 08:00:24 -04:00
Andy Armstrong
6704d59db0 Allow xblocks to be added as advanced problem types 2014-06-13 17:51:46 -04:00
jmclaus
27cdb6820f Merge pull request #4084 from edx/jmclaus/i18n-formula-equation-input
FormulaEquationInput: i18n
2014-06-13 23:48:48 +02:00
e0d
fbde5fcd7c missed commit 2014-06-13 17:48:38 -04:00
jmclaus
c3520fa1e0 Merge pull request #4085 from edx/jmclaus/i18n-chemical-equation-input
ChemicalEquationInput: i18n
2014-06-13 23:48:07 +02:00
jmclaus
a14be4716d Merge pull request #4087 from edx/jmclaus/i18n-matlab-input
MatlabInput: i18n
2014-06-13 23:44:06 +02:00
e0d
2250338eba shim to update ruby/node, not python reqs 2014-06-13 17:42:28 -04:00
David Baumgold
290906acb0 Merge pull request #4094 from edx/db/http-stub-respond-to-HEAD
make our HTTP stub services respond to HEAD requests
2014-06-13 16:33:40 -04:00
Steven Burch
7c71725f11 Merge pull request #4008 from edx/stv/jsinput
Fix Jasmine tests for JSInput
2014-06-13 13:01:31 -07:00
muhammad-ammar
230aa5e9f6 Merge pull request #4070 from edx/ammar/video-tests-improvements
Video Test Improvements
2014-06-13 23:43:45 +05:00
David Baumgold
bafdb8ecb1 make our HTTP stub services respond to HEAD requests 2014-06-13 14:42:23 -04:00