Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,587 Commits 1 Branch 0 Tags
30c87be20f0cf36f3003c3def4c8fb64697c8cc1
Commit Graph

8587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
30c87be20f Subsection drag between sections should work now. 2013-01-17 17:09:31 -05:00
Don Mitchell
ac09e18b9e Now traps out of bounds as implying no change. Seems very slow. 2013-01-17 15:09:23 -05:00
Don Mitchell
1782c54e68 Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 2013-01-17 11:23:45 -05:00
Don Mitchell
db4455e6e1 Cache 2013-01-17 11:23:39 -05:00
Don Mitchell
480aa80db3 Cache 2013-01-17 11:23:39 -05:00
Don Mitchell
244584ce6c DnD for subsections and units (no auto open) 2013-01-15 11:33:11 -05:00
Don Mitchell
e8bcc1729a Merge branch 'feature/cale/cms-master' into feature/dhm/drag 2013-01-15 11:00:41 -05:00
Don Mitchell
3a2c57524f Basic dnd for units 2013-01-15 10:35:20 -05:00
chrisndodge
e884f17d12 Merge pull request #1272 from MITx/feature/cale/course-loading-errors 
Feature/cale/course loading errors
 2013-01-14 10:41:03 -08:00
Calen Pennington
330a2eac80 Don't break the course if the grading policy is broken 2013-01-14 13:18:54 -05:00
Calen Pennington
95478922d0 Whitespace fixes 2013-01-14 13:18:54 -05:00
Calen Pennington
86be73f6a2 Make errors during course loading not break the site, but just hide that course instead 2013-01-14 13:16:22 -05: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
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
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
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
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
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
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
Jay Zoldak
d0c4e2e916 Merge pull request #1267 from MITx/bug/btalbot/cms-sectiontoggling-test 
studio - changed expectation of lettuce test for course overview toggle
 2013-01-11 09:33:15 -08:00
Brian Talbot
e7e26a471c studio - changed expectation of lettuce test for course overview section toggling 2013-01-11 12:03:17 -05:00
chrisndodge
445a923ab8 Merge pull request #1266 from MITx/fix/cdodge/preview-failing 
need to add the depth parameter to the DraftMongoStore   implementation ...
 2013-01-11 08:59:24 -08:00
Chris Dodge
476e6c7b3b need to add the depth parameter to the DraftMongoStore implementation of get_instance 2013-01-11 11:57:41 -05:00
chrisndodge
0919c185f6 Merge pull request #1265 from MITx/bug/dhm/jan13 
Handle metadata from save being empty
 2013-01-11 07:55:51 -08:00
Don Mitchell
c05d887904 Handle metadata from save being empty 2013-01-11 10:39:57 -05:00
Don Mitchell
64507bd5fd Drop down for markup done but w/o new icons 2013-01-11 10:36:42 -05:00
chrisndodge
5368a9ad3e Merge pull request #1252 from MITx/feature/cale/lms-mongo-perf 
Decrease the number of queries needed for LMS courseware
 2013-01-11 07:23:00 -08:00