Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,655 Commits 1 Branch 0 Tags
92b7dbdc69e7b2fc177dd2ff2085df22a4d24a25
Commit Graph

9655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
92b7dbdc69 Refactor rubric JS so that we don't have to keep duplicating this code. 2013-02-01 15:15:42 -05:00
Diana Huang
1fde3c5ec5 Make rubric cleaner and visually simpler 2013-02-01 15:15:42 -05:00
Diana Huang
7e345ce512 Add scores to the top of the rubric, remove from individual cells 2013-02-01 15:15:42 -05:00
Diana Huang
69d5c005c3 Refactor rubric CSS into a single file. 2013-02-01 15:15:42 -05:00
John Jarvis
1c09d9cacb For prod environments only log info and up 2013-02-01 13:34:29 -05:00
John Jarvis
f525b17b1a pep8 cleanup 2013-02-01 13:13:16 -05:00
John Jarvis
8b01298969 Removing duplicate loggers 2013-02-01 13:11:14 -05:00
John Jarvis
4a08bc7759 Adding service_variant and a little pep8 cleanup 2013-02-01 13:10:26 -05:00
Ned Batchelder
6b6d8a94d0 Don't use PyYAML's .load() for reading YAML, use .safe_load() to avoid security problems. 2013-02-01 10:50:01 -05:00
Christina Roberts
14ca42a5dc Merge pull request #1405 from MITx/style/btalbot/lms-courseinfolists 
temporary style sync up for course info lists
 2013-02-01 06:51:35 -08:00
Calen Pennington
dce65f2ab7 Merge pull request #1404 from MITx/feature/edz/service-variant 
service variant code for loading different config
 2013-02-01 06:49:51 -08:00
Brian Talbot
61de4c028a temporary style sync up for course info lists - more work needs to be done once xmodule renders this HTML (in Studio backlog) 2013-02-01 09:41:51 -05:00
e0d
969737c58e service variant code for loading different config 2013-01-31 21:43:35 -05:00
David Ormsbee
a89503431f Merge pull request #1403 from MITx/style/btalbot/lms-calendartables 
lms - syllabus/calendar table styling fixes
 2013-01-31 15:17:38 -08:00
Brian Talbot
f6cd4c75b8 lms - revising xmodule HTML display styles and overwriting some to retain old syllabus table styling 2013-01-31 18:15:20 -05:00
Don Mitchell
aad5015a82 Merge pull request #1398 from MITx/feature/christina/misc2 
Fixes date bug (#149).
 2013-01-31 10:59:07 -08:00
Don Mitchell
fbd9a126ba Merge pull request #1393 from MITx/fix/cdodge/export-static-tabs 
add exporting of course info
 2013-01-31 10:55:45 -08:00
Christina Roberts
5f170d118f Merge pull request #1395 from MITx/bug/dhm/mar13 
Remove format field as it's the one for grading type.
 2013-01-31 10:51:44 -08:00
Jay Zoldak
c590c24e25 Add vendor files to files.json for the cms jasmine tests to work. 2013-01-31 13:48:38 -05:00
cahrens
b613bdc336 Fixes date bug (#149). 2013-01-31 13:37:45 -05:00
Don Mitchell
f257f12124 Meant to add the file here 2013-01-31 12:56:18 -05:00
Don Mitchell
6491363647 Remove format field as it's the one for grading type. 2013-01-31 12:11:11 -05:00
Jay Zoldak
6fe209b0cf Merge pull request #1392 from MITx/tests/diana/update-oe-unit-tests 
New tests for OpenEndedGrading
 2013-01-31 08:34:06 -08:00
Chris Dodge
ab9d30cbc6 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-static-tabs 2013-01-31 10:51:24 -05:00
Chris Dodge
fc57e7afdb add testing for course info export. Plus DRY things out a bit 2013-01-31 10:51:20 -05:00
Chris Dodge
0d20c192b9 add exporting of course info 2013-01-31 09:57:07 -05:00
Diana Huang
32524727ce Create a test framework and make it so that we force a mock backend 
when we don't have an ajax url
 2013-01-31 09:00:06 -05:00
Victor Shnayder
bc1452f288 Merge pull request #1390 from MITx/press/7.00x 
7.00x press release
 2013-01-30 15:35:51 -08:00
Diana Huang
8144a1dfaf Add in next_problem jasmine tests 2013-01-30 17:25:13 -05:00
Calen Pennington
76b367e062 Merge pull request #1388 from MITx/bug/dhm/mar13 
Swallow event calls to squash 404 errors (and remove an unused var in
 2013-01-30 14:10:02 -08:00
Don Mitchell
756a071634 misspelled request (altho as an unused identifier) 2013-01-30 17:08:21 -05:00
Calen Pennington
c4f56620df Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic" 
This reverts commit ab437b9463, reversing
changes made to 7a8e87c789.
 2013-01-30 16:49:49 -05:00
Diana Huang
36d8b8768c Merge branch 'master' into tests/diana/update-oe-unit-tests 2013-01-30 16:41:18 -05:00
Diana Huang
6322263c90 New Jasmine tests 2013-01-30 16:40:55 -05:00
Victor Shnayder
0353cb98e1 7.00x press release 2013-01-30 16:07:47 -05:00
Diana Huang
e873da76d5 Wrap reload to allow us to mock it. Add in some polling testing. 2013-01-30 16:01:28 -05:00
Victor Shnayder
f2944334ab Merge pull request #1387 from MITx/feature/zoldak/courseware-unit-tests 
Add unit tests for lms courseware access
 2013-01-30 12:51:50 -08:00
chrisndodge
676e80bd9d Merge pull request #1389 from MITx/fix/cdodge/export-static-tabs 
add new tab file
 2013-01-30 12:26:12 -08:00
Chris Dodge
a9da761b18 add new tab file 2013-01-30 15:25:00 -05:00
Don Mitchell
85faab1dc6 Swallow event calls to squash 404 errors (and remove an unused var in 
another function)
 2013-01-30 15:18:51 -05:00
Calen Pennington
ab437b9463 Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic 
Don't run collectstatic on course content
 2013-01-30 12:07:47 -08:00
Jay Zoldak
91b8a95ed7 Add unit tests for lms courseware access 2013-01-30 15:03:43 -05:00
Carlos Andrés Rocha
7a8e87c789 Merge pull request #1385 from MITx/feature/jarv/certificate-restriction 
FAQ update for the embargo restriction
 2013-01-30 10:56:15 -08:00
Christina Roberts
54c1fe9c67 Merge pull request #1384 from MITx/fix/cdodge/export-static-tabs 
adding exporting of tabs and custom_tags. Also added unit tests
 2013-01-30 10:52:31 -08:00
John Jarvis
e7e16b94d8 FAQ update for the embargo restriction 2013-01-30 13:51:14 -05:00
Chris Dodge
cc09a90245 DRY things up a bit 2013-01-30 13:50:30 -05:00
Chris Dodge
c676046341 adding exporting of tabs and custom_tags. Also added unit tests 2013-01-30 13:25:17 -05:00
David Ormsbee
f295dae34e Merge pull request #1383 from MITx/feature/jarv/certificate-restriction 
Updating FAQ text
 2013-01-30 10:06:43 -08:00
John Jarvis
d52a619d74 Updating FAQ text 2013-01-30 13:02:42 -05:00
David Ormsbee
fecad2a3e1 Merge pull request #1382 from MITx/feature/brian/pearson-status 
pearson_dump: prettify, add missing error, provide default filename
 2013-01-30 09:55:45 -08:00