Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,742 Commits 1 Branch 0 Tags
e4d0b4d8e0ea2b02668615bc387e9514bace2f16
Commit Graph

23742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Zoldak
e4d0b4d8e0 Merge pull request #3976 from edx/zoldak/skip-video-finish-time-test 
Skip intermittently failing video test
 2014-06-04 08:36:58 -04:00
zubair-arbi
74c482d633 Merge pull request #3940 from edx/zub/bugfix/std1679-sectionnameeditable 
make only section name in headers editable
 2014-06-04 16:11:10 +05:00
zubair-arbi
56e0b86394 make only section name in headers editable 
STUD-1679
 2014-06-04 15:00:52 +05:00
Jay Zoldak
c08831b4b6 Merge pull request #3974 from edx/zoldak/fix-translation-tags 
Fix some translation tags
 2014-06-03 18:15:21 -04:00
Jay Zoldak
32ed4e9973 Skip intermittently failing video test 2014-06-03 18:13:25 -04:00
Alison Hodges
8ab61567f5 Merge pull request #3970 from edx/ahodges/documentation/DOC502 
Ahodges/documentation/doc502
 2014-06-03 17:26:23 -04:00
Alison Hodges
feaff4bfe4 new section for June 2014-06-03 17:25:52 -04:00
Jay Zoldak
ac17e809ee Fix some translation tags 2014-06-03 15:50:11 -04:00
Greg Price
6ab6b72c86 Merge pull request #3941 from edx/gprice/handle-invalid-json 
Improve handling of bad JSON from comments service
 2014-06-03 14:13:29 -04:00
Adam
a415b507d0 Merge pull request #3942 from edx/adam/protocol 
load js without specifying protocol
 2014-06-03 14:09:20 -04:00
Will Daly
b700dc0cca Merge pull request #3939 from edx/will/ora2-ai-grading-settings 
ORA2 AI Grading Settings
 2014-06-03 14:06:47 -04:00
Greg Price
dc2342859e Improve handling of bad JSON from comments service 
Instead of allowing the JSONDecodeError to escape, raise an error
indicating the request id and containing the first 100 characters
of the response to aid investigation.
 2014-06-03 13:34:36 -04:00
Alison Hodges
31843fd324 Change log 2014-06-03 12:47:32 -04:00
Piotr Mitros
2f3e76721b Merge pull request #3935 from edx/pmitros/adding-audio-done-xblocks 
Added prototype DoneXBlock and AudioXBlock
 2014-06-03 12:47:28 -04:00
Ben Patterson
2795f85c57 Merge pull request #3964 from edx/benpatterson/auto-docs-builds 
Allow consumption of environment variables in docs Makefiles
 2014-06-03 12:46:21 -04:00
Alison Hodges
488bbff802 Added image, completed draft 2014-06-03 12:33:53 -04:00
Will Daly
5f7520e121 Add AI algorithm configuration to LMS settings 
Added ORA2_FILE_PREFIX setting
 2014-06-03 11:49:56 -04:00
Piotr Mitros
5bf5766da4 Code review changes from Ned+Cale 2014-06-03 11:18:02 -04:00
Ned Batchelder
a1abd16a20 Move LS requirements to edx private. 
Author/owner of change is Ned. Committer/typer is Piotr.
 2014-06-03 11:18:02 -04:00
Piotr Mitros
16078ba8a7 Added completion and audio XBlocks 2014-06-03 11:17:24 -04:00
Jay Zoldak
0103700a78 Merge pull request #3963 from edx/zoldak/skip-video-seek-test 
Skip intermittently failing bok-choy video seek test
 2014-06-03 10:08:27 -04:00
Ben Patterson
aa6e83fdd0 Allow consumption of environment variables in docs Makefiles 
See: https://bitbucket.org/birkenfeld/sphinx/issue/1368/makefile-options-not-overridable-from
 2014-06-03 09:47:25 -04:00
Jay Zoldak
c7b627730d Skip intermittently failing test 2014-06-03 09:35:05 -04:00
Julia Hansbrough
136bcb2911 Merge pull request #3934 from edx/flowerhack/handout-error-logs 
Removed excessive logging
 2014-06-03 09:30:31 -04:00
Will Daly
a32e4d585f Merge pull request #3959 from edx/will/update-ease 
Update EASE version (includes base reqs)
 2014-06-03 09:26:39 -04:00
Adam
f832011335 Merge pull request #3956 from edx/adam/user-id-profile-information 
adds user id to student profile information (LMS-2791)
 2014-06-03 09:04:36 -04:00
Alison Hodges
e3ad924e39 Initial draft, need image and xrefs 2014-06-02 17:10:15 -04:00
Will Daly
9d13f23d1a Update EASE version (includes base reqs) 2014-06-02 16:35:29 -04:00
Nick Parlante
0039536fe2 Merge pull request #3872 from edx/nick/disable-masking 
Temporarily disable masking
 2014-06-02 13:21:47 -07:00
clytwynec
c22d086556 Merge pull request #3952 from edx/clytwynec/prereqs_installation_update 
fix for prereqs installation cache check
 2014-06-02 16:17:25 -04:00
Julia Hansbrough
e1688e2a42 Removed excessive logging 2014-06-02 20:02:25 +00:00
Adam Palay
a2b2b37ed7 adds user id to student profile information (LMS-2791) 2014-06-02 15:49:46 -04:00
Greg Price
0d37b4b254 Merge branch 'release' 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py
 2014-06-02 15:29:40 -04:00
benmcmorran
dbf4425ea0 Merge pull request #3957 from edx/benmcmorran/authors 
Adds Ben McMorran to authors file.
 2014-06-02 14:47:22 -04:00
Ben McMorran
1a0f57ac45 Adds Ben McMorran to authors file. 2014-06-02 14:44:44 -04:00
muhammad-ammar
4f55c827a6 Merge pull request #3948 from edx/ammar/check-youtube-for-bok-choy 
Check YouTube for Bok-Choy
 2014-06-02 23:27:25 +05:00
muhammad-ammar
ba673f8f21 Merge pull request #3949 from edx/ammar/improve-lettuce-youtube-availability-check 
Lettuce YouTube Check Improvements
 2014-06-02 23:25:09 +05:00
Will Daly
ba0bad1d0b Merge pull request #3955 from edx/will/ora2-release-2014-06-02T15.45 
ORA2 release-2014-06-02T15.45
 2014-06-02 13:50:03 -04:00
Anton Stupak
007fde03a1 Merge pull request #3951 from edx/anton/fix-relative-time 
RelativeTime: incorrect value after XML serialization.
 2014-06-02 20:11:37 +03:00
Muhammad Ammar
55f0d0f9d1 Check YouTube for Bok-Choy 2014-06-02 16:37:24 +00:00
Muhammad Ammar
84ac562831 Lettuce YouTube Check Improvements 2014-06-02 16:27:04 +00:00
muhammad-ammar
fd18165bbe Merge pull request #3682 from edx/ammar/bok-choy-video-tests-batch9 
Bok-Choy Video Tests Batch9
 2014-06-02 21:20:13 +05:00
David Baumgold
f17e0bc105 Merge pull request #3704 from louyihua/localization-fix 
i18n: Make .underscore files translatable
 2014-06-02 12:15:41 -04:00
Christine Lytwynec
f073afbf8c adding prereq installation to js test tasks prereqs 2014-06-02 12:11:44 -04:00
Will Daly
1a90aa9fcd ORA2 release-2014-06-02T15.45 2014-06-02 11:47:53 -04:00
Sarina Canelake
31274a52dc Merge pull request #3480 from lduarte1991/lduarte-harvardx2 
Annotation Tool Clean up and Plugins
 2014-06-02 11:40:12 -04:00
srpearce
f33eb60c56 Merge pull request #3938 from edx/sylvia/docs/BLD-1049 
Sylvia/docs/bld 1049
 2014-06-02 11:29:26 -04:00
Sylvia Pearce
df83f7ab96 Fix typo 2014-06-02 11:27:46 -04:00
Christine Lytwynec
e0deca26fc fix for prereqs installation cache check 2014-06-02 10:47:32 -04:00
lduarte1991
b83e27fc9d Diacritic Plugin for Annotator Tool: Pull-request Fixes 
Making sure extension comes after annotator css
 2014-06-02 10:45:29 -04:00