Commit Graph

10211 Commits

Author SHA1 Message Date
Victor Shnayder
7d1d135c16 Wire in some initial js. 2012-11-30 09:51:34 -05:00
Victor Shnayder
f5d9e963cc Initial wiring of a staff grading tab.
- no actual functionality, but have a tab that renders static html via a view
2012-11-30 09:51:33 -05:00
Victor Shnayder
6b5125c4df fix typos, logger configs 2012-11-30 09:51:33 -05:00
Kevin Chugh
c2b13e0a3c added temporary flagging assets 2012-11-29 23:43:56 -05:00
Kevin Chugh
9a19518fa7 flagging set up in css and thread template 2012-11-29 19:15:47 -05:00
Your Name
a22dd5ebb7 flagging interface updates 2012-11-29 17:31:40 -05:00
Vik Paruchuri
329ea7ab72 removed .idea files 2012-11-29 16:11:48 -05:00
Chris Dodge
2aceb2e44a make sure when defining the course namespace in the replace url methods that we explicitly state the parameter name. There are some optional parameters and if we don't define the parameter name, it'll end put being interpreted as a different parameter 2012-11-29 15:56:03 -05:00
Chris Dodge
46870f4391 be sure to always pass in a course namespace - which can be just the location of the module itself since it has the same org/course pair - when rewriting links. Also, allow for an option parameter in get_module() to disable the wrapping of the module's HTML with the xmodule_display.html. This is needed for ancillary course content such as 'about', 'course info', which are now stored as xmodules, but should not be wrapped in xmodule_display.html as it breaks some styling 2012-11-29 15:09:28 -05:00
JM Van Thong
5ecacb0103 Implemented 3 analytics to the instructor dashboard: StudentsEnrolled, StudentsPerHomework, DailyActivityAnalyzer. 2012-11-29 12:06:57 -05:00
David Ormsbee
41b73e3b3a Merge pull request #1084 from MITx/fix/rocha/remove-unused-discussion-styles
Remove unused askbot/discussion sass stylesheets
2012-11-27 16:09:20 -08:00
Carlos Andrés Rocha
d4f5f17381 Remove unused askbot/discussion sass stylesheets
The unused styles are referencing images that no longer exisit,
breaking collectstatic and therefore tests.
2012-11-27 19:06:03 -05:00
Ashley Penney
c4377484d5 You need to fill out your full name but it's not marked with a * as
required.
2012-11-27 11:39:33 -05:00
JM Van Thong
d1fe2c3361 Added analytics tab in instructor dashbaord, and call to the analytics back-end to display sample data. 2012-11-26 18:18:18 -05:00
John Jarvis
2db0efa2b4 Only show certificate criteria for notpassing students 2012-11-26 17:57:38 -05:00
John Jarvis
792ddb4d86 Show grade when certificate is generating 2012-11-26 17:51:59 -05:00
John Jarvis
d13509e6f3 Adding percentage formatting for final grade reporting 2012-11-26 17:42:55 -05:00
John Jarvis
4e4a29e030 Removing unnecessary test for 'generating' 2012-11-26 17:40:55 -05:00
John Jarvis
9148d49ac7 lowest_passing_grade fix 2012-11-26 16:57:00 -05:00
John Jarvis
631580ccaf Changing grade info on the dashboard 2012-11-26 16:30:23 -05:00
JM Van Thong
278ed85c10 Merge branch 'master' into jmpm-analytics 2012-11-26 16:20:22 -05:00
brianhw
c341975b2a Merge pull request #1072 from MITx/feature/brian/dashboard-manage-mods
Feature/brian/dashboard manage mods
2012-11-26 12:52:09 -08:00
Brian Wilson
8d0eb7f1a1 Respond to feedback (esp. use of .format()) 2012-11-26 15:43:18 -05:00
Chris Dodge
71f16d40e1 wire through course asset path information to the video playback module and corresponding .coffee files 2012-11-26 11:19:51 -05:00
Chris Dodge
2524cd614a fix edit conflict 2012-11-26 09:36:59 -05:00
Brian Wilson
3b29ab373d check for staff access before creating forum admin 2012-11-26 01:27:16 -05:00
David Ormsbee
0a66ef1acc Redo the part of 010bccc8a5 that address the test failure 2012-11-20 18:45:17 -05:00
David Ormsbee
658c92037c Revert "Make tests pass again without askbot" -- that commit removed
scss files that were still being partially used by the current
discussion forum.

This reverts commit 010bccc8a5.
2012-11-20 18:43:00 -05:00
Your Name
4b017e711d updated models and vies f for flagging 2012-11-20 17:00:16 -05:00
Brian Wilson
57cb8c1e21 Add unit tests 2012-11-20 15:56:18 -05:00
Brian Wilson
619ac10069 Merge remote-tracking branch 'origin/master' into feature/brian/dashboard-manage-mods 2012-11-20 15:46:49 -05:00
Victor Shnayder
62ffc246f7 Merge pull request #1070 from MITx/feature/jarv/cert-status-fix
Feature/jarv/cert status fix
2012-11-20 12:22:45 -08:00
John Jarvis
6d28be0439 Adding management command to grade students who were not previously
graded
2012-11-20 15:18:25 -05:00
John Jarvis
b8cfe80145 Saving grade for non-passing students 2012-11-20 15:18:09 -05:00
Your Name
57b70092e8 update front end to handle flagging 2012-11-20 13:39:33 -05:00
Brian Wilson
5953be7463 fix testing for forum admin privileges 2012-11-20 01:38:33 -05:00
Brian Wilson
7ac7f9ef22 start work on unit test. 2012-11-19 18:12:57 -05:00
Carlos Andrés Rocha
3ca4de303b Update caption of photo on Gates Foundation announcement 2012-11-19 16:45:38 -05:00
David Ormsbee
a482a41b6c Merge pull request #1064 from MITx/content/rocha/gates-foundation-announcement
Add photo credit to gates foundation press release
2012-11-19 13:21:06 -08:00
Carlos Andrés Rocha
4b5e545045 Add photo credit to gates foundation press release 2012-11-19 16:19:11 -05:00
Calen Pennington
010bccc8a5 Make tests pass again without askbot 2012-11-19 16:02:49 -05:00
Don Mitchell
a9233dfd44 Merge branch 'course-info' into feature/dhm/cms-settings
Conflicts:
	cms/djangoapps/contentstore/views.py
2012-11-19 16:00:27 -05:00
David Ormsbee
c2ef44443b Merge pull request #1060 from MITx/content/rocha/gates-foundation-announcement
Add photo to the Gate Foundation announcement press release
2012-11-19 12:52:43 -08:00
Carlos Andrés Rocha
71db139045 Update Gates Foundation press release thumbnail 2012-11-19 15:50:17 -05:00
John Jarvis
9c9dd05666 Missing course_id filter for certificate summary 2012-11-19 15:41:00 -05:00
Brian Wilson
ee7a8494e6 finish basic implementation of forum admin on instructor dash 2012-11-19 14:59:34 -05:00
Carlos Andrés Rocha
82262b4ded Fix bug in news carousel on student dashboard
Clicking on the "bullet" selectors was not working correctly.
2012-11-19 14:35:04 -05:00
Carlos Andrés Rocha
03c8c54e4a Add photo to the gates foundation announcement 2012-11-19 14:32:57 -05:00
Carlos Andrés Rocha
815da69d34 Cleanup a bit javascript of news carousel on student dashboard 2012-11-19 14:08:00 -05:00
Carlos Andrés Rocha
1afb982e8d Update Gates Foundation news release feed image 2012-11-19 13:42:16 -05:00