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

8594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Dodge
fe964ec8ba disable caching in draft mode stores. It doesn't behave as we expect and we need more time to investigate 2013-01-17 13:11:16 -05:00
chrisndodge
358c56da9e Merge pull request #1297 from MITx/fix/cdodge/filesystem-xml-fixes 
Fix/cdodge/filesystem xml fixes
 2013-01-17 05:55:22 -08:00
chrisndodge
2f1363843b Merge pull request #1293 from MITx/feature/christina/misc 
Fix bug related to creation of thumbnails for non-image files.
 2013-01-16 12:49:27 -08:00
cahrens
bc80779f6f Fix bug related to creation of thumbnails for non-image files. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/139-uploads-of-non-images-dont-have-reasonable-icon#ticket-139-2
 2013-01-16 15:40:14 -05:00
Don Mitchell
808c99335e Merge pull request #1290 from MITx/feature/christina/misc 
A couple of bug fixes.
 2013-01-16 11:42:37 -08:00
cahrens
d4f79c0498 Fix bug related to img link for non-img files. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/135-via-tender-studio-asset-locker-currently-returns-incorrect-xml-snippet
 2013-01-16 13:51:17 -05:00
cahrens
cc5a5e2996 Fix multiple choice checkbox. 
#117
 2013-01-16 12:52:05 -05:00
chrisndodge
ebca3af789 Merge pull request #1286 from MITx/feature/christina/misc 
Feature/christina/misc
 2013-01-16 09:17:13 -08:00
cahrens
65d45d6dee Minor cleanup. 2013-01-16 09:57:21 -05:00
cahrens
07d6bee5a7 storing work 2013-01-16 09:53:28 -05:00
cahrens
9818664bb1 storing work 2013-01-15 16:04:34 -05:00
cahrens
0461407857 Proposed changes to fix asset caching bug. 2013-01-15 11:45:08 -05:00
Chris Dodge
39769ea997 allow for optional 'COURSE_DIR' parameter for the import rake target so that we can import only a single course 2013-01-14 22:51:56 -05:00
Chris Dodge
1cb2a6724d add some additional logging for optional verbosity 2013-01-14 22:31:21 -05:00
Chris Dodge
3e736ae9c6 fix crash on command line import when no namespace rename has been given 2013-01-14 22:23:15 -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