Commit Graph

22621 Commits

Author SHA1 Message Date
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
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
Brian Wilson
cb36d675e3 add press mentions for October, update missing logos, and add sorting. 2012-11-19 10:28:40 -05:00
Brian Wilson
e56030ef18 update press page mentions through September, and home page pointers for early November. 2012-11-19 10:28:40 -05:00
Victor Shnayder
60368ec370 Revert overly aggressive killing.
(don't worry--askbot is still dead)
2012-11-19 10:24:41 -05:00
Victor Shnayder
b18136d0cd remove (almost) all references to askbot. 2012-11-19 10:18:03 -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
David Ormsbee
50ab5032a1 Merge pull request #1019 from MITx/feature/arjun/add_roles_command
Adding a better command for assigning roles.
2012-11-19 06:52:00 -08:00
Carlos Andrés Rocha
57da84ef66 Update gates foundation press release 2012-11-19 06:14:08 -05:00
Carlos Andrés Rocha
cabbc8906a Add press release text and update news feed
[#39636489 #39636491 #39636495 #39636903]
2012-11-19 06:14:08 -05:00
Carlos Andrés Rocha
6326e4dc7e Add stub for Gates foundation announcement
[#39636489 #39636491 #39636495 #39636903]
2012-11-19 06:14:08 -05:00
Brian Wilson
8b1b63003b add listing forum moderator to instructor dash 2012-11-19 00:37:43 -05:00
Victor Shnayder
61ddec46dd Use params from view in template. 2012-11-17 16:20:17 -05:00
Victor Shnayder
3a44f043d2 Add tests, make them pass. 2012-11-17 15:58:49 -05:00
Brian Wilson
8f38f04b1f Merge remote-tracking branch 'origin/master' into feature/brian/dashboard-manage-mods 2012-11-16 21:23:42 -05:00
Your Name
fb6a07c812 allow flagging for abuse and spoilers 2012-11-16 18:39:54 -05:00
Brian Wilson
c9f7558d6d first pass at add/remove moderators 2012-11-16 18:34:26 -05:00
Calen Pennington
650f537763 Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests
Make jasmine testing quieter
2012-11-16 13:35:45 -08:00
Victor Shnayder
dd97392ecd Merge pull request #1047 from MITx/feature/jarv/cert-commands
Django commands for certificates
2012-11-16 08:03:00 -08:00
Calen Pennington
0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
2012-11-16 09:03:15 -05:00
John Jarvis
9a12435f6b Removing print 2012-11-15 19:47:33 -05:00
John Jarvis
efaf39ea76 cleanup 2012-11-15 19:42:47 -05:00
John Jarvis
626e6c7e08 Addresses review comments
* List of courses that have ended is now a generator
* Using db-aggregation to speed up query for tallies
2012-11-15 19:05:28 -05:00
David Ormsbee
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal
Conflicts:
	lms/envs/aws.py
2012-11-15 14:24:55 -05:00
Bridger Maxwell
ba57e8a7a5 Fixed redunant rounding of final grade percent, which was causing floating point weirdness. 2012-11-15 13:24:19 -05:00
John Jarvis
10c623d133 Django commands for certificates
* Removing the command to find unicode names since it was only used for
  testing
* ungenerated_certs will now by default run through all courses that
  have ended.  a course option can be used to run on one course
* gen_cert_report added which will summarize certificate states
  for all courses that have ended
2012-11-14 21:41:17 -05:00
Piotr Mitros
660481bee5 Better URL 2012-11-14 20:33:29 -05:00
Piotr Mitros
92ce825990 Analytics experiments 2012-11-14 18:55:20 -05:00
David Ormsbee
1ab7019607 Merge pull request #1044 from MITx/feature/brian/press-updates
Feature/brian/press updates
2012-11-14 10:01:16 -08:00
Brian Wilson
08d9cd7e79 clean up commented-out links on main page 2012-11-14 12:01:04 -05:00
Brian Wilson
515d2f4b1e add press mentions for October, update missing logos, and add sorting. 2012-11-14 11:55:08 -05:00
Calen Pennington
630c2fa21e Make jasmine testing quieter 2012-11-13 10:55:17 -05:00