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

15584 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Talbot
1b5f040021 studio - checklists: roughed out initial static design, HTML, and most CSS for checklists v0 UI 2013-03-12 21:57:40 -04:00
John Hess
0b2226b051 Merge pull request #1660 from MITx/hotfix/jkarni/folditorder 
Table order fix (again), changes a single character
 2013-03-12 16:17:08 -07:00
Your Name
8280c55992 pinning .1 2013-03-12 17:40:26 -04:00
Arthur Barrett
bf6ca1b0e7 use document to get scrollTop for firefox 2013-03-12 17:32:00 -04:00
Arthur Barrett
8f1e49ec88 Merge branch 'master' into feature/abarrett/annotation-styling-fixes 2013-03-12 16:56:31 -04:00
Diana Huang
faab0ac139 Merge pull request #1657 from MITx/fix/brian/regrade-partial 
add management command to regrade partial-credit problems affected by ge...
 2013-03-12 13:40:15 -07:00
Christina Roberts
349348fcd3 Merge pull request #1661 from MITx/fix/cdodge/dont-clobber-on-delete-draft 
hot fix for delete_item. The 'delete_all_versions' is useful in that it ...
 2013-03-12 13:21:42 -07:00
Calen Pennington
47420fe7c5 Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads 2013-03-12 16:18:48 -04:00
Ned Batchelder
b05b627c23 Reduce some more pylint noise 2013-03-12 16:10:37 -04:00
Brian Wilson
046e0fd75e Merge remote-tracking branch 'origin/master' into fix/brian/regrade-partial 2013-03-12 16:09:10 -04:00
Brian Talbot
36746fb729 Merge branch 'master' into feature/btalbot/studio-alerts 2013-03-12 16:05:54 -04:00
Brian Talbot
13a7e905f3 Merge branch 'master' into fix/btalbot/studio-sasscleanup 2013-03-12 16:02:42 -04:00
Calen Pennington
174ba0039d Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads 2013-03-12 15:51:29 -04:00
Brian Wilson
47e708e713 fix pylint and pep8 warnings 2013-03-12 15:49:48 -04:00
Chris Dodge
e5ee0a77ed hot fix for delete_item. The 'delete_all_versions' is useful in that it is set to true when doing explicit deletes as opposed to 'delete draft'. If delete_all_versions=False, then don't remove the deleted item from the parent children collection 2013-03-12 15:24:10 -04:00
Brian Talbot
d23679ea4e edx.org redesign - revised temporary login/register views to fit with design requirements/fixes from marketing team's overall design changes to site's visual theme 2013-03-12 15:04:00 -04:00
Brian Wilson
6aed059d5f Change date and remove filtering by grade. Add check for student_answers. 2013-03-12 14:55:27 -04:00
Ned Batchelder
bc854ef068 Merge branch 'master' of github.com:MITx/mitx 2013-03-12 14:34:54 -04:00
Ned Batchelder
70af75e852 Don't run pylint on migrations, and it's ok to have a global name 'log' 2013-03-12 14:34:39 -04:00
Julian Arni
830e08db1c Have definition_from_xml return (definition, children) 2013-03-12 14:34:34 -04:00
Jay Zoldak
0ee656316b Merge pull request #1659 from MITx/fix/vik/oe-pep8 
Fix/vik/oe pep8
 2013-03-12 11:34:26 -07:00
Vik Paruchuri
c40ab310c3 Blank line fixes 2013-03-12 14:24:42 -04:00
Arthur Barrett
d860b167d6 fixed tooltip positioning for non-overlapping spans in studio 2013-03-12 14:09:56 -04:00
Christina Roberts
1379ba9c58 Merge pull request #1658 from MITx/fix/zoldak/poll-merged-fix-factory 
Update course factory to reflect XBlock changes
 2013-03-12 11:09:51 -07:00
Jay Zoldak
f9f0bd0deb Update course factory to reflect XBlock changes 2013-03-12 14:05:12 -04:00
Brian Wilson
fe0447093c add management command to regrade partial-credit problems affected by get_npoints bug. 2013-03-12 14:00:18 -04:00
Calen Pennington
c0b6c01fd1 Use the right pip for bash OR 2013-03-12 13:30:24 -04:00
Calen Pennington
137662081f Squelch pep8 and pylint output unless they fail 2013-03-12 13:26:17 -04:00
Calen Pennington
7b2efa9dbf Merge pull request #1656 from MITx/fix/vik/oe-xblock-stage2 
Fix/vik/oe xblock stage2
 2013-03-12 10:20:52 -07:00
Vik Paruchuri
f4930fff42 Merge remote-tracking branch 'origin/feature/alex/poll-merged' into fix/vik/oe-xblock-stage2 2013-03-12 13:04:42 -04:00
Vik Paruchuri
3a22dbafbe Change task states 2013-03-12 13:04:40 -04:00
Calen Pennington
2aa24350cd Migrate the randomize module to the new storage model 2013-03-12 12:59:06 -04:00
Calen Pennington
222aca7045 Make sure to parse integers that have been stored as strings in the DB 2013-03-12 12:45:16 -04:00
Calen Pennington
433e50e04f Make sure that test-requirements.txt doesn't install versions of libraries that requirements.txt has pinned, and cache pip downloads 2013-03-12 12:41:22 -04:00
Vik Paruchuri
554cb752fa Pep8 cleanup 2013-03-12 12:20:11 -04:00
Don Mitchell
6922152165 Merge pull request #1653 from MITx/feature/studio/advanced-settings-revamp-merge 
Advanced Settings changes.
 2013-03-12 09:13:16 -07:00
Calen Pennington
f155bd0943 Merge pull request #1655 from MITx/fix/vik/oe-xblock-stage 
Potentially fix xblock storage model for open ended
 2013-03-12 08:46:03 -07:00
Julian Arni
1058b552f2 Table order fix (again) 2013-03-12 11:30:14 -04:00
Vik Paruchuri
19e3e79cfa Remove model data, save instance state after init 2013-03-12 11:30:08 -04:00
cahrens
eea5900591 Add in Mark's copy changes. 2013-03-12 11:15:50 -04:00
Calen Pennington
f6b4d3aa46 Make the markdown attribute default to None, to distinguish it from the empty string 2013-03-12 10:50:14 -04:00
Calen Pennington
1411fadd28 Fix access to children via definition 2013-03-12 10:41:10 -04:00
Kevin Chugh
a2be6dd420 first cut of UI 2013-03-12 10:31:05 -04:00
Calen Pennington
2a96c45677 Make default value for format setting None, and force lms and cms to be explicit about a string default 2013-03-12 10:16:14 -04:00
cahrens
bdf1b1b097 Merge branch 'feature/alex/poll-merged' into feature/studio/advanced-settings-revamp-merge 2013-03-12 09:38:34 -04:00
Calen Pennington
cfd7e6d214 Coerce correctmap keys to strings, so that they are pickleable 2013-03-12 09:32:19 -04:00
cahrens
99f55266f5 Do not need to pass blacklist keys to client. 2013-03-12 09:27:46 -04:00
Calen Pennington
dfd66c6520 Merge pull request #1650 from MITx/victor/fix-auto-cohorting 
Add logging to debug strange cohort behavior on prod.
 2013-03-12 04:28:28 -07:00
Calen Pennington
2113541632 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	.ruby-version
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/models/settings/course_metadata.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
 2013-03-12 07:23:28 -04:00
Calen Pennington
40f134ed4d Don't use mutable defaults for fields 2013-03-11 22:23:23 -04:00