Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,212 Commits 1 Branch 0 Tags
3b165da17047b13c696ee319fa8798d20f8cff04
Commit Graph

14212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vik Paruchuri
386ab10edb Apparently meld is weird at indenting 2013-03-01 15:31:42 -05:00
Vik Paruchuri
a09a4febce Fix category generation 2013-03-01 15:30:22 -05:00
Vik Paruchuri
fb37d46bd8 Minor bugfixes 2013-03-01 15:28:33 -05:00
Vik Paruchuri
d039776218 Merge branch 'feature/vik/studio-oe' into feature/vik/advanced-studio 
Conflicts:
	cms/djangoapps/contentstore/views.py
 2013-03-01 15:25:53 -05:00
Chris Dodge
724c6c9eaa reapply Ike's pull-request in a new branch. The PR branch got mangled on the rebase by accident. 2013-03-01 15:25:36 -05:00
cahrens
d7c28bfa11 Don't usurp ValidatingView's error handling. 
#219
 2013-03-01 15:24:56 -05:00
Arthur Barrett
67b73242ea added advanced component button with ability to specify components in course policy. 2013-03-01 15:11:42 -05:00
Don Mitchell
5fa1da5324 Merge pull request #1577 from MITx/bug/christina/misc 
Bug fix for #215 (quotes not rendering in text fields).
 2013-03-01 12:09:20 -08:00
Will Daly
d6df7e2d96 Added comments to clean_message_html 2013-03-01 15:04:01 -05:00
jkarni
a204bff298 Merge pull request #1576 from MITx/feature/jkarni/newjsme 
Updated version of JSME.
 2013-03-01 11:58:19 -08:00
Julian Arni
3203360e9e Removed console.logs 2013-03-01 14:57:38 -05:00
cahrens
29330cc922 Remove broken link. Will create a record for the general problem of where we should point for edX101, help, pdf documentation, etc. 
#213
 2013-03-01 14:55:38 -05:00
Vik Paruchuri
9f020e228b Add in some dummy values 2013-03-01 14:50:40 -05:00
Julian Arni
b39bbec23e Fixed many more broken references in css 2013-03-01 14:43:28 -05:00
cahrens
d001f21bfe Bug fix for #215 (quotes not rendering in text fields). Lettuce test to follow. 2013-03-01 14:39:49 -05:00
David Ormsbee
11f864f489 Merge pull request #1530 from MITx/feature/cale/limit-login-lifetime 
Limit remembered logins to 7 days, so that old cookies will eventually expire
 2013-03-01 11:37:46 -08:00
Julian Arni
6ccd496add Fixing broken split-button-arrow-focus link 2013-03-01 14:22:41 -05:00
Calen Pennington
f4032caeaf Merge branch 'feature/cale/xmodule-storage-model' into feature/alex/poll-merged 
Conflicts:
	common/lib/xmodule/xmodule/conditional_module.py
 2013-03-01 14:13:58 -05:00
Vik Paruchuri
a818191297 Prelim support for combinedopenended and peergrading types 2013-03-01 14:12:04 -05:00
Arthur Barrett
530051037d adding annotatable module template 2013-03-01 13:58:39 -05:00
Vik Paruchuri
c24ba23e54 Move self assessment templates 2013-03-01 13:45:55 -05:00
Vik Paruchuri
b0c2559de8 Switch around template locations 2013-03-01 13:43:01 -05:00
Arthur Barrett
82544f2ae1 start adding jasmine tests to module 2013-03-01 13:39:51 -05:00
Julian Arni
09ff623561 Updated version of JSME. 2013-03-01 13:38:35 -05:00
Arthur Barrett
6dba2394b2 enable studio authoring (raw) for xmodule 2013-03-01 13:32:56 -05:00
Vik Paruchuri
b3d0abbd05 Start to move around templates 2013-03-01 13:31:54 -05:00
VikParuchuri
d186e5d186 Merge pull request #1538 from MITx/diana/fix-import-export 
Fix studio import and export for CombinedOpenEnded, PeerGrading XModules
 2013-03-01 09:32:08 -08:00
Calen Pennington
3908ada4ca Merge pull request #1575 from MITx/feature/edz/lock-requirements 
locking django-nose and numpy versions
 2013-03-01 09:20:09 -08:00
e0d
a3ed2d156d locking django-nose and numpy versions 2013-03-01 12:08:20 -05:00
David Ormsbee
d6957f3e7e Merge pull request #1508 from MITx/feature/ichuang/fix-save-button-messages-and-add-capa-survey-mode 
Fix capa save button msgs & add simple capa survey mode
 2013-03-01 08:26:21 -08:00
David Ormsbee
e1fcf4c317 Merge pull request #1478 from MITx/bugfix/dave/too_many_sql_queries 
Reduce SQL queries in courseware by model caching a User's groups
 2013-03-01 08:24:30 -08:00
Will Daly
f8893e9cc1 Updated custom response documentation 2013-03-01 11:19:39 -05:00
Will Daly
8265181477 If there are multiple inputs, but only one message specified, 
the message is now applied to the entire response.
 2013-03-01 11:17:31 -05:00
Calen Pennington
c581ecd897 Merge pull request #1573 from MITx/feature/edz/lock-capa-deps-versions 
locking deps versions based on pip freeze in production.
 2013-03-01 08:10:56 -08:00
Will Daly
c3da73ed1e Changed title of custom response doc. 
Added custom response doc to index
 2013-03-01 10:57:57 -05:00
John Hess
b400b575d0 Merge pull request #1567 from MITx/jth/admindash 
Improved /admin_dashboard
 2013-03-01 07:56:32 -08:00
David Ormsbee
1d4defd0ea Fix bug where we weren't combining org_staff with built-in staff for group checking 2013-03-01 10:54:57 -05:00
Your Name
8a953241c1 first pass 2013-03-01 10:45:48 -05:00
e0d
4e10eb10e3 locking deps versions based on pip freeze in production. 2013-03-01 10:15:07 -05:00
David Ormsbee
bfe2809a87 Merge branch 'master' into bugfix/dave/too_many_sql_queries 
Conflicts:
	lms/djangoapps/courseware/access.py
 2013-03-01 10:11:35 -05:00
Will Daly
9ac8ef542f Overall message HTMl now correctly renders when multiple HTML tags are 
passed as the message (even when there's no root tag)
 2013-03-01 09:40:38 -05:00
Will Daly
952716af13 Added clean-up code for message HTML. 
If overall message is a parseable XHTML tree,
it is inserted as a tree rather than text.
 2013-03-01 09:40:38 -05:00
Will Daly
68cf4c4535 Added tests for HTMl rendering of problems 
Added support for rendering response messages
 2013-03-01 09:40:38 -05:00
Will Daly
9f6119a19a * Fixed a bug in CorrectMap in which overall_message was not copied 
in the update() method
* Implemented CustomResponse behavior for returning overall_message,
  with unit tests
* Added additional CustomResponse unit tests for exception handling
 2013-03-01 09:40:38 -05:00
Will Daly
3dd49881c3 * Wrote unit tests for correctmap. 
* Fixed potential KeyError in correctmap.get_queue_time_str()
* Modified correctmap.get_npoints() to return 0 if answer is incorrect,
    even when npoints has been set.
* Added overall_message attribute to CorrectMap to allow
messages that apply to the entire question, not just an individual input
 2013-03-01 09:40:38 -05:00
Calen Pennington
32e5f72c16 Remove .redcar folder 2013-03-01 08:15:38 -05:00
VikParuchuri
228e749d23 Merge pull request #1571 from MITx/marketing/faq-and-media 
add a question about account changes to the help page
 2013-02-28 17:47:42 -08:00
Victor Shnayder
86b91e2dc0 add a question about account changes to the help page 2013-02-28 20:44:18 -05:00
VikParuchuri
57ea68b2a8 Merge pull request #1570 from MITx/marketing/faq-and-media 
Marketing/faq and media
 2013-02-28 17:27:05 -08:00
Victor Shnayder
9cde21b591 Update edX media kit (LH #221) 2013-02-28 20:16:19 -05:00