Ned Batchelder
718328e4e6
Get rid of all mention of XModuleDescriptor.
2013-09-30 21:09:43 -04:00
Ned Batchelder
a1d464aed9
Update XBlock requirement to new XML code.
2013-09-30 21:09:43 -04:00
Ned Batchelder
3a6450c3fc
Use XModuleDescriptor.parse_xml to interpret XML.
2013-09-30 21:09:43 -04:00
Ned Batchelder
c36adf84a0
Minor cosmetic code fixes.
2013-09-30 21:09:43 -04:00
Ned Batchelder
d7e441088b
Adjust parameters to construct_xblock_from_class to match XBlock repo.
2013-09-30 21:09:43 -04:00
jmclaus
aeac8dddbb
All video controls have a full outline when receiving focus
2013-09-30 20:47:05 +02:00
jmclaus
427f1184ae
Merge pull request #1150 from edx/jmclaus/bugfix_outline_mouseover_first_caption
...
First caption does not display outline on initial mouseover.
2013-09-30 07:26:30 -07:00
Vik Paruchuri
577749ff80
Merge pull request #1163 from edx/fix/vik/image-upload
...
Streamling, test, and fix issues with image uploading
2013-09-27 15:34:23 -07:00
Vik Paruchuri
19fb2017be
Streamline and test uploading ... remove requirement that uploads be images, can now upload any file.
2013-09-27 17:08:34 -04:00
Don Mitchell
d79220122c
Change DescriptionLocator to DefinitionLocator
2013-09-27 16:27:02 -04:00
Adam Palay
202e4f94e7
make seq tooltips appear on focus
...
remove focus from tab when clicked
2013-09-27 16:22:46 -04:00
Don Mitchell
f8c7278470
Follow patterns
...
Move init to top of class
Change asserts to more meaningful exception types
Refactor hard-to-read fn
2013-09-27 16:03:57 -04:00
Giulio Gratta
d75cdda064
An assortment of small OE changes, both for ICE and standard
...
- Changed save OE message text
- Fix ICE legend positioning and content
- Add space to "offensive" checkbox
- Change tracker variable in undo to correct one
2013-09-27 11:29:06 -07:00
Calen Pennington
d77491e46a
Pull XModule attributes out into a mixin that can be applied to xblocks
2013-09-27 13:11:05 -04:00
Calen Pennington
f4dd50826a
Merge pull request #1055 from cpennington/cleanup-xml-hotfix
...
Clean up after hotfix to fix xml loading for import
2013-09-27 09:24:22 -07:00
Valera Rozuvan
36fc1a6243
Fix for PR 1119.
...
A Jasmine test was falling. It went unnoticed. The PR was merged. This
is a fix for it.
2013-09-27 18:43:58 +03:00
Calen Pennington
f500b72290
Make sure that we have the right set of fields available during xml parsing
...
We had a bug where mixins weren't being applied before `load_from_xml`
was called. This meant that not all of the fields were being loaded
correctly. To fix it, we used the mixoligist from the runtime to apply
the mixins earlier in the process. However, that caused the mixins to be
applied twice.
The included fixes to xblock resolved the multiply-applied mixins, and
the fixes to the parsing code make it simpler to understand, and add
some unit tests of the parsing to boot.
2013-09-27 10:57:39 -04:00
Shiwen Cheng
522cb8b48c
fix the video caption lag issue
2013-09-27 22:41:36 +08:00
Shiwen Cheng
77f3e4f964
fix the bug: when click a caption, the previous one will be in bold
2013-09-27 22:41:35 +08:00
Shiwen Cheng
21a9446b99
fix the bug that the first caption and the second one will become current at the same time when displaying right captions
2013-09-27 22:41:35 +08:00
jmclaus
ebcb134c2e
First caption does not display outline on initial mouseover.
2013-09-27 15:50:24 +02:00
Don Mitchell
2379e7c3fc
Merge pull request #1029 from edx/dhm/migrate_mongo
...
Migrate courses from old mongo to split
2013-09-26 10:35:52 -07:00
Don Mitchell
f63aa0f547
Pylint and pep8 hygiene
2013-09-26 12:57:40 -04:00
Don Mitchell
59b31474ca
Separate db config from modulestore config parms
...
use to instantiate loc_mapper
test loc_mapper injection into split modulestore
2013-09-26 12:57:40 -04:00
Don Mitchell
d328c53dff
Cached course entry: separate structure from identity
...
Don't undo inheritance by unsetting course_entry structure
Do finer-grained cache clearing
2013-09-26 12:57:40 -04:00
Don Mitchell
c1789adfd9
Always return a Locator: cases weren't exhaustive.
2013-09-26 12:57:39 -04:00
Don Mitchell
934b3ca7c0
Check has_children before accessing children
2013-09-26 12:57:39 -04:00
Don Mitchell
b4fa316294
Migrate data from old mongo to split mongo
...
Create location mapping
Create draft and published course with proper content in split.
2013-09-26 12:57:39 -04:00
Giulio Gratta
bbd902f87e
Last Changes before Merge
...
- Change variable name to make it more clear
2013-09-26 09:52:30 -07:00
Giulio Gratta
68ce6ed1c8
Second batch of ORA UI fixes:
...
- Change wording when done with peer grading ("evals" -> "assessments")
- Added ICE legend item for comment syntax
- Added conditionals to display human readable 'grader_type' to alleviate confusion
- Rename 'Show/Hide Prompt' to 'Show/Hide Question'
- Reworded grading flags
- Make ICE grading container larger to more easily allow users to read and edit larger texts
- Adjusted lots of text and word choices to make them more user friendly
- Disable previous arrow on first grader feedback and next arrow on last grader feedback
- hide ORA instructions and ICE legend when calibrating so students don't feel like they need to write feedback
Changes after comments:
- Renamed instructions element and fixed casing issue
- Renamed legend class to ice-legend
- Changing condition from != to >= to not only fix incorrect one but also catch possible weirdness
- Grammar fix in a message
- Removing grader_type conditional in HTMl to give way to the one in python
- Moving ice feedback area height styling to CSS file
More changes:
- Update ICE version
- Modifying test to reflect code change
- Adding ICE undo feature
2013-09-26 09:26:35 -07:00
Don Mitchell
ef26e8baa3
Just write the loc name as the key in the policy file
2013-09-25 14:41:42 -04:00
Calen Pennington
f4b37b28b1
Merge pull request #1060 from cpennington/lazy-textbooks
...
Make Textbooks properly lazy
2013-09-25 11:32:09 -07:00
jkarni
7bd54546e3
Merge pull request #597 from edx/feature/msteele/scrollup
...
Add scroll-to-top when switching verticals from bottom nav buttons.
2013-09-25 08:38:24 -07:00
Valera Rozuvan
a8349a06cd
Merge pull request #1120 from edx/valera/fix_for_unnecessary_outline_around_video
...
Fix for bug BLD-359: Unnecessary focus outline around Video Player.
2013-09-25 07:00:47 -07:00
Don Mitchell
dd788c8fb2
Merge pull request #1107 from edx/dhm/bug_attrs
...
Ensure location is valid before trying to fetch
2013-09-25 05:50:49 -07:00
Valera Rozuvan
8b4489233e
Fix for bug BLD-359: Unnecessary focus outline around Video Player.
2013-09-25 14:53:46 +03:00
Don Mitchell
20e4d585c8
Add documentation and comments.
2013-09-24 16:31:21 -04:00
Don Mitchell
d1a82f2ac5
Import/export static content properties
...
Even though xml based courses will ignore.
2013-09-24 16:31:20 -04:00
Don Mitchell
3b61d5721a
Ensure location is valid before trying to fetch
...
Prevent accidental wildcarding.
2013-09-24 09:03:36 -04:00
jmclaus
3a5d7d8638
Addressed PR comments
2013-09-24 12:12:10 +02:00
jmclaus
feb95eb869
Fixed tests
2013-09-24 10:31:37 +02:00
jmclaus
2cc9679ea8
Used Jasmine jQuery for tests instead
2013-09-24 10:31:37 +02:00
jmclaus
ffa49b0391
Added tests
2013-09-24 10:31:37 +02:00
jmclaus
9836fd51c7
Speed control now regains focus after a speed entry has been selected with the keyboard
2013-09-24 10:31:36 +02:00
Will Daly
5347a49975
Disable test that fails intermittently in master
2013-09-23 16:50:02 -04:00
jkarni
199f898d23
Merge pull request #1087 from edx/jkarni/fix/revert-xml-comments
...
Jkarni/fix/revert xml comments
2013-09-23 12:18:21 -07:00
Don Mitchell
a4ee129f04
Merge pull request #1095 from edx/dhm/asset_bug
...
Fixed missing read (cut/paste f'up)
2013-09-23 12:17:56 -07:00
Calen Pennington
63b841bca9
Merge pull request #1062 from cpennington/speed-up-location-creation
...
Speed up Location creation returning existing locations where possible
2013-09-23 11:55:36 -07:00
Calen Pennington
25ea91ed4a
Merge pull request #1061 from cpennington/faster-location-urls
...
Turn Locations into dicts less often
2013-09-23 11:55:00 -07:00
Don Mitchell
3daeb59aca
Fixed missing read (cut/paste f'up)
2013-09-23 14:09:58 -04:00
