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

17808 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Don Mitchell
b9a7c7f752 Create new structure allows override of usage id and category 2013-09-20 10:58:17 -04:00
Don Mitchell
2c90dc73cd Don't access kvs directly but use x_module and field_data mechanisms 2013-09-19 14:45:06 -04:00
Will Daly
1c3c9217bd Merge pull request #997 from edx/will/disable-broken-test 
Disabled broken test in master.
 2013-09-16 09:35:00 -07:00
Will Daly
adabef7256 Disabled broken test in master. 2013-09-16 11:32:24 -04:00
Brian Talbot
91f9338e06 Merge pull request #982 from edx/talbs/fix-lms-header 
LMS: FIX - Header Logo and Global Nav Styling
 2013-09-16 07:35:20 -07:00
jkarni
fb363fb90b Merge pull request #919 from edx/jkarni/fix/keep-comments 
Make default parser keep comments
 2013-09-16 07:26:44 -07:00
David Ormsbee
a2034c5bb9 Merge branch 'release' 2013-09-15 16:11:31 -04:00
Jason Bau
ac05b5c28e Merge pull request #956 from edx/giulio/ice-pr 
Implementing NYT's ICE track changes to Open Ended Assessements
 2013-09-15 10:11:34 -07:00
Giulio Gratta
fe59a8ce62 Implementing NYT's ICE track changes to Open Ended Assessements 
Squashed commits to facilitate cherry-picking.  Committers and
original commit messages are:
- ==> @caesar2164, * ==> @jrbl, ~ ==> @jbau

- Added boolean to OE problem CMS settings to turn on ICE track changes
- Added ICE init and tracking start/stop to HTML
- Conditional in Peer Grading HTML for ICE container
- CSS styling for ICE container and insertion/deletion elements
- Added class to track changes HTML
- Added ice.min.js as well as included it in the js requirements for peer grading
- Use track_changes in peer_grading_problem
* Refactor peer_grading_problem to lookup track_changes variable by problem location.
* Whitelist ICE insert, delete tags
* Adds ICE multi-user-editor insert and delete tags to the peer grading sanitize_html whitelist.
- add reset button

* Introduction ICE means we need its inline tags to get passed through
  to the feedback target, but we don't want malicious peer feedback
  providers introducing <script>, etc, so we use lxml.html.clean to
  scrub peer grading input.
* Adds feedback URL autoheating.
* Allows ICE <insert> and <delete> tags but not others.

~ add helptext re: EXPERIMENTAL FEATURES

~ address a bunch of @VikParuchuri review comments on ICE for OEE
  ~ remove extraneous code
  ~ change to new xmodule accessors
  ~ refactor filtering

~ fix broken test test_peer_grading_problem

~ Create track_changes.coffee and remove <script> from
  peer_grading_problem.html
~ Remove all reliance on id in favor of local scoping and classes

~ bring up test coverage somewhat

~ remove superflous $.scrollTo

~ TODO: Filtering
 2013-09-15 09:49:28 -07:00
Vik Paruchuri
6e8c8a647c Remove due date setting 2013-09-15 12:34:46 -04:00
Calen Pennington
33f13846a5 Merge branch 'release' 2013-09-14 07:00:17 -04:00
Calen Pennington
b9f8869c50 Merge pull request #985 from cpennington/mixins-for-xml-hotfix 
Add mixins to XModuleDescriptors as they are loaded during xml parsing
 2013-09-13 19:18:52 -07:00
Ned Batchelder
ed1a07382e Merge pull request #974 from edx/ned/keep-bson-in-mongo-code 
keep-bson-in-mongo-code
 2013-09-13 14:36:13 -07:00
Diana Huang
47ce9082e4 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py
 2013-09-13 17:15:44 -04:00
Calen Pennington
ce4c76ef37 Add mixins to XModuleDescriptors as they are loaded during xml parsing 2013-09-13 16:56:33 -04:00
Diana Huang
97a69e56df Merge pull request #969 from edx/hotfix-2013-09-13 
Hotfix 09/13/2013
 2013-09-13 13:53:07 -07:00
Brian Talbot
edcd76c666 LMS: resolves header logo and global nav inheriting verification reset link styling 2013-09-13 16:39:48 -04:00
Calen Pennington
c14423dbeb Merge pull request #973 from cpennington/update-location-hotfix 
Don't try and modify the location proproperty
 2013-09-13 12:54:17 -07:00
Ned Batchelder
4d99ef7eba Merge pull request #976 from edx/ned/fix-setattr-and-getattr 
fix-setattr-and-getattr
 2013-09-13 12:50:29 -07:00
John Jarvis
39d441e132 Merge pull request #765 from edx/jarv/grade-dump 
Jarv/grade dump
 2013-09-13 12:31:25 -07:00
David Ormsbee
1ac71223c1 Merge pull request #979 from edx/ormsbee/ss_small_fixes 
Send JSON messages to Software Secure in UTF-8, without escaping
 2013-09-13 12:25:44 -07:00
Brian Talbot
15b3b9ade0 Merge pull request #977 from edx/talbs/fix-i8tn-nav 
LMS: Header Logo/Brand alt Attribute Value Fix
 2013-09-13 12:24:45 -07:00
Brian Talbot
03e8c4b0ae Merge pull request #978 from edx/talbs/fix-verification-copy2 
Verification: Copy/Instruction Edits
 2013-09-13 12:24:16 -07:00
David Ormsbee
8c056f383e Make sure our JSON messages output unescaped UTF-8 text, to match Software Secure expectations. 2013-09-13 15:20:08 -04:00
Brian Talbot
ec94376de4 Verification: revises instructional photo review copy to match page layout change 2013-09-13 15:15:44 -04:00
Calen Pennington
3f8a2f03ee Use a setter to make editing location possible 2013-09-13 15:05:17 -04:00
Brian Talbot
4b4c68d9fd LMS: resolves alt attribute copy issue for app/brand logo element - i8tn and settings data 2013-09-13 15:01:07 -04:00
Ned Batchelder
bbf508ca7b fix-setattr-and-getattr 2013-09-13 14:44:49 -04:00
Ned Batchelder
37e81007d6 keep-bson-in-mongo-code 2013-09-13 14:29:56 -04:00
Gabe Mulley
b1a76f1258 Merge pull request #925 from mulby/fix/gabe/configurable-tracking-filter 
Make URL patterns to exclude from tracking configurable
 2013-09-13 11:10:59 -07:00
Greg Price
e360f1d54f Merge pull request #950 from edx/gprice/dialog-role 
Add ARIA dialog role to Markdown editor dialogs
 2013-09-13 10:42:58 -07:00
Diana Huang
9d6c104f54 Merge pull request #963 from edx/diana/better-order-error-handling 
Show order errors in page instead of in an alert.
 2013-09-13 09:38:19 -07:00
Vik Paruchuri
8613594c49 Merge pull request #971 from edx/fix/vik/pg-hotfix 
Fix/vik/pg hotfix
 2013-09-13 09:23:00 -07:00
Frances Botsford
bf14476242 adjusted error wording on failed photo verification order 2013-09-13 12:10:10 -04:00
David Ormsbee
dcbb9bcdfb Merge pull request #972 from edx/ormsbee/ss_small_fixes 
Small fixes for unicode
 2013-09-13 09:07:15 -07:00
Jason Bau
1a5176c9cb Merge pull request #966 from edx/jbau/fix/verify-student-aws-settings-defaults 
fix default for VERIFY_STUDENT in lms/envs/aws.py
 2013-09-13 09:02:45 -07:00
Frances Botsford
0815bd48fe adjusted error wording on failed photo verification order 2013-09-13 11:54:32 -04:00
David Ormsbee
d1e1e7e5bc Minor fixes to handle non-ASCII names/config in student verification. 2013-09-13 11:49:54 -04:00
David Ormsbee
b6a863fb0e Make sure we use the name that was frozen at time of verification when sending to Software Secure. 2013-09-13 11:48:44 -04:00
Gabe Mulley
761a4dcc97 Make URL patterns to exclude from tracking configurable 
* Add unit test coverage for this "exclusion from tracking" logic
* Exclude based on regex match instead of raw string comparison
* Exclude heartbeat requests from tracking
 2013-09-13 11:24:51 -04:00
James Tauber
c6dfd97eeb Merge pull request #902 from antoviaque/accessibility 
Help Modal - Accessibility Fixes
 2013-09-13 08:21:47 -07:00
Vik Paruchuri
c6e5e67483 Fix linking problem for peer grading, add in a test 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_peer_grading.py
 2013-09-13 11:09:06 -04:00
Vik Paruchuri
00050a08a4 Address review comments 2013-09-13 11:07:36 -04:00
Vik Paruchuri
640b7fe6b5 Fix problem with peer grading list not rendering, test 2013-09-13 11:07:22 -04:00
Vik Paruchuri
009017fe07 Address review comments 2013-09-13 11:06:40 -04:00
Vik Paruchuri
b222e66f45 Fix nopathtoitem error in peer grading 2013-09-13 11:06:23 -04:00