Commit Graph

6365 Commits

Author SHA1 Message Date
Valera Rozuvan
0e850aff52 Completed main functionality. Ready for code review.
Now when controls are uatohidden and focus is on one of them, we
switch the focus to the mian Video element.

Code documented a bit.

When controls are autohidden, we make sure that speeds and volume
controls drop downs are closed.
2013-09-18 15:08:02 +03:00
Valera Rozuvan
28888bda5d Initial commit. 2013-09-18 15:08:02 +03:00
Giulio Gratta
d4687aa6df 4 OE/ORA UI fixes to make it easier to use
- require confirmation when clicking Open Ended reset button (now working)
- require confirmation when submitting Open Ended essay (now working)
- disable text feedback area during calibration and let users know that they should give feedback when grading
- fixed error message typos
2013-09-17 16:13:36 -07:00
Brian Talbot
c0fec1b211 Merge pull request #1006 from edx/talbs/lms-sassplaceholders
LMS/Accounts: Switch class-based Sass @extend rules to use Sass placeholder syntax
2013-09-17 13:11:41 -07:00
Brian Talbot
da7127e7ef LMS/Accounts: Converts many class-based Sass archetype-focused @extends to use Sass placeholder syntax 2013-09-17 16:11:26 -04:00
Brian Talbot
a6e92cda62 LMS: removes placeholder copy (lorem ipsum) that was never used or never replaced if cases are in use 2013-09-17 16:10:24 -04:00
Greg Price
15f620d37d Merge pull request #1003 from edx/gprice/fix-user-profile-links
Fix a bug in links on forum user profile pages
2013-09-17 08:26:39 -07:00
Diana Huang
d191847ff5 Merge branch 'release'
Conflicts:
	lms/static/sass/views/_verification.scss
2013-09-17 10:55:22 -04:00
Greg Price
9e4b24daa2 Merge pull request #924 from edx/gprice/fix-forum-sidebar-overlap
Fix forums nav sidebar overlapping content
2013-09-17 07:22:40 -07:00
chrisndodge
0601761d27 Merge pull request #1000 from edx/fix/cdodge/courseware-index-perf-tweek
Fix/cdodge/courseware index perf tweek
2013-09-17 06:50:33 -07:00
Chris Dodge
1a5edcd998 we already have the descriptor, so call get_module_for_descriptor() rather than refecting that subtree which is multiple round-trips to DB
fix line indents
2013-09-17 08:15:00 -04:00
Jason Bau
36085a692d apache lms wsgi fix 2013-09-16 21:46:57 -07:00
Jason Bau
706b386a57 Revert "4 OE/ORA UI fixes to make it easier to use"
This reverts commit 3b29d6056e.
2013-09-16 20:22:18 -07:00
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
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
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
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
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
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
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
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
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
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
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
Brian Talbot
edcd76c666 LMS: resolves header logo and global nav inheriting verification reset link styling 2013-09-13 16:39:48 -04: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
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
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
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
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