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

1221 Commits

Author SHA1 Message Date
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
David Ormsbee
18d5792025 Merge pull request #1302 from MITx/bugfix/brian/pearson-reg 
Bugfix/brian/pearson reg
 2013-01-17 11:42:00 -08:00
Diana Huang
87990b36f4 Rubric sizing tweaks and text improvements. 2013-01-17 14:35:49 -05:00
Diana Huang
7171e6b7cc Merge branch 'feature/diana/rubric-input' into diana/open-ended-ui-updates 2013-01-17 14:02:00 -05:00
Diana Huang
18a3d5e734 Merge branch 'master' into feature/diana/rubric-input 2013-01-17 14:00:43 -05:00
Diana Huang
3646ff53d8 Display updates and fixes. 2013-01-17 14:00:02 -05:00
Carlos Andrés Rocha
00f83d03a0 Restore /faq page, and moved new content to /help 2013-01-17 10:47:50 -05:00
Diana Huang
280a2f290e Merge branch 'master' into diana/open-ended-ui-updates 2013-01-17 10:09:16 -05:00
Diana Huang
df8d088492 Display updates to the xmodule. 2013-01-17 09:44:47 -05:00
Chris Dodge
22695d80c7 Merge branch 'master' into feature/cdodge/cms-master-merge4 
Conflicts:
	common/djangoapps/student/models.py
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/xml_module.py
	jenkins/test.sh
	lms/djangoapps/courseware/access.py
	lms/djangoapps/courseware/tests/tests.py
	lms/djangoapps/django_comment_client/models.py
	requirements.txt
 2013-01-17 09:15:37 -05:00
Brian Talbot
a756776836 pearson registration - revised rejection message text on dashboard, synced up email edx link text, revised contact styles/markup to remove giant red button dashboard for rejections 2013-01-16 17:26:29 -05:00
Brian Talbot
b16fa04371 pearson registration - resolved box-sizing display issue that caused form fields to not show text/be editable in Firefox/Mozilla 2013-01-16 15:08:23 -05:00
Diana Huang
db366d4ebb Update CSS to make rubric even narrower. 2013-01-16 14:36:08 -05:00
Diana Huang
60531e30fa Add progress bars to the staff grading and peer grading views. 2013-01-16 14:22:39 -05:00
Brian Wilson
bfb5f5e5bd Merge remote-tracking branch 'origin/master' into feature/brian/pearson-reg 2013-01-16 11:24:46 -05:00
Diana Huang
9b2faa4987 Merge branch 'master' into feature/diana/rubric-input 2013-01-16 09:02:51 -05:00
Brian Wilson
fb251cacbe Merge branch 'feature/brian/pearson-reg' of github.com:MITx/mitx into feature/brian/pearson-reg 2013-01-15 15:42:29 -05:00
Brian Wilson
32b2d1b97f Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations 2013-01-15 15:42:09 -05:00
Brian Talbot
540232f54d revised minor syntax/line indents on faq scss and js 2013-01-15 15:30:53 -05:00