Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,880 Commits 1 Branch 0 Tags
7aa9a6cfa574e20de26c5de416a0543f91c11cbe
Commit Graph

3456 Commits

Author SHA1 Message Date
Christina Roberts
a537bd7f05 Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo 
Fix/btalbot/studio courseinfo
 2013-04-30 13:34:52 -07:00
Christina Roberts
4c97f92245 Merge pull request #1916 from MITx/fix/cdodge/more-broken-template-images 
add more images to support templates
 2013-04-30 09:50:41 -07:00
Chris Dodge
c5d520574d also move the MIT dome image in Latex to be in our source pack 2013-04-30 12:02:58 -04:00
Brian Talbot
886205dec3 revised placeholder course overview HTML value 2013-04-29 17:23:14 -04:00
Chris Dodge
33aada6d22 fix broken test. Since we're pre-populating the course overview when creating a course, the clone_course fails because it asserts that the destination course that it clones into is empty. Need to check that the course is basically empty (e.g. a course module and a overview module) 2013-04-29 16:43:32 -04:00
Chris Dodge
680e932b8b use default staff images that is in /common/static/... 2013-04-29 15:42:58 -04:00
Sarina Canelake
f95331dcc1 fix more pep8 violations 2013-04-29 15:01:11 -04:00
Sarina Canelake
6993daf116 Fix pep8 violations 2013-04-29 15:01:05 -04:00
Sarina Canelake
46792c82de Remove debugging print statements 2013-04-29 15:00:54 -04:00
Sarina Canelake
ed43afb08f Add additional unit test comment 2013-04-29 15:00:45 -04:00
Sarina Canelake
696879bd26 Add unit tests for formularesponse type 2013-04-29 15:00:36 -04:00
Sarina Canelake
c79843c541 Add factorial as a default function for formula response 2013-04-29 15:00:26 -04:00
Christina Roberts
72dfd4995e Merge pull request #1903 from MITx/fix/cdodge/dangling-verticals-on-delete 
Fix/cdodge/dangling verticals on delete
 2013-04-29 11:58:22 -07:00
Chris Dodge
d7693d96b7 unit test should just use direct store. Also remove unused import and logging. 2013-04-29 09:18:49 -04:00
Calen Pennington
8c4526ed07 Fix coffeescript error in video spec file 2013-04-29 07:32:16 -04:00
Calen Pennington
4a397972fa Sort the css and js assets by numerical index 2013-04-29 07:31:48 -04:00
Chris Dodge
7d206e020d remove comment which is no longer valid as well as debug log messages 2013-04-26 16:13:26 -04:00
Chris Dodge
bbea8eb9f3 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/dangling-verticals-on-delete 2013-04-26 15:25:47 -04:00
Chris Dodge
55266f6e96 add a overview.yaml template and also clone that template into a newly created course 2013-04-26 13:39:22 -04:00
Chris Dodge
2e64bc33ff make sure delete_item always uses the draft store 2013-04-26 12:37:37 -04:00
Calen Pennington
8c54d5d610 Fix accidental force push that reset master 
Master went from 5d912b88616f05c5ec10e89b336bd1088042bba0 to
e43c2bd410. 5d912b8a is a merge commit
that merged a branch onto master, so I am merging the same commit
back into master.
 2013-04-26 10:50:53 -04:00
Chris Dodge
f6417b4f71 add a delete-all-versions flag to the delete_item method in the modulestores. Extend tests to verify. Still wip 2013-04-25 15:24:31 -04:00
cahrens
c7962cf07b Don't explicitly declare display_name. 2013-04-24 16:41:58 -04:00
Calen Pennington
9d94adbd1f Merge pull request #1871 from MITx/feature/cale/fast-dev-server 
Speed up local development
 2013-04-24 12:12:05 -07:00
cahrens
45f86b662a Delete unused file. 2013-04-24 14:59:32 -04:00
cahrens
cc2d06975e Remove duplicated StringyX definitions. 2013-04-24 14:59:32 -04:00
cahrens
9e9886339a Refer to inherited field. 2013-04-24 14:59:31 -04:00
cahrens
e874de1249 Some cleanup TODOs. 2013-04-24 14:59:31 -04:00
Diana Huang
d7f2d4b710 Merge pull request #1876 from MITx/diana/matlab-input-updates 
Make updates to the MatlabInput InputType
 2013-04-22 13:46:15 -07:00
Diana Huang
32881ed265 Change the name of the button so that it is clearer. 2013-04-22 16:38:41 -04:00
Chris Dodge
506a9a20aa when updating the list of children of sequentials, we must use the 'direct' store otherwise we end up with draft revisions of sequentials, which is bad 2013-04-22 10:13:33 -04:00
Diana Huang
181eebc942 Miscellaneous updates and fixes. 
* Hide "Test Code" button after we check the problem
* Only set the state of the problem to 'queued' if we have successfully
queued the problem
* Unit tests for bugs and new functionality
 2013-04-18 16:37:36 -04:00
Calen Pennington
f7cad77b93 Ignore errors when deleting the old xmodule compiled assets directory 2013-04-18 15:45:32 -04:00
Calen Pennington
729daf5cbf Move xmodule asset gathering out of server startup 
This allows us to a) compile the coffeescript and sass from xmodules
using the new out-of-band method and b) reload xmodule static content
whenever it changes, which should make devs much happier.
 2013-04-18 15:19:19 -04:00
Diana Huang
03daefb924 Change the name of the plot button 2013-04-18 14:31:51 -04:00
Will Daly
a4717aca90 Pep8 fixes 2013-04-18 09:49:05 -04:00
Calen Pennington
346aee8863 Make django-pipeline only work with raw js and css 2013-04-18 07:18:36 -04:00
Calen Pennington
9c7ba41880 Only add the xmodule.coffee file once per class, and put it before all other coffeescript files 2013-04-18 07:18:36 -04:00
Will Daly
a57a093e73 Rebased to master 2013-04-17 15:56:05 -04:00
Will Daly
841d3484c8 Added test for textline input template 2013-04-17 15:46:24 -04:00
Will Daly
52c2f3ae37 Tested additional values of rerandomize (true/false/per_student) 
Pylint fixes
 2013-04-17 15:32:39 -04:00
Will Daly
754d1eb702 Added tests for ChoiceGroup template 2013-04-17 15:32:39 -04:00
Calen Pennington
6c7c49e6bd Fix pep8 violations 2013-04-17 11:07:58 -04:00
Calen Pennington
3cd414afbb Merge pull request #1825 from MITx/fix/cale/gradebook 
Fix/cale/gradebook
 2013-04-17 07:37:02 -07:00
Don Mitchell
24189378d6 Merge pull request #1864 from MITx/bug/christina/export 
Don't try to export orphaned draft items.
 2013-04-16 14:24:49 -07:00
cahrens
8c336ef998 Don't try to export orphaned draft items. 
#278
 2013-04-16 17:05:11 -04:00
Vik Paruchuri
5125d8b0de Reformat code 2013-04-16 13:48:58 -04:00
Vik Paruchuri
d82ac2b747 Merge remote-tracking branch 'origin/master' into fix/vik/sa-and-coe 2013-04-16 13:45:46 -04:00
brianhw
2314c609b6 Merge pull request #1859 from MITx/fix/brian/conditional-error 
cope with ErrorModule as source (or required) module, and add tests.
 2013-04-16 10:16:56 -07:00
Vik Paruchuri
a71658cf77 Better test for get score 2013-04-16 12:12:12 -04:00