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

10902 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arthur Barrett
5bbb70ef8a Advanced modules must now be specified individually in order to enable them on the 'advanced' component menu. 2013-03-05 13:47:02 -05:00
Arthur Barrett
c9b2a6a203 updated CSS to use the new advanced icon 2013-03-05 10:52:39 -05:00
Arthur Barrett
fa3961d4dd merged openended and advanced categories per discussion at today's standup 2013-03-05 10:51:59 -05:00
Brian Talbot
ef9f963f49 studio - advanced modules: added in advanced module button icon per artie/vik work 2013-03-05 10:39:21 -05:00
Vik Paruchuri
d03fe79e07 Small metadata naming fix 2013-03-05 10:36:22 -05:00
Brian Talbot
cc3b9557f9 studio - open ended and annotations: added in component button icon assets and styling 2013-03-04 17:02:59 -05:00
Vik Paruchuri
7ee58fb21c Add in a todo 2013-03-01 17:09:28 -05:00
Vik Paruchuri
55e19f8227 Fix the way that peer grading tab is initialized to make it work with studio 2013-03-01 17:02:38 -05:00
Vik Paruchuri
4400f94196 Fix some xml issues in yaml 2013-03-01 16:41:18 -05:00
Vik Paruchuri
f8b0338dee Change name of annotatable, add in sass for advanced module 2013-03-01 16:26:48 -05:00
Vik Paruchuri
a2c03fec15 Make parsing more robust 2013-03-01 16:19:16 -05:00
Vik Paruchuri
7a8e43a9c5 Json parsing fixes 2013-03-01 15:40:46 -05:00
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
Arthur Barrett
67b73242ea added advanced component button with ability to specify components in course policy. 2013-03-01 15:11:42 -05:00
Vik Paruchuri
9f020e228b Add in some dummy values 2013-03-01 14:50:40 -05:00
Vik Paruchuri
a818191297 Prelim support for combinedopenended and peergrading types 2013-03-01 14:12:04 -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
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
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