Vik Paruchuri
d44b2e62a0
Proper partial credit checks
2013-08-08 17:19:06 -04:00
Vik Paruchuri
f59045c3f9
Scope rubrics locally, make them into classes
2013-08-08 16:54:39 -04:00
Vik Paruchuri
803b7eb2af
Fix peer grading rubric issue. Redo peer grading JS to scope locally
2013-08-08 16:31:36 -04:00
Vik Paruchuri
15b0e12068
Remove progress indicators, make rubric display properly
2013-08-08 14:02:33 -04:00
Vik Paruchuri
fd38223244
Fix grading submitted messages
2013-08-08 13:31:43 -04:00
Vik Paruchuri
bd9097596c
Remove annoying rubric parsing error, redo how notifications work
2013-08-08 13:16:32 -04:00
Vik Paruchuri
45d94c17f7
Add in next button, get rid of error with deleted peer grading module
2013-08-08 12:46:43 -04:00
Vik Paruchuri
203b1176cd
Don't check for ETA, or check peer grading data in self assessment
2013-08-08 12:14:57 -04:00
marco
3667fe8bd0
Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui
2013-08-07 16:35:32 -04:00
marco
56dee21142
partial cleanup for submitted rubric state, along with sass format cleanup for rubric.scss
2013-08-07 16:35:14 -04:00
Vik Paruchuri
ea2b9191c1
Allow student to switch between rubrics, tell user once peer grading required amount is done
2013-08-02 15:30:17 -04:00
marco
478fa18beb
merge edit cleanup, nothing new
2013-08-02 14:30:04 -04:00
Vik Paruchuri
aa09006247
Hide and show multiple rubrics
2013-08-02 13:53:07 -04:00
Vik Paruchuri
5da5d55630
Fix peer grading feedback issue
2013-08-02 13:41:37 -04:00
marco
ec99e20a35
styled rubric, dividers between sections
2013-08-02 13:37:53 -04:00
Vik Paruchuri
932bbd2592
Fix text issue
2013-08-02 13:23:03 -04:00
Vik Paruchuri
bca308e70e
No more log.info
2013-08-02 13:10:03 -04:00
Vik Paruchuri
a939c152c8
Add in support for multiple rubrics
2013-08-02 12:56:31 -04:00
Vik Paruchuri
e2c4b5016a
Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui
2013-08-02 12:13:02 -04:00
Vik Paruchuri
30e506777e
Render multiple rubrics, collapse rubrics
2013-08-02 12:12:38 -04:00
marco
cc7c025478
Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui
2013-08-02 00:57:50 -04:00
marco
0e8c29989c
style cleanup for open ended assessments, cleaning up workflow header, style definitions for rubrics are commented out momentarily, and an open issue for unicode rendering on the show and hide prompt area still remains
2013-08-02 00:57:31 -04:00
Vik Paruchuri
178be44333
Remove legend, start to edit rubric
2013-08-01 16:25:21 -04:00
marco
77e57448b3
cleaned up sass document format and added baseline variable throughout capa and combined open ended problems. no style rule changes, simply whitespace, ordering of properties, and the addition of baseline over direct pixels for padding and margins.
2013-08-01 12:42:11 -04:00
Vik Paruchuri
12a2c06fb1
Remove console.log statements
2013-07-25 15:57:21 -04:00
Vik Paruchuri
2d966209f4
fix test
2013-07-25 15:55:34 -04:00
Vik Paruchuri
1a4be13d4c
Improve rubric look and feel
2013-07-25 15:40:09 -04:00
Vik Paruchuri
29bd64555f
Get table to take up the width of the page
2013-07-25 15:30:11 -04:00
Vik Paruchuri
b6ff513e33
Add in get last response functionality
2013-07-25 15:06:40 -04:00
Vik Paruchuri
d23d354ab3
Change top text
2013-07-25 14:41:54 -04:00
Vik Paruchuri
172bc5cfa5
Change naming, edit border radius
2013-07-25 14:23:11 -04:00
Vik Paruchuri
c059a31623
Fix border locations, remove open ended response text
2013-07-25 12:33:12 -04:00
Vik Paruchuri
9cb7d448c6
Border between prompt element
2013-07-25 12:15:05 -04:00
Vik Paruchuri
5ae6ce9d47
Add in css borders
2013-07-25 12:10:16 -04:00
Vik Paruchuri
579b66d9dd
Redesign header css
2013-07-25 11:44:42 -04:00
Vik Paruchuri
5365d54202
Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui
2013-07-25 11:09:53 -04:00
Sarina Canelake
c80a05f4d8
Merge pull request #471 from edx/giulio/fix-tooltips
...
override .sr class from keeping tooltips hidden in sequence nav
2013-07-25 08:03:23 -07:00
Renzo Lucioni
30baebd7b5
Merge pull request #494 from edx/renzo/blank-problem-score
...
Blank common and advanced problems now display an inline score of "0 points" upon creation
2013-07-25 07:56:15 -07:00
Adam Palay
2efcb0cdca
Change default names for various LMS components
...
Embedded discussion component defaults to "Discussion"
Blank HTML page defaults to "Text"
Video component defaults to "Video"
These default names show up in tooltips.
2013-07-25 10:38:47 -04:00
Giulio Gratta
214a814b94
Adjustment to show sequence tool tips in LMS
2013-07-25 00:48:36 -04:00
Sarina Canelake
6923687c8e
Merge pull request #460 from edx/sarina/update-diffcover
...
Update diff-cover to latest version
2013-07-24 20:18:15 -07:00
Renzo Lucioni
1a0055ae77
Blank common and advanced problems now display an inline score of '0 points' upon creation.
2013-07-24 16:44:22 -04:00
Calen Pennington
a569a5f6a7
Merge pull request #490 from edx/cale/make-cms.dev-environment-work-with-manage.py
...
Make cms.dev environment work with manage.py
2013-07-24 13:26:50 -07:00
Don Mitchell
e223d753e3
Merge pull request #489 from edx/dhm/export_policy
...
change of defaults for rerandomize/showanswer
2013-07-24 12:54:32 -07:00
Calen Pennington
dd338c17a5
Merge pull request #477 from edx/cale/xmodule-student-vieww
...
Add an XBlock student_view to XModule
2013-07-24 12:08:25 -07:00
Calen Pennington
3e9bbe2550
Make cms.dev environment work with manage.py
2013-07-24 14:49:07 -04:00
Don Mitchell
400ff494cb
Remove presumption of user's intent for imported xml attrs
...
Moved to xlint rather than setting to old default.
2013-07-24 14:08:34 -04:00
Don Mitchell
2d085c426d
Add xlint check for any policy fields whose default changed.
...
Warn user that the course behavior may change.
2013-07-24 14:07:39 -04:00
Calen Pennington
3774ea1565
Add an XBlock student_view to XModule
...
This just wraps XModule.get_html, and ignores javascript and css for
now.
[LMS-189]
2013-07-24 12:23:26 -04:00
Calen Pennington
8e12590668
Merge pull request #451 from edx/cale/add-a-manage.py-command-that-understands-the-extra-edx-options
...
Add a manage.py command that understands the extra edX options
2013-07-24 07:34:13 -07:00
