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

104 Commits

Author SHA1 Message Date
Calen Pennington
e00b666db9 Merge pull request #5590 from cpennington/xblocks-with-children 
Enable pure XBlocks to use children in edx-platform
 2014-10-16 10:23:35 -04:00
Calen Pennington
fee681be68 Escape xblock wrapper data attributes and css classes for safe html 2014-10-16 09:09:22 -04:00
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00
Waqas Khalid
46abd26e20 Remove extraneous dollar sign in template 2014-10-02 23:28:17 +05:00
Renzo Lucioni
cc6e63dd22 Prepare track selection page for new audit track 2014-09-12 13:58:13 -04:00
Renzo Lucioni
0b2840ee6f Skip audit enrollment if user is in the experimental branch 2014-09-08 14:17:04 -04:00
Piotr Mitros
5364508e48 Merge pull request #5108 from edx/pmitros/retrofix-xargs 
XBlock argument passing support backport from SDK
 2014-09-07 12:51:56 -04:00
Piotr Mitros
167f4171c4 XBlock argument passing support 2014-09-07 12:01:25 -04:00
Andy Armstrong
8349dbfa42 Implement forum cohort visibility labels correctly 
TNL-25
 2014-09-04 13:47:48 -04:00
marco
6f810836db Template changes for course track AB-test 2014-08-15 10:26:29 -04:00
David Baumgold
9b99213b02 Toggle aria-expanded attribute 2014-08-06 09:59:48 -04:00
David Baumgold
3f29fe4fb0 make expanding explanation accessible 
LMS-11161
 2014-08-06 09:59:48 -04:00
Diana Huang
52f9613274 Add an optional description field to course modes. 2014-08-05 09:32:39 -04:00
Diana Huang
3d942503c2 Add the ability to override non-standard verified mode names 2014-08-05 09:32:39 -04:00
Diana Huang
2dbf9442a6 Revise course mode choose page. 
LMS-2796
 2014-06-16 14:08:40 -04:00
Andy Armstrong
7770d9d427 Implement editing from the Studio container page. 
STUD-1306
 2014-04-09 10:32:11 -04:00
Dave St.Germain
6813b27b3b Remove coursename from page H1, and slightly improve sequence navigation 2014-03-13 13:49:14 -04:00
Dave St.Germain
4810bd6d1c Improved sequence navigation accessibility 2014-02-10 14:34:28 -05:00
Giulio Gratta
5e67612e9b Image Modal CMS HTML Block subtype 
- Added YAML file for the HTML template code for the modal to work
- Added CSS and JS code for modal to look and function properly
- Updated code to take comments into account.
- Simplified HTML template and expanded JS to set up image modal on load.
- Added preliminary drag script.
- Converted jQuery UI draggable to Draggabilly
 2014-02-07 09:21:20 -08:00
Dave St.Germain
a6797899da Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections. 2014-02-05 11:32:08 -05:00
Dave St.Germain
636eab8b9e Added more descriptive page titles. 2014-01-30 17:32:03 -05:00
David Baumgold
0b3199d8c1 remove unused jasmine resources 2013-11-07 12:04:35 -05:00
Diana Huang
dc0e3d04ab Determine which mode was selected more intelligently. 
LMS-1384
 2013-11-04 10:25:28 -05:00
Brian Talbot
e9a2787bb3 LMS: adds conditional content/instructions for registration upgrade flow 2013-10-28 14:58:14 -04:00
Brian Talbot
618d307d1f LMS: preps track selection view for upgrade cases 2013-10-25 15:23:51 -04:00
Calen Pennington
ce6fbae693 Add an XBlock javascript runtime, and use it to run XModules 
[LMS-57]
 2013-10-18 16:31:32 -04:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Brian Talbot
e1d62cb395 Verification: further revises copy per edits/typos noted 2013-09-16 14:13:14 -04:00
Brian Talbot
0c61f194de Verification: revises fee/honor code option-based copy 2013-09-16 13:36:02 -04:00
Frances Botsford
896ffd4e77 adjusting wording on choice expand block 2013-09-12 14:43:01 -04:00
Frances Botsford
5c7443be38 cleanup copy on reqs, photo, and choose pages 2013-09-10 09:13:00 -04:00
Frances Botsford
47df7e420f ux adjustments to vcert flow 2013-09-06 12:02:37 -04:00
Frances Botsford
af2424daf1 adjustments to choose and contribution for vcerts 2013-09-06 10:23:46 -04:00
David Ormsbee
90923f3e12 Add min_price var to _contribution.html template 2013-09-06 10:11:29 -04:00
David Ormsbee
4e011326bc Replace placeholder 'Course Name' in paid cert templates with the actual course name 2013-09-05 23:39:35 -04:00
Frances Botsford
b2ddea7a80 updated copy for vcert flow 2013-09-04 13:46:38 -04:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
 2013-09-04 10:58:30 -04:00
Brian Talbot
b75398b0df Verification: moves common page elements/copy into central templates w/ supportive styling 2013-09-03 17:17:13 -04:00
Brian Talbot
4af4b2a022 Verification: add in I8TN support for new templates 2013-09-02 22:38:08 -04:00
Brian Talbot
822caca3f7 Verified: revises styling/presentation of alerts/errors for intro state 2013-08-30 16:03:49 -04:00
Brian Talbot
248b5a9411 Verified: visually cleans up - UI spacing, error styling, registering for badge 2013-08-30 14:27:44 -04:00
Diana Huang
c21cde37a0 Fix some urls on the choose mode page 2013-08-30 10:38:48 -04:00
Brian Talbot
db8a810009 Verified: cleans up extraneous reg selection markup and expandable UI 2013-08-29 16:45:23 -04:00
David Ormsbee
d2292738d6 Update contribution partial template with new style changes. 2013-08-29 14:47:03 -04:00
David Ormsbee
5202bdf85a Merge branch 'ormsbee/verify2' into ormsbee/verifyuser3 
Conflicts:
	common/templates/course_modes/choose.html
	lms/templates/verify_student/photo_verification.html
 2013-08-29 14:34:52 -04:00
Brian Talbot
81a56a35ab Verified: revising template UI, styling, and infrastructure 2013-08-29 14:07:51 -04:00
David Ormsbee
db0af8a863 Enabled honor certificates 2013-08-28 19:21:18 -04:00
David Ormsbee
b2141ee7c0 Add verified cert marketing link 2013-08-28 17:48:28 -04:00
Diana Huang
4471079f71 Clean up validation of price selection. Add error messaging. 2013-08-28 16:43:09 -04:00
David Ormsbee
7af4accc50 Preserve purchase amount choice and redisplay on final verification page. 2013-08-28 15:06:58 -04:00