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

4196 Commits

Author SHA1 Message Date
Christina Roberts
cd868efc22 Merge pull request #1580 from edx/christina/item 
Change delete_item to RESTful URL.
 2013-11-06 10:50:56 -08:00
cahrens
16766a5ee9 Change delete_item to RESTful URL. 
Part of STUD-847.
 2013-11-06 13:49:24 -05:00
jmclaus
e892c979b0 Added tests to video player controls to check new WAI-ARIA functionality. Added global custom Jasmine matcher to helper.coffee 
[BLD-386]
 2013-11-05 16:38:33 -05:00
Alexander Kryklia
df5b1e97d8 Merge pull request #1514 from edx/alex/add_latex_compiler_key 
Alex/add latex compiler key
 2013-11-04 02:14:53 -08:00
Alexander Kryklia
b5bf4b7500 Enable latex problems via key in course.settings. 
BLD-426
 2013-11-04 12:13:23 +02:00
polesye
af71c780fe Fix bugs in Video player. BLD-468. 2013-11-04 11:30:24 +02:00
Jason Bau
64758673b5 Merge pull request #1563 from edx/jbau/OEE/feedback-handle-nonexistent-child 
add error handling for update_score for OEE when no child_history
 2013-11-01 16:24:18 -07:00
Jason Bau
c648db7f3d add comment explaining child_history condition 2013-11-01 15:51:20 -07:00
Calen Pennington
25ec217939 Merge pull request #1561 from cpennington/hotfix-assertion-error 
Fix AssertionErrors that were raised when creation of an XModule failed
 2013-11-01 13:06:35 -07:00
Don Mitchell
5fa44123bf Allow 'course' as course's id keyword 2013-11-01 14:20:41 -04:00
Calen Pennington
d7766a7b28 Fix AssertionErrors that were raised when creation of an XModule failed 
The ErrorDescriptor wasn't getting the appropriate xmodule_runtime set,
and thus immediately raising an AssertionError when we tried to retrieve
and _xmodule from it.

[LMS-1388[
 2013-11-01 10:15:26 -04:00
polesye
f6b69eab4e Merge pull request #1513 from edx/anton/word-cloud-total-count-in-studio-bug 
Anton/word cloud total count in studio bug
 2013-11-01 06:19:45 -07:00
Jason Bau
ec7d9578ea add error handling for update_score for OEE when no child_history 2013-10-31 15:33:13 -07:00
Sarina Canelake
944c433699 Merge branch 'release' 2013-10-31 15:04:48 -04:00
Slater-Victoroff
e3cef4e2a6 Merge pull request #1545 from edx/slater/mixed_mongo_abstract 
Proper abstraction of Module store base class implemented
 2013-10-31 11:35:52 -07:00
Valera Rozuvan
5cd4bae35d Start and end times function the same for YouTube and HTML5 modes. 
Fix bug when the user clicks on the video time-line either
before or after the specified end time, it jumps
to the very beginning of the video.

BLD-392
 2013-10-31 13:52:34 +02:00
Slater
e2ba1122c4 Proper abstraction of Module store base class implemented 
Read/Write inheritance split up into separate base classes
 2013-10-30 16:35:56 -04:00
Calen Pennington
32af903f85 Provide access to the course_id directly on XModules/Descriptors 
Fixes [BLD-456] and [LMS-1392], but making sure that we're always asking
XModules about their course_id (since the ModuleSystem has access to
that data).
 2013-10-30 11:23:11 -04:00
Will Daly
83fcc318c6 Fixed test that was failing in Vagrant due to filesystem encoding 
mismatch
 2013-10-30 09:23:48 -04:00
Calen Pennington
ac8eeb681f Make sequence module use ajax_url properly 2013-10-29 10:36:22 -04:00
Calen Pennington
ae32abfd62 Give a better error message when capa recieves an unknown action 2013-10-29 10:36:22 -04:00
Calen Pennington
10ee2dea82 Clean up imports 2013-10-29 10:36:22 -04:00
polesye
23590102da BLD-205: fix total count. 2013-10-29 15:38:29 +02:00
Will Daly
1435c90306 Disable multiple YT test due to flakinesss 2013-10-29 09:01:20 -04:00
polesye
6130189bdf Fix slider and pause bugs. 2013-10-29 11:34:47 +02:00
polesye
389beedcf9 Fix speed change bug. 2013-10-29 11:34:47 +02:00
Vik Paruchuri
9f9f5e4c2a Ensure that peer grading modules whose linked problem is removed change over to panel mode 2013-10-28 16:40:13 -04:00
Vik Paruchuri
fd72005a17 Ensure that peer grading modules whose linked problem is removed change over to panel mode 2013-10-28 16:35:16 -04:00
David Baumgold
d844743667 Merge pull request #1520 from edx/db/accept-db-var 
pylint: db is a valid variable name
 2013-10-28 13:08:13 -07:00
David Baumgold
ff5baa7ace pylint: db is a valid variable name 2013-10-28 14:31:23 -04:00
Iain Dunning
a75b764cda Added a [code] block to the problem markdown parser 
Adds a code block to the problem markdown parser that translates
[code]
TestTest
[/code]
to
<pre><code>
TestTest
</code></pre>
 2013-10-26 13:12:58 -04:00
dcadams
5fbda0c63b Merge pull request #1396 from edx/dcadams/fix_static_paths 
Fix for static path parsing
 2013-10-25 14:54:59 -07:00
David Adams
20f1feb7b1 Fix for static path parsing 
When a url contains a query parameter it gets incorrectly parsed
when replacing the /static portion.

This fix handles urls with query parameters.
 2013-10-25 13:02:29 -07:00
David Baumgold
dc589f723c Merge remote-tracking branch 'origin/release' 2013-10-25 15:29:03 -04:00
Jason Bau
832e262400 Merge pull request #1497 from edx/jbau/fix-ora-uploads 
test bucket existence before creation
 2013-10-25 10:53:25 -07:00
Carlos Andrés Rocha
7d76f36018 Make course xml export work for all modulestores 
Also let xml import work on modulestores that don't use write signaling
 2013-10-25 11:58:17 -04:00
Jason Bau
d0185c934a make OEE upload test pass 2013-10-25 08:32:50 -07:00
Jason Bau
63bdeea44b test bucket existence before creation 2013-10-25 08:32:50 -07:00
Giulio Gratta
5a46177a5e A11Y changes: better :focus styling, increased contrast, and added image alt texts 
- Doubled up :hover and :focus styling to improve a11y
- Increase contrast of certain UI elements for improved a11y
- Added some image alt text for a11y
- Changed video caption styling to blue and made them underline on hover and added a skip link before video for screenreaders.

Fixes Bugs:
- LMS-1336
 2013-10-24 12:47:19 -07:00
Don Mitchell
f45abe3d9f Use new restful pattern instead 2013-10-24 13:18:23 -04:00
Don Mitchell
8bbaf0065b Separate doc_store_config 2013-10-24 13:18:22 -04:00
Don Mitchell
6b9797522b Write restful service to find all orphans 
To help fix recent bugs re orphaned discussions and
to prototype a more restful json oriented api.
 2013-10-24 13:18:22 -04:00
Alexander Kryklia
ee02a2dd97 Merge pull request #1421 from edx/anton/metadata-time-field 
Anton/metadata time field
 2013-10-24 05:50:13 -07:00
David Ormsbee
acf22bf48c Add get_child_descriptors to the list of module_attrs in XModuleDescriptor 2013-10-23 18:19:41 -04:00
Will Daly
e81d2d227b Disable video caption test seen to fail in master. 2013-10-23 17:20:00 -04:00
Adam Palay
ab5863a4db fixes unicode error in course image filenames on /courses page 2013-10-23 15:06:53 -04:00
Alexander Kryklia
c351c3dae7 Fix typos. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
e902ff6548 Fix error printing: use repr. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
32f0f555e9 Use more clean expression. 2013-10-23 13:06:13 +03:00
Alexander Kryklia
3c4f71bbe5 Update variable names and fix typo. 2013-10-23 13:06:13 +03:00