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

17633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vik Paruchuri
6e8c8a647c Remove due date setting 2013-09-15 12:34:46 -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
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
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
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
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
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
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
Brian Talbot
81df682f35 Merge pull request #967 from edx/talbs/fix-verification-copy 
Verification Process: Copy Changes
 2013-09-13 08:00:35 -07:00
Brian Talbot
1c5e9730f2 Verification: revises copy on receipt page to reflect a completed registration process 2013-09-13 10:14:06 -04:00
frances botsford
473e80f537 Merge pull request #964 from edx/fix/frances/copy-edits-mode-choice 
adjusting wording on choice expand block
 2013-09-12 13:32:58 -07:00
Jay Zoldak
b542864b47 Merge pull request #957 from edx/zoldak/images-in-cert-flow 
Fix acceptance tests to capture images for paid cert flow
 2013-09-12 12:02:38 -07:00
Diana Huang
14e0a4a038 Show order errors in page instead of in an alert. 2013-09-12 14:58:34 -04:00
Frances Botsford
896ffd4e77 adjusting wording on choice expand block 2013-09-12 14:43:01 -04:00
Jay Zoldak
ade62ab90f Fix acceptance tests to capture images for paid cert flow 2013-09-12 14:33:07 -04:00
Diana Huang
8194eedcd9 Merge pull request #952 from edx/ormsbee/ss_msg_signing 
Re-enable signature checking of Software Secure postbacks
 2013-09-12 09:03:36 -07:00
David Ormsbee
221777e6ea Re-enable signature checking for Software Secure callbacks 2013-09-12 11:59:03 -04:00
David Ormsbee
a7cb28fc90 Merge pull request #949 from edx/ormsbee/force_save_on_photo_id_upload 
Force save of photo_id_key on upload
 2013-09-12 07:37:15 -07:00
David Ormsbee
e3895b7856 Force a save of the model when we're uploading a photo ID so our generated key is always saved. 2013-09-12 10:33:24 -04:00
Diana Huang
dbf088ae39 Merge pull request #944 from edx/diana/fix-camera-detection 
Wait for flash to load before trying to detect a camera
 2013-09-12 06:57:36 -07:00
Diana Huang
8839a2053e Wait until the flash object is loaded before looking for a camera. 2013-09-12 09:09:35 -04:00
David Ormsbee
b8fcc118dd Merge pull request #942 from edx/ormsbee/aws_verify_settings 
Tiny change to pull in student verification settings on aws envs
 2013-09-11 22:08:44 -07:00
David Ormsbee
5942a87071 Pull VERIFY_SETTINGS from AUTH_TOKENS 2013-09-12 01:04:01 -04:00
David Ormsbee
92cab96c11 Merge pull request #941 from edx/ormsbee/softwaresecure 
Software Secure message signing and callback
 2013-09-11 21:17:14 -07:00
David Ormsbee
8278357c74 Hook up interface to Software Secure for identity validation. 2013-09-11 23:59:37 -04:00
David Ormsbee
00f96ec79f Merge pull request #937 from edx/zoldak/add-cert-tests 
Add more certificates test for newly implemented features
 2013-09-11 20:33:53 -07:00
David Ormsbee
af9193afda Merge pull request #939 from edx/hotfix/progress-500s 
Hotfix/progress 500s
 2013-09-11 19:04:44 -07:00
David Ormsbee
f9067cbe4d Merge pull request #940 from edx/ormsbee/flash_detect_camera 
Detect cameras and flash
 2013-09-11 18:58:57 -07:00
Renzo Lucioni
fbe5cafdab Merge pull request #936 from edx/renzo/instrument-verified-cert-flow 
Renzo/instrument verified cert flow
 2013-09-11 16:02:43 -07:00
Diana Huang
7ab5ae925d Add in the ability to detect webcams and flash. Show error messages. 2013-09-11 18:39:18 -04:00
Frances Botsford
5921bca082 adding notification to photo page when no flash or webcam is detected 2013-09-11 18:39:17 -04:00
David Ormsbee
e498ad522a Add hasCamera() method to flash camera detection 2013-09-11 18:39:17 -04:00
Adam Palay
9538ae35d4 change graders text to unicode 2013-09-11 18:34:03 -04:00
Adam Palay
ee62719025 check if module created from description is None before looking for its child descriptors 2013-09-11 18:33:51 -04:00