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

15833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Calen Pennington
76055aa211 Add a manage.py command that understands the extra edX options 2013-07-24 09:04:12 -04:00
Adam
420b092033 Merge pull request #467 from edx/fix/adam/file-upload 
Fix/adam/file upload
 2013-07-23 15:05:18 -07:00
Diana Huang
86ee2bca7a Merge branch 'release' 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
 2013-07-23 17:57:07 -04:00
Diana Huang
09dc468342 Merge pull request #482 from edx/hotfix-2013-07-23 
Hotfix 2013 07 23
 2013-07-23 14:49:36 -07:00
chrisndodge
077f0a2a10 Merge pull request #481 from edx/fix/cdodge/regression-on-tabs-initialization 
It seems like self.tabs is getting set to an empty set [] now rather tha...
 2013-07-23 14:32:47 -07:00
Brian Talbot
31e1b0e5e9 Studio: revises spacing fix for welcome to edX studio title 
Conflicts:
	cms/templates/howitworks.html
 2013-07-23 17:26:52 -04:00
Diana Huang
2926c94330 Prevent XSS attack via submission_history page. 
Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
 2013-07-23 17:23:59 -04:00
Chris Dodge
0b6932f4b8 add new test to assert that course creation will populate default tabs as expected. Also update factory to not override defaults on tabs array. Also simplfy self.tab test condition. 2013-07-23 16:15:39 -04:00
Chris Dodge
8584aae866 It seems like self.tabs is getting set to an empty set [] now rather than None. This causes the tab defaulting to not populate, leading to crashes in the LMS if someone makes a new course with additional tabs (e.g. static tabs or pdf-textbooks) 2013-07-23 15:34:02 -04:00
chrisndodge
b76e7387aa Merge pull request #452 from edx/feature/cdodge/add-jump-to-substituions 
add a /jump_to_id/ shortcut for producing more durable links between cou...
 2013-07-23 12:15:31 -07:00
jkarni
3a5e1c7021 Merge pull request #463 from edx/fix/jkarni/linkoutline 
Link section to course outline
 2013-07-23 10:59:11 -07:00
Chris Dodge
6f3b49a6f9 add some chinese characters to the test content 2013-07-23 12:15:56 -04:00
Chris Dodge
c5ef8dc526 add line break between arguments 2013-07-23 12:15:56 -04:00