Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2939 Commits

Author SHA1 Message Date
Brian Talbot
1923ae0d6b pearson - added in timer styling for IE7 2013-02-04 15:40:01 -05:00
Your Name
bdfc9d9784 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes 2013-02-04 12:30:48 -05:00
Diana Huang
f49b5ec771 Merge branch 'master' into diana/rubric-ui-improvements 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/self_assessment_module.py
	lms/djangoapps/open_ended_grading/grading_service.py
	lms/static/sass/course.scss
 2013-02-04 09:11:28 -05:00
VikParuchuri
01fab2ec68 Merge pull request #1346 from MITx/feature/vik/combined-xmodule-changes 
Feature/vik/combined xmodule changes
 2013-02-01 15:46:33 -08:00
Brian Wilson
9d98b7055d add course navigation back into timed exam. Add initial timer styling. 2013-02-01 17:52:14 -05:00
Diana Huang
a85d43a817 Make rubrics spacing smaller and 
fix a bug in the grading service renderer
 2013-02-01 15:15:42 -05:00
Diana Huang
0bae983982 Visual updates to rubric 2013-02-01 15:15:42 -05:00
Diana Huang
1fde3c5ec5 Make rubric cleaner and visually simpler 2013-02-01 15:15:42 -05:00
Diana Huang
69d5c005c3 Refactor rubric CSS into a single file. 2013-02-01 15:15:42 -05:00
Your Name
8fd32ed502 update to show cohort name on create and cohort name on view all threads, added cohort dictionary to convert ids to names 2013-02-01 13:01:54 -05:00
Brian Talbot
61de4c028a temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog) 2013-02-01 09:41:51 -05:00
Brian Talbot
f6cd4c75b8 lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling 2013-01-31 18:15:20 -05:00
Diana Huang
ea6ce60d0b Use the variable and not the hex value. 2013-01-29 21:24:04 -05:00
Diana Huang
486753a263 Display alerts from notifications on the panel. 2013-01-29 21:24:03 -05:00
Diana Huang
9f19eafcf0 Update main notification dashboard with new styles. 2013-01-29 21:24:03 -05:00
Diana Huang
d07bf0157e UI updates to the Open Ended Problems page 2013-01-29 21:24:03 -05:00
Your Name
43d4661c3f Merge branch 'master' into feature/kevin/groups_ui_changes 2013-01-29 17:23:29 -05:00
David Ormsbee
40d59faa68 Merge pull request #1330 from MITx/diana/open-ended-ui-updates 
Rubric Integration and other UI improvements
 2013-01-29 14:10:18 -08:00
Your Name
15a2890795 Merge branch 'master' into feature/marco/group 2013-01-29 15:05:38 -05:00
e0d
c8e6bedc1a add 2013-01-27 17:19:12 -05:00
e0d
6a7997f9ba add 2013-01-27 17:19:00 -05:00
e0d
313eab90c3 add 2013-01-27 17:18:55 -05:00
e0d
d747f54fc8 adding explicit charset declaration to additional css 2013-01-26 21:29:05 -05:00
David Ormsbee
eff5093cbf Force charset for application.sass to be UTF-8 2013-01-26 14:38:49 -05:00
Brian Talbot
38e3d7371b drupal integration - added in right side copy to registration marketing requested 2013-01-24 12:46:35 -05:00
Brian Talbot
8374534802 drupal integration - revised copy, layout, and styles per marketing feedback 2013-01-23 18:22:13 -05:00
Brian Talbot
cbe35eeab3 drupal integration - further color sync, copy edits, and removing courseware button when on login page 2013-01-23 18:22:13 -05:00
Brian Talbot
e1fae8e885 drupal integration - color syncing with marketing site standards 2013-01-23 18:22:13 -05:00
Brian Talbot
bb66f8963f drupal integration - revised general page background for shorter content pages, small visual tweaks to footer 2013-01-23 18:22:13 -05:00
Brian Talbot
a15bf74f7c drupal integration - styled and revised markup/copy for password reset modal 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
Diana Huang
cc67017d4c Merge branch 'master' into diana/open-ended-ui-updates 2013-01-23 16:45:40 -05: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 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
Diana Huang
dd20226ec3 Merge branch 'master' into feature/diana/rubric-input 
Fix some merge issues involving rubric rendering

Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
 2013-01-18 16:36:22 -05:00
Diana Huang
2e791043e8 Merge branch 'master' into diana/open-ended-ui-updates 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_rubric.py
	common/lib/xmodule/xmodule/open_ended_module.py
	common/lib/xmodule/xmodule/self_assessment_module.py
 2013-01-18 09:21:38 -05:00
Chris Dodge
44cfcb88a3 Merge branch 'master' into feature/cdodge/cms-master-merge4 2013-01-17 20:30:22 -05:00
marco
2b23c40345 minor tweaks to dropdown text and addition of dropdown menu (without data links) for intructor visilibility dropdown in main discussion forum; 2013-01-17 15:25:35 -05:00