Brian Talbot
f33f7134fb
lms - pearson: trying to resolve JQUI accordion width bug in IE7 - enforcing width to chapters
2013-02-12 10:34:21 -05:00
Brian Talbot
83e4dfaacb
lms - pearson: trying to resolve JQUI accordion width bug in IE7
2013-02-12 09:58:16 -05:00
Brian Wilson
290368ef0d
merge out from master
2013-02-07 17:40:54 -05:00
Brian Talbot
6d4cb558d3
lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav
2013-02-07 12:35:52 -05:00
Victor Shnayder
2af06ef1d4
Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 66889b87240dd9c24e74
2013-02-06 20:29:17 -05:00
Kevin Chugh
55c205b9b4
merged master
2013-02-06 17:13:52 -05:00
Diana Huang
4adf2f6180
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/combined_open_ended_module.py
common/lib/xmodule/xmodule/combined_open_ended_rubric.py
2013-02-06 13:16:24 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
Diana Huang
51db547a63
Merge branch 'master' into diana/rubric-ui-improvements
...
Conflicts:
common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee
2013-02-05 16:18:56 -05:00
Diana Huang
f3be02d772
Merge branch 'master' into diana/rubric-ui-improvements
2013-02-05 09:13:14 -05:00
Vik Paruchuri
bf97a6a9a9
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule
...
Conflicts:
lms/djangoapps/open_ended_grading/peer_grading_service.py
2013-02-04 17:55:55 -05:00
Vik Paruchuri
e8803985f2
Fix JS on after event handling
2013-02-04 17:41:44 -05:00
Vik Paruchuri
d89ab000d2
Fix a function call
2013-02-04 17:30:45 -05:00
Vik Paruchuri
eb049bda9e
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging
2013-02-04 17:18:59 -05:00
Vik Paruchuri
7f96fbb3d1
Address review comments
2013-02-04 17:15:07 -05:00
Vik Paruchuri
83b7533a12
Fix CSS to fit all elements on the page
2013-02-04 16:49:32 -05:00
Brian Talbot
1923ae0d6b
pearson - added in timer styling for IE7
2013-02-04 15:40:01 -05:00
Vik Paruchuri
6cf2742e32
Trim unneeded files
2013-02-04 14:22:57 -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
Vik Paruchuri
d9517877a4
Merge branch 'feature/vik/combined-xmodule-changes' into feature/vik/peer-grading-flagging
2013-02-01 18:32:48 -05: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
71c233af15
Fix bug in the callback
2013-02-01 15:15:42 -05:00
Diana Huang
1c5c54c862
Make the rubric for self-assessment selectable and remove the
...
separate grade selection.
2013-02-01 15:15:42 -05:00
Diana Huang
745c052775
Remove duplicate Javascript and remove total grade selection.
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
92b7dbdc69
Refactor rubric JS so that we don't have to keep duplicating this code.
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
Vik Paruchuri
01cdc6e7f8
Merge remote-tracking branch 'origin/master' into feature/vik/combined-xmodule-changes
...
Conflicts:
common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee
2013-01-31 16:50:10 -05:00
Vik Paruchuri
f3f509da3b
Fix input area styling
2013-01-31 12:45:48 -05:00
Vik Paruchuri
63d4ac8c44
Working on some flagging coffeescript
2013-01-31 12:17:21 -05:00
Jay Zoldak
6fe209b0cf
Merge pull request #1392 from MITx/tests/diana/update-oe-unit-tests
...
New tests for OpenEndedGrading
2013-01-31 08:34:06 -08:00
Diana Huang
32524727ce
Create a test framework and make it so that we force a mock backend
...
when we don't have an ajax url
2013-01-31 09:00:06 -05:00
Vik Paruchuri
b0e4608558
Fix callback alert
2013-01-30 21:56:52 -05:00
Vik Paruchuri
2affd4760b
Add in wiring for unflag action
2013-01-30 21:53:33 -05:00
Vik Paruchuri
b4c80da224
Trim whitespace
2013-01-30 21:50:24 -05:00
Vik Paruchuri
8e9ec501a7
Implement flagging, fix urls
2013-01-30 21:44:21 -05:00
Vik Paruchuri
10c7155d4d
Add open ended to JS pipeline
2013-01-30 21:28:42 -05:00
Vik Paruchuri
4c16479569
Working on frontend JS for posting
2013-01-30 21:22:59 -05:00
Vik Paruchuri
5f538f078b
Pass flag through from LMS to grading controller
2013-01-30 19:50:36 -05:00
Victor Shnayder
0353cb98e1
7.00x press release
2013-01-30 16:07:47 -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
