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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Zoldak
cbbfc41cb0 Merge pull request #995 from edx/zoldak/fix-acceptance 
Simplify retry logic for ui helper functions
 2013-09-16 14:30:58 -07:00
James Tauber
a1693dced7 Added linebreaks. 2013-09-16 17:05:57 -04:00
James Tauber
9b65a1a90d Link to wiki with absolute URLs 2013-09-16 17:04:38 -04:00
Brian Talbot
259d3124c0 Merge pull request #990 from edx/talbs/verification-sassplaceholders 
Verification: Switch class-based Sass @extend rules to use Sass placeholder syntax
 2013-09-16 13:50:48 -07:00
James Tauber
ca1f4bad7d Moved to a more comprehensive contributing doc. 
Based on the How To Contribute wiki page (and switched to markdown so
it's a simple copy-paste).
 2013-09-16 16:50:08 -04:00
Jay Zoldak
30b13d3cf1 Improve code clarity and error messages for css selection 2013-09-16 16:49:18 -04:00
Jay Zoldak
2ff056df8c Simplify retry logic for ui helper functions 2013-09-16 16:49:17 -04:00
Jay Zoldak
50f190c55d Merge pull request #1004 from edx/zoldak/skip-cert-tests 
Skip verified cert acceptance tests that upload to s3
 2013-09-16 13:46:26 -07:00
James Tauber
e726ef4c46 Link to How To Contribute wiki page 
Created a CONTRIBUTING.rst which GitHub will pick up and included a
link to the How To Contribute wiki page there. Also added the same link
to the README in the "How To Contribute" section.
 2013-09-16 16:30:26 -04:00
Brian Talbot
c101465fe9 Verification: converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax 2013-09-16 16:18:51 -04:00
Jay Zoldak
6531918af5 Skip verified cert acceptance tests that upload to s3 2013-09-16 16:11:21 -04:00
Greg Price
6296e2dc19 Fix a bug in links on forum user profile pages 
Previously, if a course id contained a '-' character, links from that
page to threads would lead to 404s.
 2013-09-16 15:32:56 -04:00
Diana Huang
cf8b7c6e92 Merge pull request #996 from edx/hotfix-2013-09-16 
Hotfix 2013-09-16
 2013-09-16 12:27:40 -07:00
David Baumgold
e794688274 Indicate that rb-inotify and rb-fsevent aren't actually necessary 2013-09-16 15:27:37 -04:00
Julian Arni
cdf0eef5ca Consider redirect code as succcesful 2013-09-16 15:06:51 -04:00
David Ormsbee
b7836c94d4 Merge pull request #999 from edx/ormsbee/ssl_checking_for_ss 
Handle self-signed cert from Software Secure
 2013-09-16 11:39:46 -07:00
David Ormsbee
4245c229d8 Don't verify SSL cert when submitting to Software Secure (they're using self-signed cert for the moment). 2013-09-16 14:21:03 -04:00
caesar2164
54f103dd45 Merge pull request #993 from edx/giulio/ORA-fixes-squash 
4 OE/ORA UI fixes to make it easier to use
 2013-09-16 11:14:42 -07:00
Brian Talbot
ff492697a9 Merge pull request #998 from edx/talbs/verification-copytweaks 
Verification: Copy/Light UI Pre-Launch Edits
 2013-09-16 11:13:50 -07:00
Brian Talbot
e1d62cb395 Verification: further revises copy per edits/typos noted 2013-09-16 14:13:14 -04:00
Brian Talbot
d600e437d6 Verification: hiding technical help copy when on requirements/prep view 2013-09-16 13:36:03 -04:00
Brian Talbot
c1134acf05 Verification: revises copy and layout of the review step's confirm/next actions UI 2013-09-16 13:36:03 -04:00
Brian Talbot
2680f8dfcc Verification: further revises webcam support w/in browser settings copy 2013-09-16 13:36:03 -04:00
Brian Talbot
9e88be9af1 Verification: removes duplicate course start on receipt view 2013-09-16 13:36:02 -04:00
Brian Talbot
882df8d319 Verification: adds in browser support links, icon-based button help tips, and technical support help info 2013-09-16 13:36:02 -04:00
Brian Talbot
0c61f194de Verification: revises fee/honor code option-based copy 2013-09-16 13:36:02 -04:00
Giulio Gratta
3b29d6056e 4 OE/ORA UI fixes to make it easier to use 
- require confirmation when clicking Open Ended reset button
- require confirmation when submitting Open Ended essay
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
 2013-09-16 10:27:13 -07: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
David Ormsbee
646673ba18 Merge pull request #994 from edx/ormsbee/ss_msg_signing2 
Software Secure message signing pt. 2
 2013-09-16 07:29:29 -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
99841be604 Update docstring on ssencrypt.body_string to be more useful. 2013-09-16 10:23:31 -04:00
David Ormsbee
ab6018a0e5 Replace signature validation with access-key and add logging around Software Secure callbacks. 2013-09-16 10:07:07 -04:00
David Ormsbee
b1be80b848 Extend message signing code to work with dicts, lists. 2013-09-16 10:07:07 -04:00
David Ormsbee
3b44ec11e0 Convert JSON dumps output to UTF-8 before sending to Software Secure 2013-09-16 10:07:07 -04:00
Jason Bau
89a4737da8 fix default for VERIFY_STUDENT in lms/envs/aws.py 2013-09-16 09:45:25 -04: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