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 |
|
Don Mitchell
|
241c9bb1ac
|
Checkpoint to rebase
|
2012-11-19 16:02:30 -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 |
|
Calen Pennington
|
4e876b056e
|
Merge pull request #1062 from MITx/fix/cdodge/xmodule-script-load-bug
insert the xmodule.coffee dependency into HTMLSnippet().get_javascript()...
|
2012-11-19 12:52:36 -08:00 |
|
Carlos Andrés Rocha
|
71db139045
|
Update Gates Foundation press release thumbnail
|
2012-11-19 15:50:17 -05:00 |
|
Brian Talbot
|
d370307917
|
settings - simplified course details fields per Mark's feedback and radio/checkbox UI
|
2012-11-19 15:48:57 -05:00 |
|
Chris Dodge
|
ec6b1a12e9
|
insert the xmodule.coffee dependency into HTMLSnippet().get_javascript(). This allows us a single point to define this dependency.
|
2012-11-19 15:46:57 -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 |
|
Brian Talbot
|
c7784e30fd
|
settings - radio/checkbox UI - wip
|
2012-11-19 14:59:25 -05:00 |
|
Brian Talbot
|
ab87ff6b20
|
settings - field alignment, radio/checkbox formatting
|
2012-11-19 14:55:32 -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 |
|
Valera Rozuvan
|
9d46ad51be
|
Merge branch 'feature/alex/crystallography-update-mitx' of github.com:MITx/mitx into feature/alex/crystallography-update-mitx
|
2012-11-19 18:20:17 +02:00 |
|
Valera Rozuvan
|
ae37b621a8
|
Update to crystallography html.
|
2012-11-19 18:19:36 +02:00 |
|
Александр
|
d70b74c701
|
added miller indexes grading for crystallography problems
|
2012-11-19 18:18:08 +02:00 |
|
Don Mitchell
|
8c8be3e82a
|
Cleaned up imports
|
2012-11-19 10:38:58 -05:00 |
|
Don Mitchell
|
88cc5a080b
|
Everything tested and ready for Tom to fix
|
2012-11-19 10:38:58 -05:00 |
|
Don Mitchell
|
91a91f4ddb
|
Hopefully the course-info changes I had made w/o link destruction
|
2012-11-19 10:38:58 -05:00 |
|
David Ormsbee
|
336caa0feb
|
Batch together alter statements to minimize how long we lock the auth_users table
|
2012-11-19 10:30:22 -05: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
|
956b704786
|
add migration to remove askbot columns
|
2012-11-19 10:19:31 -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 |
|
Brian Talbot
|
bc4d5f413d
|
settings - various style/alignment tweaks to inline/existinf fields
|
2012-11-19 09:54:08 -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 |
|
David Ormsbee
|
b86d5f9af1
|
Merge pull request #1057 from MITx/content/rocha/gates-foundation-announcement
Add Gates Foundation Announcement
|
2012-11-19 06:49:12 -08:00 |
|
Calen Pennington
|
8525b898d7
|
Add migration to make columns added by askbot nullable, in preparation for eventually deleting them
|
2012-11-19 09:48:51 -05:00 |
|
Brian Talbot
|
14f668a41e
|
settings - revised assignment grace period text
|
2012-11-19 08:35:02 -05:00 |
|
Brian Talbot
|
cff581d5e6
|
settings - revised assignment due time field and provided UTC context/help
|
2012-11-19 08:16:48 -05:00 |
|