Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,228 Commits 1 Branch 0 Tags
4e3e2ec707ff409ec8a2fb4a332cfc19a744a28e
Commit Graph

10228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vik Paruchuri
ad1e73fa86 Clean up capa by removing message post actions that aren't needed 2013-01-14 13:12:38 -05:00
VikParuchuri
a64111a6e7 Merge pull request #1242 from MITx/feature/vik/integrate-sa-and-oe 
Feature/vik/integrate sa and oe
 2013-01-14 10:06:43 -08:00
Calen Pennington
fc2d5c43f1 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	lms/envs/aws.py
 2013-01-14 12:51:19 -05:00
Calen Pennington
19f79fa364 Prune deleted remote branches 2013-01-14 12:40:44 -05:00
Calen Pennington
0c00923a47 Merge pull request #1274 from MITx/fix/vik/staff-grading-settings 
Fix/vik/staff grading settings
 2013-01-14 09:36:19 -08:00
Calen Pennington
f91a5f0e23 Merge pull request #1273 from MITx/fix/cdodge/filesystem-xml-fixes 
Fix/cdodge/filesystem xml fixes
 2013-01-14 09:34:25 -08:00
Vik Paruchuri
1316728aaa Minor naming fix 2013-01-14 12:32:31 -05:00
Vik Paruchuri
0e11deffcf Fix staff and peer grading settings to not fail catastrophically 2013-01-14 12:31:50 -05:00
Chris Dodge
9f73294959 add end_date.html file 2013-01-14 12:23:36 -05:00
Vik Paruchuri
a64806656a Integrate rubric into self assessment 2013-01-14 12:20:27 -05:00
Chris Dodge
b5776a775e add another assert test 2013-01-14 12:17:51 -05:00
Chris Dodge
edb913f6ac add tests for about content overrides 2013-01-14 12:12:40 -05:00
Vik Paruchuri
16f06ae7b7 Fix some minor html 2013-01-14 11:57:09 -05:00
Vik Paruchuri
3e0cf9d234 Make rubric render more nicely 2013-01-14 11:53:23 -05:00
Chris Dodge
ac7eceb636 be sure to first import 'extra' course content from base folder as well as a special override folder for the course run 2013-01-14 11:16:48 -05:00
Vik Paruchuri
59e5b494a9 Proper rubric rendering for self assessment 2013-01-14 10:51:17 -05:00
Vik Paruchuri
2b4929562a Fix up rubric rendering 2013-01-14 10:39:58 -05:00
Diana Huang
90c39d51ee Fix wrong order in the text 2013-01-14 10:39:20 -05:00
Vik Paruchuri
0567e8f0aa Factor out rubric rendering 2013-01-14 10:35:53 -05:00
Diana Huang
1680336da6 Fix some minor bugs in the staff grading interface 2013-01-14 10:22:22 -05:00
Vik Paruchuri
c7339ee664 Minor bug fix 2013-01-14 10:16:57 -05:00
cahrens
c1c64e6b92 Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 2013-01-14 09:53:39 -05:00
Christina Roberts
c9c9f7e54f Merge pull request #1268 from MITx/feature/cas/speed-editor 
menu bar for heading and explanation
 2013-01-14 06:39:07 -08:00
Brian Talbot
e82987a32d problem editor - revised classes on editor cheatsheet text and explanation tooltip text 2013-01-14 09:37:38 -05:00
chrisndodge
fdba0e48dc Merge pull request #1270 from MITx/bug/dhm/jan13 
Fixed bug 114: randomized problems never right b/c state not preserved
 2013-01-14 06:21:47 -08:00
Diana Huang
a0c0005e95 Updates to the javascript and the grading controller 
to handle rubric input
 2013-01-14 08:58:33 -05:00
Brian Talbot
11656feba3 one last style tweak to problem header styling 2013-01-13 13:10:29 -05:00
Brian Talbot
2429192765 resolved problem headers/general H1 elements floating by default in component views 2013-01-13 13:07:11 -05:00
Brian Talbot
1cf5e10a34 revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet 2013-01-13 12:47:30 -05:00
Brian Talbot
04e9447367 added in icons for header and explanation markdown elements 2013-01-13 12:15:29 -05:00
Brian Wilson
8e059ff934 fix placeholders for phone_country_code values, and subject line of exam_help email. 2013-01-12 00:58:04 -05:00
Brian Wilson
3d0384692c add pearson_make_tc_registration command 2013-01-11 17:50:02 -05:00
Diana Huang
f3e8d01e08 Pull out old rubric and score selection logic 
and set up the new rubric
 2013-01-11 17:29:39 -05:00
Don Mitchell
1bf2cdd528 Changed order of buttons to match order of cheat sheet 2013-01-11 17:01:50 -05:00
Don Mitchell
033264b58d Change case of Explanation to match markdown (although it's functionally 
equivalent)
 2013-01-11 16:57:00 -05:00
Don Mitchell
06aa4a553e Correct file name case (which I thought mac os would catch :-( 2013-01-11 16:53:23 -05:00
Don Mitchell
7d8276b6c5 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-11 16:52:10 -05:00
Don Mitchell
208ed0a438 Fixed bug 114: randomized problems never right b/c state not preserved 
on server
 2013-01-11 16:48:19 -05:00
cahrens
a4b6851e6c Remove some dead css. 2013-01-11 16:11:09 -05:00
Vik Paruchuri
7d0bb7b3fe Minor string to boolean fix 2013-01-11 16:02:09 -05:00
cahrens
caf55f5f8d Merge branch 'feature/cas/speed-editor' into feature/christina/tiny-mce 2013-01-11 15:51:42 -05:00
Vik Paruchuri
682ac3455b Address some comments from code review, fix rubric display 2013-01-11 15:51:37 -05:00
cahrens
dcad564044 Pretty much works. 2013-01-11 15:50:46 -05:00
chrisndodge
4efe5789ed Merge pull request #1269 from MITx/feature/cdodge/cms-master-merge3 
Feature/cdodge/cms master merge3
 2013-01-11 12:23:29 -08:00
Don Mitchell
ab7be1a6e0 Unit tests 2013-01-11 15:22:30 -05:00
Don Mitchell
5920142f71 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-11 15:05:30 -05:00
Don Mitchell
755bf709a5 Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor 2013-01-11 14:44:38 -05:00
Chris Dodge
9479ef3c84 fix up call signatures for get_parent_locations() 2013-01-11 14:29:53 -05:00
Brian Talbot
7d445f5630 studio - tweaking problem editor's advanced editor toggle control UI and prompt message 2013-01-11 14:25:22 -05:00
Chris Dodge
08adf9c0d5 Merge branch 'master' into feature/cdodge/cms-master-merge3 
Conflicts:
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/search.py
	common/lib/xmodule/xmodule/modulestore/xml.py
	doc/development.md
	lms/envs/common.py
 2013-01-11 14:04:46 -05:00