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

10883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
de3a75d29d Don't prepopulate models which may have script tags in their payloads 
but fetch async via json get.
 2013-03-04 12:54:58 -05:00
Don Mitchell
4245816e9e Separate bug on virgin grading policy edits not being persisted b/c the 
definition not being updated when using defaults. Not sure why this
passed before.
 2013-03-04 12:15:28 -05:00
Don Mitchell
e55bb845b2 Fix for script tags w/in json objects being oddly evaluated on html page 
load by doing load separately. In process, upgraded backbone which
necessitated changing getByCid to get and got rid of obsolete
course_settings master object.
 2013-03-01 16:05:58 -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
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
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
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
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
Victor Shnayder
f0a4691914 Update student FAQ (LH #213) 2013-02-28 20:16:06 -05:00
Christina Roberts
1b9d105e35 Merge pull request #1568 from MITx/bug/christina/misc 
Don't require text tag around multiple choice/checkbox answers.
 2013-02-28 10:48:08 -08:00
cahrens
2be42b8f51 Don't require text tag around multiple choice/checkbox answers. 
https://edx.lighthouseapp.com/projects/102637/tickets/196
 2013-02-28 13:33:04 -05:00
Christina Roberts
69ef622afd Merge pull request #1540 from MITx/feature/ichuang/fix-studio-latex-hls-editor 
Fix latex high-level source editor in current version of cms / studio
 2013-02-28 10:02:09 -08:00
John Hess
02e30f5072 Cleaned up admin_dashboard code and template 2013-02-28 11:11:57 -05:00
John Hess
2f5e1b9cc0 Readable admin_dashboard 2013-02-28 10:54:57 -05:00
Christina Roberts
1ebc3b314d Merge pull request #1566 from MITx/fix/cdodge/optimize-metadata-tree-computation 
Fix/cdodge/optimize metadata tree computation
 2013-02-28 07:28:48 -08:00
Diana Huang
9429262ca4 Merge pull request #1563 from MITx/fix/will/capa_response_unit_tests 
Fix/will/capa response unit tests
 2013-02-28 07:05:15 -08:00
David Ormsbee
456972de5c Merge pull request #1562 from MITx/feature/jarv/org-staff-access 
Creating group for organization staff access DO NOT MERGE
 2013-02-28 06:53:56 -08:00
Will Daly
71d0a367aa Fixed an error in the JavascriptResponseTest: coffee files 
were not being compiled before the LoncapaProblem initializer was
called.
 2013-02-28 09:45:27 -05:00
Chris Dodge
8a7211da05 remove unused import commands (which were used for temporary profiling). Also change get_lms_link_for_item() to preserve the previous argument ordering. Apparently all callers may not use argument name conventions for the 'preview' argument. 2013-02-28 09:40:30 -05:00
Don Mitchell
38830f001f Merge pull request #1564 from MITx/bug/christina/misc 
Bug/christina/misc
 2013-02-28 06:29:34 -08:00
ichuang
9fe9e2fbf6 upadte latex2edx url in latex-problem template 2013-02-28 04:21:50 +00:00
ichuang
b75ccbdcce address Christina's comments re js in latex2edx source-edit.html 2013-02-28 04:21:43 +00:00
Chris Dodge
905199b5eb restore metadata inheritance. Fix lms jump computation on the Studio index page. This gets expensive. 2013-02-27 22:37:13 -05:00
Chris Dodge
e42cdfbd29 turn off metadata inheritence for a quick test 2013-02-27 21:45:17 -05:00
Chris Dodge
d0bbb0f6c9 use a different query to get all collections. Also don't apply inheritance to course modules, because that's ultimately a no-op 2013-02-27 20:43:49 -05:00
Victor Shnayder
f33c575412 Merge pull request #1565 from MITx/fix/brian/pdfchapter_ff 
fix viewing of pdfbook on firefox
 2013-02-27 15:25:36 -08:00
cahrens
e47d11bedc Bug fix for #214. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/214-Via-Tender-Numerical-Input-answer-0-a-tolerance-is-not-accepted#ticket-214-4
 2013-02-27 17:36:28 -05:00
cahrens
c0f0ef0cd2 Bug fix for #214. 
https://edx.lighthouseapp.com/projects/102637-studio/tickets/214-Via-Tender-Numerical-Input-answer-0-a-tolerance-is-not-accepted#ticket-214-4
 2013-02-27 17:34:08 -05:00
Will Daly
7e48de1ef3 Reset responsetypes.py to version on master 2013-02-27 17:22:26 -05:00
Brian Wilson
907cd50503 fix viewing of pdfbook on firefox 2013-02-27 17:09:50 -05:00
Will Daly
043d316d53 Removed test files that are now replaced with XML Factories 2013-02-27 16:40:48 -05:00
Will Daly
ce7256eda9 Removed unused SymbolicResponseXMLFactory 2013-02-27 16:40:05 -05:00
Will Daly
c1324ec21d Modified CodeResponse to use XML factory 2013-02-27 16:25:19 -05:00
John Jarvis
48242d3a06 Adding instructor_<org> 2013-02-27 15:30:07 -05:00
Will Daly
6e4c418a11 Updated JavscriptResponse to use XML factory 2013-02-27 15:26:29 -05:00
Victor Shnayder
8543235306 Merge pull request #1558 from MITx/fix/will/symmath_check_unit_tests 
Added additional unit tests for symmath library that verify symmath_check for simple symbolic input strings.
 2013-02-27 12:19:47 -08:00
Will Daly
3f81fe010c Implemented tests for ImageResponse 2013-02-27 15:05:21 -05:00
John Jarvis
ce2f1400e6 formatting 2013-02-27 15:05:02 -05:00
John Jarvis
7c0d9ff156 Creating group for organization staff access 2013-02-27 14:55:17 -05:00
Will Daly
53b3b79f96 Implemented tests of hints for <formularesponse> 2013-02-27 14:13:49 -05:00