Commit Graph

7258 Commits

Author SHA1 Message Date
Victor Shnayder
b47fdd5220 Merge pull request #1080 from MITx/feature/jarv/dashboard-grades
Feature/jarv/dashboard grades
2012-11-26 15:25:08 -08: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
John Jarvis
474f810b38 Adding lowest_passing_grade() to CourseDescriptor 2012-11-26 16:29:45 -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
Jay Zoldak
7da7bf7481 Add pip install of test requirements, remove askbot requirements. 2012-11-26 14:16:01 -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
Александр
01b5992372 comment outputs 2012-11-22 18:53:35 +02:00
Александр
4b4b2c9927 added documentation, tests, and rounding to closes 0.05 value 2012-11-22 18:44:31 +02:00
Александр
77c831eb10 documenation for chem.miller 2012-11-22 18:43:41 +02:00
Valera Rozuvan
3e8e576e28 Slight change in caption for lattice select. 2012-11-22 16:52:59 +02:00
Valera Rozuvan
37714d45ac Merge branch 'feature/alex/crystallography-update-mitx' of github.com:MITx/mitx into feature/alex/crystallography-update-mitx 2012-11-22 13:56:00 +02:00
Valera Rozuvan
19c463b739 Removed radio buttons for selecting the intersection type from crystallography template. 2012-11-22 13:55:50 +02:00
Александр
166ff823a7 removed hidden parameter to template, style='hidden' is set by default for input 2012-11-22 12:53:21 +02:00
Александр
111667defd UI delta and tests: 2012-11-21 19:02:40 +02:00
Александр
33159824a5 added test for lattices 2012-11-21 18:02:48 +02:00
Александр
d5dd725537 miller indices calculation 2012-11-21 17:53:51 +02:00
Valera Rozuvan
aaeffa5316 Updated template for crystallography so that it corresponds to the cnahges made in the JS part. 2012-11-21 16:52:17 +02: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
Valera Rozuvan
a3db017580 Updated crystallography template to reflect changes made in the JS part. 2012-11-20 14:19:48 +02: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