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

23762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
lduarte1991
3bfb633fd3 Annotator Tool: Fixed delete bug and factored out settings 
Removed print context
 2014-06-06 12:39:35 -04:00
lduarte1991
54974a51ca Annotation Tools: Added CommonAnnotatorMixin 2014-06-06 10:09:22 -04:00
lduarte1991
9c0d14ea2b Annotator Tools: OpaqueKeys update for Notes 2014-06-05 15:53:26 -04:00
lduarte1991
68acf66f6c Annotation Tools: PR Fixes 
- Fixed camel case for variable name
- Fixed indentation in imageannotation.html
- Changed all mentions of Instructor Username to Email
- Turned annotation_mode into phrase
- Fixed indentation in imageannotation.html
- Added comments in imageannotation.html

- Changing annotation_mode in OSDA
 2014-06-05 13:05:37 -04:00
lduarte1991
b22643adc2 Image Annotation Tool: Annotation Mode for AB Testing 
Annotation Tools PR Fixes

- forgot to overwrite the previous line
 2014-06-05 12:47:48 -04:00
lduarte1991
50e8ae9a6e Image Annotation Tool: Added Instructor Filter 2014-06-05 12:47:48 -04:00
lduarte1991
1dcf2dc10a Video Annotation Tool: Added Instructor Filter 2014-06-05 12:47:48 -04:00
lduarte1991
8429897c82 Text Annotation Tool: Added Instructor Filter and Clear Search 2014-06-05 12:47:48 -04:00
Alexander Kryklia
2eae8b8380 Merge pull request #3981 from edx/alex/fix_matlab_check 
Improve escaping in code response.
 2014-06-05 15:59:28 +03:00
Anton Stupak
4eab9cdbe6 Merge pull request #3950 from edx/anton/transcript-editor-disable-validation 
Allow the video player to work with links with redirection.
 2014-06-05 11:10:52 +03:00
polesye
7b2d67f209 BLD-1049: Allow the video player to work with redirected links. 2014-06-05 09:34:54 +03:00
David Baumgold
7228d41aa9 Merge pull request #3707 from edx/db/release-script-no-duplicate-jira 
Don't show duplicate JIRA tickets in the release PR table
 2014-06-04 11:59:31 -04:00
benmcmorran
5dd7ffe7e3 Merge pull request #3979 from edx/benmcmorran/delete-page-confirmation 
Fixes delete page confirmation text.
 2014-06-04 11:39:47 -04:00
zubair-arbi
f19ad92ddf Merge pull request #3977 from edx/zub/bugfix/std1691-IEeditannouncement 
prevent caching of GET requests for xblock student view
 2014-06-04 20:15:22 +05:00
benmcmorran
6a89375245 Merge pull request #3980 from edx/benmcmorran/remove-conrads-name 
Removes Conrad's name from the course schedule settings (STUD-1511).
 2014-06-04 11:00:25 -04:00
David Baumgold
4c4c2a17f4 Don't show duplicate JIRA tickets in the release PR table 2014-06-04 10:19:21 -04:00
Ben McMorran
b55736035a Fixes delete page confirmation text. 2014-06-04 09:39:17 -04:00
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
dbd9e56c6c prevent caching of GET requests for xblock student view 
STUD-1691
 2014-06-04 16:14:13 +05: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
Ben McMorran
d592b7eec1 Removes Conrad's name from the course schedule settings (STUD-1511). 2014-06-03 16:58:05 -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
Alexander Kryklia
97e8f94379 Improve escaping in code response. 2014-06-03 18:56:36 +03: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