Commit Graph

7051 Commits

Author SHA1 Message Date
Brian Talbot
633126234e drupal integration - adding back in modal assets for password recovery - wip 2013-01-23 18:22:13 -05:00
Brian Talbot
c500896913 drupal integration - adding back in modal assets for passwor recovery - wip 2013-01-23 18:22:13 -05:00
Brian Talbot
de4f35df77 drupal integration - plumbing in password reset UI updates - wip 2013-01-23 18:22:13 -05:00
Brian Talbot
2019af4170 drupal integration - revised/proofed header and footer styles to match spacing of marketing site and renamed social icons 2013-01-23 18:22:13 -05:00
Brian Talbot
42d4b4d69b drupal integration - revised padding between content and footer globally, removed secondary form actions for time being 2013-01-23 18:22:13 -05:00
Brian Talbot
2f6255378f drupal integration - revised UI of global footer to matched marketing site footer content and feel 2013-01-23 18:22:13 -05:00
Brian Talbot
eda371a1f7 drupal integration - revised UI of course slim header to coincide with marketing site theme 2013-01-23 18:22:12 -05:00
Brian Talbot
d6354fd8b1 drupal integration - revised general header HTML and Sass to coincide with marketing site nav and theme 2013-01-23 18:22:12 -05:00
Brian Talbot
eaeae03315 drupal integration - further sass refinment and hiding example error states 2013-01-23 18:22:12 -05:00
Brian Talbot
009ac06d4d drupal integration - added unified account-centric Sass, which holds registration/login styling 2013-01-23 18:22:12 -05:00
Brian Talbot
7c7d0da5b4 drupal integration - styled page layout, form fields and states, added in status message areas/standards and revised Sass 2013-01-23 18:22:12 -05:00
Brian Talbot
6bff41708d cleaning up LMS Sass variables a bit 2013-01-23 18:22:12 -05:00
Brian Talbot
1db87e0533 drupal integration - added sass files to architecture and plumbed HTML for login and register views 2013-01-23 18:22:12 -05:00
Brian Talbot
2c604bc473 changing url name to signin 2013-01-23 18:22:12 -05:00
John Jarvis
9af7c6cc5d adding login views 2013-01-23 18:22:12 -05:00
Brian Talbot
ed39ca2303 initial branch creation for reg/login revisions with drupal 2013-01-23 18:22:12 -05:00
Diana Huang
cc67017d4c Merge branch 'master' into diana/open-ended-ui-updates 2013-01-23 16:45:40 -05:00
Kevin Chugh
1bd9366e40 Merge remote-tracking branch 'origin/master' into feature/kevin/groups 2013-01-23 16:26:06 -05:00
Kevin Chugh
59b3dc61a2 lms producing grouped content 2013-01-23 16:25:26 -05:00
Calen Pennington
993c24b72b WIP: Model data caching work 2013-01-23 14:51:07 -05:00
Calen Pennington
507d2021cd Remove unused reference to StudentModuleCache 2013-01-23 14:47:06 -05:00
Calen Pennington
abb21ab111 staff_problem_info.html only renders for staff, so don't check for staff access 2013-01-23 14:47:06 -05:00
Calen Pennington
4779043a5f Add message during 404 for debugging 2013-01-23 14:47:05 -05:00
Calen Pennington
6e7afb968d Move xqueue handler to new module format, and continue to distinguish grades set by xqueue from those set by ajax in stats 2013-01-23 14:47:05 -05:00
Calen Pennington
ae2a8e0c58 Whitespace cleanup 2013-01-23 14:37:42 -05:00
Calen Pennington
6c181470c6 staff_problem_info.html is only put on the page for staff, so we don't need to check staff_access inside it 2013-01-23 14:37:36 -05:00
Don Mitchell
b0bbb34644 Merge pull request #1331 from MITx/feature/christina/tiny-mce
Feature/christina/tiny mce
2013-01-23 09:14:42 -08:00
jmvt
549a5e9fe9 Merge remote-tracking branch 'origin/master' into jmpm-analytics 2013-01-23 12:02:48 -05:00
Ned Batchelder
6f322bcd81 Simplify the construction of the ErrorDescriptor 2013-01-23 11:34:42 -05:00
Ned Batchelder
376575dedd Make system.xblock_model_data more explicit to fix the problem where error descriptors can't get any data because the schema and the data don't match. 2013-01-23 11:34:24 -05:00
Chris Dodge
54ee1607b8 add unit test to test DraftModuleStore.get_items() fix 2013-01-23 11:22:37 -05:00
Deena Wang
ca185c034f Merge branch 'feature/deena/testing' of https://github.com/MITx/mitx into feature/deena/testing
Conflicts:
	lms/djangoapps/courseware/tests/test_module_render.py
2013-01-23 10:50:37 -05:00
Deena Wang
3fd69bcae4 more tests in test_views.py 2013-01-23 10:41:12 -05:00
jmvt
4f005044d6 Added time of query display. 2013-01-23 10:17:17 -05:00
David Ormsbee
eab9511466 Merge pull request #1295 from MITx/feature/jarv/certificate-force-update
Feature/jarv/certificate force update
2013-01-23 06:32:41 -08:00
Diana Huang
5ca1586e0c Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 2013-01-23 08:57:47 -05:00
Diana Huang
71e4541c69 Merge branch 'master' into feature/diana/rubric-input 2013-01-23 08:56:55 -05:00
Brian Wilson
ba62a657bf Merge remote-tracking branch 'origin/master' into bugfix/brian/openid_provider_post 2013-01-22 23:50:38 -05:00
Brian Talbot
023dadd074 studio - resolved base variable missing issue on lms side 2013-01-22 16:31:42 -05:00
marco
7b12dac021 added make visible to menu, and visibility description to threads 2013-01-22 15:47:23 -05:00
Jay Zoldak
26ee9a24ef Add test for TOC rendering 2013-01-22 15:15:47 -05:00
Deena Wang
7884e2c690 more tests 2013-01-22 15:08:44 -05:00
Calen Pennington
75b0a8eed6 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2013-01-22 14:47:52 -05:00
Calen Pennington
bbcab7314a Anonymous users don't have an email attribute, and shouldn't be checked for CourseEnrollmentAllowed 2013-01-22 14:10:01 -05:00
Deena Wang
3565023389 created test_courses.py 2013-01-22 14:01:01 -05:00
Diana Huang
24f23176af Add the ability to set up custom text for short form and
and long form results.
2013-01-22 13:17:37 -05:00
Diana Huang
9a53c37530 Use something more visually easy to use for self-assessment. 2013-01-22 11:25:12 -05:00
Brian Wilson
9653631e9a Add initial openid_provider tests (covers xrds and authentication requests) 2013-01-22 11:15:30 -05:00
Deena Wang
6e773909e4 added test_views 2013-01-22 10:36:05 -05:00
Diana Huang
ba1cd8117f Rename 'Pending' column to something more descriptive 2013-01-22 10:33:07 -05:00