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

2941 Commits

Author SHA1 Message Date
Frances Botsford
abd678e464 initial step interaction for verification 2013-08-21 15:27:37 -04:00
Jason Bau
ef4e8f7e13 move currency formatting into template 2013-08-21 10:31:26 -07:00
Jason Bau
64c8a7444f add handling of CyberSource non-ACCEPT decisions 2013-08-21 13:14:22 -04:00
Jason Bau
a4f5f4e42f about page changes, refactor processor reply handling 2013-08-21 13:14:21 -04:00
Jason Bau
0b8f41443f Lots more verification of CyberSource reply + receipt generation 2013-08-21 13:14:21 -04:00
Jason Bau
cf9d42772f factor out cybersource processor from cart 2013-08-21 13:14:21 -04:00
Jason Bau
ab1452cb1a add Order model fields for receipt generation 2013-08-21 13:14:21 -04:00
Jason Bau
1f6bdca6dd add Validation function for cybersource receipt POST 2013-08-21 13:14:21 -04:00
Jason Bau
ed4e7f54c7 Move shopping cart from session into model/db 2013-08-21 13:14:21 -04:00
Jason Bau
1a3953ca89 add parameterization of cybersource creds 2013-08-21 13:14:21 -04:00
Jason Bau
9e56028091 added shopping cart list template, embedded form 2013-08-21 13:14:20 -04:00
Frances Botsford
07b94f7dd4 added font variables for LMS, more sass for verification 2013-08-20 21:59:23 -04:00
Miles Steele
cb7a3ad8eb switch from log_event to Logger.log 
keep log_event for compatibility
 2013-08-20 16:52:18 -04:00
Frances Botsford
2e821be65f adding some standard sass bits to LMS and bare bones sass for verification 2013-08-20 16:04:48 -04:00
Chris Dodge
2e1eb1dce5 add escaping 2013-08-19 23:41:49 -04:00
Chris Dodge
f599d4b508 don't put the substitutions in quotes 2013-08-19 23:41:49 -04:00
Frances Botsford
94c442c9cc initial rough skeleton for verification flow 2013-08-19 16:48:36 -04:00
Adam Palay
cb3429570c set first FAQ link to mktg webiste too 2013-08-19 16:34:17 -04:00
Brian Talbot
fc4eb3786a mktg - revised sass/css for iframed button to match styles/consistency 2013-08-19 10:25:29 -04:00
Vik Paruchuri
59336ee03c Fix prompt hiding issue in peer grading 2013-08-16 15:24:38 -04:00
Vik Paruchuri
bc8244b709 Rename reset to try again, hide and disable submit buttons 2013-08-16 14:43:37 -04:00
Vik Paruchuri
4f3ec68fb7 Scroll to top in peer and staff grading, preserve line breaks in submissions 2013-08-16 14:12:37 -04:00
Vik Paruchuri
be3291eeb0 Proper scoping, show status to staff, fix line break issues, multiple self assessments on one page work 2013-08-16 13:22:34 -04:00
Frances Botsford
d4ea8388a6 updated styling for marketing side register button to accommodate second line of text - and IE-specific styling 2013-08-16 11:28:07 -04:00
Frances Botsford
445cf39f8b updated styling for marketing side register button to accommodate second line of text 2013-08-16 10:39:45 -04:00
Diana Huang
4946fbcd5b Change registration button based on number of modes. 2013-08-15 16:34:48 -04:00
Vik Paruchuri
f8b5e67363 Text and styling cleanup 2013-08-15 14:52:51 -04:00
Vik Paruchuri
a084d4486d Get rid of labels 2013-08-15 14:28:52 -04:00
Vik Paruchuri
ac4d312415 Make rubric text generic, fix right arrow 2013-08-15 14:26:42 -04:00
David Ormsbee
59c2bb18ef Bare bones outline of ID verification templates 2013-08-15 14:20:36 -04:00
marco
72bb93d436 Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui 2013-08-15 13:57:05 -04:00
marco
7865fbe0df cleaned up padding for peer review training and grading states, removed extraneous response label,fixed style issue on rubric for peer grading where rubric items had a background color overridding the intended style 2013-08-15 13:56:17 -04:00
Vik Paruchuri
9211a38374 Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
 2013-08-15 11:36:11 -04:00
Vik Paruchuri
6f657c1124 Import to fix internationalization 2013-08-15 10:30:16 -04:00
Jay Zoldak
c65c9eb069 Merge pull request #657 from edx/zoldak/fix-i18n-enroll 
The enrollment_action value enroll should not be translated.
 2013-08-14 13:18:00 -07:00
marco
c9807db308 styling of peer review interface for students along with minimal adjustments to the staff grading interface as well. added internationalization of peer grading strings. 2013-08-14 14:12:04 -04:00
Valera Rozuvan
99ae63777e Removed unnecessary tabindex = 0 from <a /> - they get it by default. 2013-08-14 11:51:15 +03:00
Valera Rozuvan
05539b1bbe Removed unnecessary tabindex -1 from Video template. 2013-08-14 10:51:45 +03:00
marco
3a970d1490 restyled controls area for motion through multiple scored peer reviews 2013-08-13 20:56:53 -04:00
Adam Palay
307d27db9a fix syntax error in help_modal 2013-08-13 16:13:42 -04:00
Adam Palay
4fc8aaab02 if mktg, redirects faq to mktg. else, to '/help' 2013-08-13 16:13:42 -04:00
marco
ab81000665 visual styling changes to staff grading and peer grading, along with additional instances of the use of the baseline variable instead of pixel definitions for padding and margins. 2013-08-13 14:42:34 -04:00
Adam Palay
5a7b72667e replace html strings wtih tokens in templates 2013-08-13 11:19:58 -04:00
Jay Zoldak
c09da60fe3 The enrollment_action value enroll should not be translated. 2013-08-13 08:43:09 -04:00
Adam Palay
f9ab433e26 add settings.PLATFORM_NAME to password_reset_confirm context 2013-08-12 17:58:31 -04:00
Adam Palay
18a979bb4d put wiki templates back into Django templating 2013-08-12 16:42:07 -04:00
Adam Palay
13d54c0dd7 fix password reset templates 2013-08-12 15:57:27 -04:00
Adam
0db8ad28dc Merge pull request #640 from edx/adam/i18n-bug-fixes 
instructor dash fixes
 2013-08-12 11:16:22 -07:00
Lyla Fischer
e817fb4ca1 Merge pull request #637 from edx/vaxxxa/videoalpha_to_video 
Migration videoalpha module to one main video module
 2013-08-12 10:56:12 -07:00
Miles Steele
e6d44f5ae7 Merge pull request #626 from edx/feature/msteele/instrdash 
Enable beta dashboard, add copy, add i18n
 2013-08-12 10:38:26 -07:00