Commit Graph

22582 Commits

Author SHA1 Message Date
Sylvia Pearce
f3cc925fdf Update "Transcripts in Additional Languages" in Video section 2014-04-16 15:08:10 -04:00
srpearce
4b08604e83 Merge pull request #3376 from edx/sylvia/docs/small_corrections
Sylvia/docs/small corrections
2014-04-16 14:48:08 -04:00
Sylvia Pearce
c10fb77d4c Small changes 2014-04-16 14:18:59 -04:00
Sylvia Pearce
027b00641d Small changes 2014-04-16 14:18:17 -04:00
Sylvia Pearce
5a549d2133 Resize image 2014-04-16 14:14:42 -04:00
Sylvia Pearce
f60c8e3ad9 Small edits to correct typos, etc. 2014-04-16 14:10:57 -04:00
Sarina Canelake
1622216b58 Merge pull request #3084 from edx/sarina/improve-bulk-beta-add
Improve the batch beta tester add feature
2014-04-16 14:07:51 -04:00
Mark Hoeber
7e3d661fda Merge pull request #2550 from edx/markhoeber/documentation/stud-1202
Doc - First draft for shuffle changes to Building Course guide
2014-04-16 13:47:53 -04:00
Jim Abramson
8e0caa8935 Merge pull request #3355 from edx/jsa/user-profile-tests
django_comment_client/forum: add test coverage for user_profile view
2014-04-16 13:38:47 -04:00
Mark Hoeber
52437263e3 Doc - for shuffle, targeted feedback, and answer pools changes to Building Course guide 2014-04-16 12:53:48 -04:00
jsa
0738b6c327 django_comment_client/forum: add test coverage for user_profile view
JIRA: FOR-496
2014-04-16 11:51:33 -04:00
Sarina Canelake
bddae213f6 Accept usernames in Batch Enrollment widget
Respond to pull request comments
2014-04-16 10:46:54 -04:00
Will Daly
84f63cd79e Merge pull request #3283 from edx/will/ora2-delete-student-state
Reset submission API scores in beta and legacy instructor dash
2014-04-16 10:17:41 -04:00
Will Daly
0b40354c12 Reset submission API scores in beta and legacy instructor dash 2014-04-16 09:25:53 -04:00
Sarina Canelake
82b085b4e1 Clear batch enrollment and beta text fields upon button click 2014-04-16 09:20:23 -04:00
Sarina Canelake
ede21224a8 Add "Auto Enroll" option for bulk beta add 2014-04-16 09:20:23 -04:00
Sarina Canelake
4f38b69eba Allow batch beta enrollment by username 2014-04-16 09:20:23 -04:00
Valera Rozuvan
3896fb099d Merge pull request #3354 from edx/valera/l63b
Fix for BLD-993
2014-04-16 16:08:23 +03:00
Valera Rozuvan
9e8941f357 Fix for BLD-993
In certain cases jQuery errors when it is passed an invalid
selector. A fix for this is to silently catch these errors.

Jasmine tests were added to prevent this bug in the future.

BLD-993
2014-04-16 14:26:05 +03:00
raeeschachar
cf759414af Merge pull request #3319 from edx/raees/update-running-acceptance-tests-bokchoy
Update Running Acceptance Tests Bok_Choy
2014-04-16 12:29:27 +05:00
Alison Hodges
860e2f1e6e Merge pull request #3365 from edx/ahodges/documentation/DOC282
DOC-282, table width must be 80% for change log
2014-04-15 17:56:24 -04:00
Alison Hodges
0dca3cbab0 DOC-282, table width must be 80% for change log 2014-04-15 17:55:55 -04:00
Alison Hodges
0591d113ca Merge pull request #3364 from edx/ahodges/documentation/changelogrecovery
Reorganized, resequenced, removed redundancies
2014-04-15 17:46:10 -04:00
Alison Hodges
d47b8bde39 Reorganized, resequenced, removed redundancies 2014-04-15 17:44:57 -04:00
Alison Hodges
9e95aa33b2 Merge pull request #3257 from edx/markhoeber/documentation/doc-249
04/09/2014 Release Notes
2014-04-15 17:26:21 -04:00
Alison Hodges
34177141fe Merge pull request #3351 from edx/ahodges/documentation/DOC253
Ahodges/documentation/doc253
2014-04-15 17:18:00 -04:00
Alison Hodges
b60dd38614 DOC-253, adds View in Studio button to LMS 2014-04-15 17:17:26 -04:00
Sylvia Pearce
1f67fea18c Release notes 4-15-14 2014-04-15 17:13:33 -04:00
srpearce
0e6e292595 Merge pull request #3022 from edx/markhoeber/documentation/STUD-1428
First Draft - Documentation for HTML Editor Changes
2014-04-15 16:31:54 -04:00
Mark Hoeber
55f7d28c62 Documentation for HTML editor upgrade
STUD-1428
2014-04-15 16:28:36 -04:00
Andy Armstrong
bd709a77ee Merge pull request #3339 from edx/andya/fix-duplicate-buttons
Fix duplicate save and cancel buttons showing when editing xblocks
2014-04-15 15:16:34 -04:00
Andy Armstrong
a3b2809601 Fix duplicate save and cancel buttons in Studio
STUD-1531

Also add support for refreshing the modal on custom save
2014-04-15 14:04:55 -04:00
Jay Zoldak
b95b595e6b Merge pull request #3331 from edx/zoldak/serve-test-videos-locally
Serve video HTML5 sources locally for acceptance tests
2014-04-15 11:30:04 -04:00
Jay Zoldak
7ff5d618d0 Update testing documentation 2014-04-15 11:02:22 -04:00
raeeschachar
c1f75fe1a3 Update Running Acceptance Tests Bok_Choy 2014-04-15 11:02:22 -04:00
Jay Zoldak
3fc19a35b0 Serve video HTML5 sources locally for acceptance tests 2014-04-15 10:40:53 -04:00
Nick Parlante
f1eefc1117 Merge pull request #1499 from edx/nick/shuffle-question
Shuffle feature for multiple choice questions
2014-04-14 22:02:14 -07:00
Renzo Lucioni
f80d3b8755 Merge pull request #3302 from edx/renzo/analytics-improvements
Add more granular pageview tracking, update Segment.io snippet
2014-04-14 22:24:26 -04:00
Nick Parlante
ab7d3b526b Multiple-choice features
Features by Jeff Ericson and Nick Parlante squashed
down to one commit.

-shuffle of choices within a choicegroup (Nick)
-answer-pool subsetting within a choicegroup (Jeff)
-masking of choice names within a choicegroup, (Nick)
 used by shuffle and answer-pool
-targeted-feedback within a multiplechoiceresponse (Jeff)
-delay-between-submissions capa feature (Jeff)
2014-04-14 15:48:29 -07:00
Renzo Lucioni
a57a62807e Remove page view events corresponding to Drupal pages 2014-04-14 18:20:17 -04:00
Renzo Lucioni
da51180815 Add comments explaining analytics improvements 2014-04-14 18:20:17 -04:00
Renzo Lucioni
74d03809a7 Add more granular pageview tracking, update Segment.io snippet 2014-04-14 18:20:16 -04:00
Dave St.Germain
ca14fba08b Merge pull request #3243 from edx/dcs/pdfbook-logging
Added analytics event logging to PDF book viewer
2014-04-14 17:56:26 -04:00
Dave St.Germain
1cf2696289 Added analytics event logging to PDF book viewer 2014-04-14 17:55:53 -04:00
Stephen Sanchez
36be4e543c Merge pull request #3342 from edx/sanchez/ora2-2014-04-14
Release Apr 14, 2014
2014-04-14 14:48:34 -04:00
Dave St.Germain
0a19c96a08 updated pdf viewer 2014-04-14 14:28:06 -04:00
Chris Dodge
0a839d9f01 Merge branch 'master' of github.com:edx/edx-platform 2014-04-14 14:17:49 -04:00
Chris Dodge
27d7c19c40 Merge branch 'release'
Conflicts:
	cms/templates/widgets/source-edit.html
2014-04-14 14:17:03 -04:00
Anton Stupak
ff06bfb6c4 Merge pull request #3340 from edx/anton/fix-unit-test
Fix unit test.
2014-04-14 21:15:09 +03:00
Stephen Sanchez
d0635b852d Release Apr 14, 2014 2014-04-14 13:17:55 -04:00