Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

6923 Commits

Author SHA1 Message Date
David Ormsbee
c144795588 Re-enable a couple of analytics on the dashboard to test layout 2013-03-07 10:01:56 -05:00
Brian Wilson
aee7d85694 fix bug in tabs 2013-03-07 02:01:42 -05:00
David Ormsbee
d0bff1ed3c Merge branch 'master' into jmpm-analytics 
Conflicts:
	lms/djangoapps/instructor/views.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html
 2013-03-06 17:09:09 -05:00
Calen Pennington
e7900859b6 Remove the 'title' alias for lms.display_name 2013-03-06 15:11:08 -05:00
Victor Shnayder
fb350ed1e3 Merge pull request #1569 from MITx/feature/abarrett/annotatable_xmodule 
Feature/abarrett/annotatable xmodule DO NOT MERGE
 2013-03-06 12:05:27 -08:00
Arthur Barrett
5029d3a3dd Merge branch 'feature/vik/advanced-studio' into feature/abarrett/annotatable_xmodule 2013-03-06 13:51:18 -05:00
Calen Pennington
8a9ba79d1f Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
 2013-03-06 12:15:07 -05:00
Arthur Barrett
2ed7394f27 visually distinguish instructions from guided discussion section 2013-03-06 00:05:28 -05:00
Christina Roberts
e093431d75 Merge pull request #1581 from MITx/feature/vik/advanced-studio 
Feature/vik/advanced studio
 2013-03-05 12:28:29 -08:00
Victor Shnayder
d7484c5e10 Merge pull request #1423 from MITx/feature/jth/remove_un-enroll_all 
removed un-enroll all button for fear of disaster
 2013-03-05 10:18:30 -08:00
Calen Pennington
1bfb933518 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views.py
	cms/templates/edit_subsection.html
	cms/templates/overview.html
	cms/templates/unit.html
	cms/templates/widgets/header.html
	common/djangoapps/course_groups/tests/tests.py
	common/lib/xmodule/setup.py
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/js/src/.gitignore
	common/lib/xmodule/xmodule/mako_module.py
	common/lib/xmodule/xmodule/modulestore/mongo.py
	common/lib/xmodule/xmodule/modulestore/store_utilities.py
	common/lib/xmodule/xmodule/modulestore/xml_exporter.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/controller_query_service.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/self_assessment_module.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/__init__.py
	common/lib/xmodule/xmodule/tests/test_capa_module.py
	common/lib/xmodule/xmodule/tests/test_self_assessment.py
	common/lib/xmodule/xmodule/x_module.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/courseware/models.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/open_ended_grading/tests.py
 2013-03-04 16:33:40 -05:00
David Ormsbee
42a944bb86 Merge pull request #1593 from MITx/hack/dave/submission_history 
It's not UTC time, it's whatever the local settings are set to
 2013-03-04 12:20:41 -08:00
David Ormsbee
01a1bf6b6f It's not UTC time, it's whatever the local settings are set to (New York in prod) 2013-03-04 15:19:24 -05:00
David Ormsbee
9d2a2cbc2f Merge pull request #1555 from MITx/feature/jkarni/foldit-api 
Feature/jkarni/foldit api
 2013-03-04 11:40:43 -08:00
David Ormsbee
b0afbba58d Merge pull request #1516 from MITx/hack/dave/submission_history 
Record and report submission history for a problem
 2013-03-04 11:39:54 -08:00
Arthur Barrett
b0abfa07c8 style the guided discussion text so it is boxed like the instructions text. 2013-03-04 14:23:41 -05:00
David Ormsbee
88a30cb733 Fixes in response to Victor's comments. 2013-03-04 13:21:19 -05:00
Ned Batchelder
7c8a90229e Use 'is None' and 'is not None' 2013-03-04 10:57:25 -05:00
Victor Shnayder
310ecead36 Merge pull request #1582 from MITx/feature/kevin/cohorts_take_3 
Feature/kevin/cohorts take 3
 2013-03-01 16:13:30 -08:00
Your Name
b7a6eadca4 new cohorts tested 2013-03-01 16:33:27 -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
John Hess
b400b575d0 Merge pull request #1567 from MITx/jth/admindash 
Improved /admin_dashboard
 2013-03-01 07:56:32 -08:00
Your Name
8a953241c1 first pass 2013-03-01 10:45:48 -05:00
Victor Shnayder
86b91e2dc0 add a question about account changes to the help page 2013-02-28 20:44:18 -05:00
Victor Shnayder
f0a4691914 Update student FAQ (LH #213) 2013-02-28 20:16:06 -05:00
Arthur Barrett
1da644fcb3 merge from master. resolved conflict with test_responsetypes.py by using the version from master. 2013-02-28 11:22:32 -05: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
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
Brian Wilson
907cd50503 fix viewing of pdfbook on firefox 2013-02-27 17:09:50 -05:00
Arthur Barrett
afa7fca15a Merge branch 'master' into feature/abarrett/annotatable_xmodule 2013-02-27 11:58:38 -05:00
David Ormsbee
c7920f09ad Taking Ike's delete-student-state-for-problem code and putting it in a separate PR so it's not bundled with more debated features. 2013-02-27 11:42:06 -05:00
Ned Batchelder
f828049043 Change TorontoX to University of TorontoX 2013-02-27 10:05:58 -05:00
David Ormsbee
51a863bd6b Merge pull request #1557 from MITx/feature/brian/pdfchapter 
Feature/brian/pdfchapter
 2013-02-26 15:00:58 -08:00
Brian Wilson
310073ddef use same images for prev/next as used in image-based textbooks 2013-02-26 16:43:48 -05:00
Brian Wilson
19567cc3d5 update styling of pdfs to be more like textbooks 2013-02-26 15:19:23 -05:00
Arthur Barrett
18233ef0d7 bolded the section titles and added unittest skeleton for module 2013-02-26 12:15:43 -05:00
Brian Wilson
fc9ab346e1 fix loading of specific pages. 2013-02-26 01:03:01 -05:00
Julian Arni
edba0978cf Included styling and template 2013-02-25 18:18:46 -05:00
Julian Arni
0a47f27fa7 Merge branch 'master' into feature/jkarni/foldit-api 2013-02-25 17:32:30 -05:00
Julian Arni
26eaf8985c Allow progress without leaderboard and vice-versa 2013-02-25 17:28:22 -05:00
Brian Wilson
dde2cd0bd0 get chapter links to start working 2013-02-25 16:52:32 -05:00
Arthur Barrett
1f160d6ef4 added a box around the instructions text 2013-02-25 16:29:19 -05:00
Arthur Barrett
e736ed34f5 added ability to hide/show instructions, if present 2013-02-25 11:29:59 -05:00
Your Name
9f58f6890d Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-25 09:31:28 -05:00
Brian Wilson
fa00ea442e add first pass at multi-chapter support. 2013-02-25 01:26:34 -05:00
Arthur Barrett
66ddfa295d more refactoring and work on annotationinput (should be working now). 2013-02-22 16:33:28 -05:00
Julian Arni
e5294591dc Foldit leaderboard w/o tests 2013-02-22 11:12:26 -05:00