Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,340 Commits 1 Branch 0 Tags
667df875bdb2bb66546b395d3aba2c9e3f40b0f7
Commit Graph

9029 Commits

Author SHA1 Message Date
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
Calen Pennington
cfa2b27f26 Turn Locations into dicts less often 2013-09-23 13:46:48 -04:00
Calen Pennington
ad2da44cb1 Make Textbooks properly lazy 2013-09-23 13:44:34 -04:00
Don Mitchell
379a147a57 Begin transactional with_version impl 
Change create_item to optionally add the item to the head version and not create a new version.
 2013-09-23 11:35:53 -04:00
Don Mitchell
bd56ee21d2 split get_item uses loc_mapper to decode old style Locations 2013-09-23 11:35:53 -04:00
Don Mitchell
40d11c73cf location mapper maturation 
richer exceptions, add_map return course_id, fix a bug, filter out unwanted kwargs in init
 2013-09-23 11:35:53 -04:00
Julian Arni
920b76410c Revert "don't remove comments from xml module" 
This reverts commit 343456e314.
 2013-09-22 21:39:36 -04:00
Julian Arni
303508a95b Revert "Make default parser keep comments" 
This reverts commit 238899faac.
 2013-09-22 21:39:14 -04:00
Jason Bau
7c1a3e1ea1 wording changes for setting help 2013-09-20 14:23:05 -07:00
Jason Bau
9c4ff9ba95 Add setting on combinedopenended to allow peergrading of finished submissions 2013-09-20 14:23:05 -07:00
Vik Paruchuri
57fb306c74 Merge pull request #1068 from edx/feature/vik/oe-save 
Implement a save button for open ended responses
 2013-09-20 14:16:32 -07:00
Brian Talbot
936d2e0ffe Merge pull request #1047 from edx/talbs/lms-tablesupport 
Capa and HTML xmodules: Text Justification Styling Classes Table-based Displays
 2013-09-20 14:01:03 -07:00
Vik Paruchuri
d9ce5e073b Implement a save button for open ended responses 2013-09-20 16:35:10 -04:00
Adam
065a1cf2bd Merge pull request #1078 from edx/adam/parse-xml-module 
don't remove comments from xml module
 2013-09-20 11:28:46 -07:00
Don Mitchell
464e0c77f4 Merge pull request #1045 from edx/assets/persist_lock 
save lock state in contentstore
 2013-09-20 10:51:31 -07:00
Vik Paruchuri
c3a155da93 Merge pull request #1064 from edx/fix/vik/pg-tests 
Add in peer grading tests to cover linking behavior
 2013-09-20 10:42:37 -07:00
Vik Paruchuri
ecb6f0f944 Add in peer grading tests to cover linking behavior 2013-09-20 11:47:26 -04:00
Don Mitchell
7d13eb8f7d Add locked attribute to assets. 2013-09-20 11:28:00 -04:00
Don Mitchell
e69955b437 Pylint/pep8 fixes 2013-09-20 11:28:00 -04:00
jkarni
b580aa0f1f Merge pull request #1024 from edx/jkarni/fix/IOError 
Catch IOError and ignore if OS X companion file
 2013-09-20 08:22:51 -07:00