Commit Graph

6988 Commits

Author SHA1 Message Date
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
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
David Ormsbee
706a825332 Merge pull request #1076 from MITx/feature/cale/rake-improvements
Provide more info when django has issues when running from rake, and don...
2012-11-26 08:28:37 -08:00
Calen Pennington
2145ff6d1f Provide more info when django has issues when running from rake, and don't install dependencies of common/lib/libraries before every run of a django command 2012-11-26 11:25:46 -05:00
Brian Wilson
3b29ab373d check for staff access before creating forum admin 2012-11-26 01:27:16 -05:00
David Ormsbee
471ae42d1d Merge pull request #1071 from MITx/bugfix/dave/fix_inline_discuss_css
Fix inline discuss CSS
2012-11-20 16:04:49 -08: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
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
David Ormsbee
000042e2dd Merge pull request #1068 from MITx/bugfix/victor/dashboard
oops.  used wrong variable name.
2012-11-20 07:30:35 -08:00
Victor Shnayder
f8dc85b6f8 oops. used wrong variable name. 2012-11-20 10:28:47 -05:00
David Ormsbee
5a225cade4 Merge pull request #1067 from MITx/bugfix/victor/dashboard
cert bugfix: handle students who don't have a grade
2012-11-20 06:25:06 -08:00
Victor Shnayder
5a03b53a2f cert bugfix: handle students who don't have a grade 2012-11-20 09:20:03 -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
David Ormsbee
3648630283 Merge pull request #1065 from MITx/content/rocha/gates-foundation-announcement
Update caption of photo on Gates Foundation announcement
2012-11-19 13:51:05 -08: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
David Ormsbee
44258c1f09 Merge pull request #1063 from MITx/feature/cale/fix-tests-no-askbot
Make tests pass again without askbot
2012-11-19 13:06:10 -08:00
Calen Pennington
010bccc8a5 Make tests pass again without askbot 2012-11-19 16:02:49 -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
Victor Shnayder
35528d9c22 Merge pull request #1061 from MITx/feature/jarv/cert-status-fix
Missing course_id filter for certificate summary
2012-11-19 12:44:25 -08: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
David Ormsbee
a9e2b77d6b Merge pull request #1059 from MITx/feature/tom/dashboard-carousel
Add a carousel to display news on the student dashboard
2012-11-19 11:09:49 -08: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
Carlos Andrés Rocha
1a2cee360a Update news releases images
[Delivers #39472239]
2012-11-19 13:06:37 -05:00
Carlos Andrés Rocha
fd3c5566b8 Move press release images to their own folder 2012-11-19 13:06:37 -05:00
Carlos Andrés Rocha
2511c4ddf6 Clean carousel javascript 2012-11-19 13:06:37 -05:00
Carlos Andrés Rocha
b417002a23 Fix image size of news images on the student dashboard
[#39472239]
2012-11-19 13:06:36 -05:00
Carlos Andrés Rocha
8df425e5e8 Add backend for displaying news on the student dashboard
[#39472239]
2012-11-19 13:06:36 -05:00
Carlos Andrés Rocha
37a6b52557 Remove unused import from courseware views.py 2012-11-19 12:45:46 -05:00
Carlos Andrés Rocha
3d5b571a7e Move courseware related templates to their own folder
Fix moved links
2012-11-19 12:45:46 -05:00
Tom Giannattasio
423de1868d added carousel to dashboard page 2012-11-19 12:45:46 -05:00
David Ormsbee
9be89ab310 Merge pull request #1055 from MITx/feature/victor/per-user-survey-urls
Feature/victor/per user survey urls
2012-11-19 08:46:42 -08:00
Victor Shnayder
d723bb7103 simpify process_survey_link 2012-11-19 11:39:43 -05:00
Victor Shnayder
d1eec9bcf4 add a salt. using user.id since that's handy. 2012-11-19 11:34:31 -05:00
David Ormsbee
6a06c2e40c Merge pull request #1058 from MITx/content/rocha/gates-foundation-announcement
Add new video to frontpage with gates foundation announcement
2012-11-19 07:03:27 -08:00
Carlos Andrés Rocha
47362bfdc7 Add new video to frontpage with gates foundation announcement 2012-11-19 10:02:17 -05:00