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 |
|
Brian Talbot
|
0114366c36
|
settings - revised discussion settings UI to include standard discussion categories and adding new ones
|
2012-11-19 08:05:52 -05:00 |
|
Brian Talbot
|
bf4f678bde
|
settings - revised faculty photo and syllabus states to either has or does not have
|
2012-11-19 07:38:59 -05:00 |
|
Brian Talbot
|
731ea22687
|
settings - added disabled states for course name/org/number
|
2012-11-19 07:19:13 -05: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 |
|
ichuang
|
f84f08fae4
|
xml_importer bugfix - when importing without policy override use course_location
|
2012-11-17 21:38:15 -05:00 |
|
Victor Shnayder
|
71b585bb61
|
move unique_id_for_user into student/models.py
|
2012-11-17 16:33:00 -05:00 |
|
Victor Shnayder
|
61ddec46dd
|
Use params from view in template.
|
2012-11-17 16:20:17 -05:00 |
|
Victor Shnayder
|
003dc7ef51
|
Get rid of check for non-existent CERTIFICATES_ENABLED flag...
|
2012-11-17 16:19:52 -05:00 |
|
Victor Shnayder
|
03dd7b375a
|
get rid of submodule init--not needed post-askbot
|
2012-11-17 15:59:12 -05:00 |
|
Victor Shnayder
|
3a44f043d2
|
Add tests, make them pass.
|
2012-11-17 15:58:49 -05:00 |
|
Victor Shnayder
|
5bc0b4864a
|
moving cert link and survey logic into views, adding tests. In-progress.
|
2012-11-17 15:24:38 -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 |
|
Calen Pennington
|
3b2b8ad4fa
|
Merge pull request #1053 from MITx/feature/jzoldak/common-jasmine-tests
Capa Problem jasmine tests running independently
|
2012-11-16 13:35:19 -08:00 |
|
Calen Pennington
|
719277876f
|
Merge pull request #1051 from MITx/fix/cdodge/code-mirror-crash-on-style-blocks
remove 'mode' property when creating a new CodeMirror control. This appe...
|
2012-11-16 12:52:33 -08:00 |
|
Jay Zoldak
|
8d0abcb974
|
Merge branch 'feature/cale/cms-master' into feature/jzoldak/common-jasmine-tests
|
2012-11-16 15:10:19 -05:00 |
|
Jay Zoldak
|
ea4c0ed86a
|
Refactor fixtures for capa problems.
|
2012-11-16 14:59:46 -05:00 |
|
Jay Zoldak
|
a10a3209aa
|
Fix all but 4 broken tests.
|
2012-11-16 14:47:09 -05:00 |
|
Jay Zoldak
|
6ae0add931
|
Fix the new problem create statements in the describe blocks for the capa display spec.
|
2012-11-16 13:26:16 -05:00 |
|
Jay Zoldak
|
718ce4db28
|
Get Problem constructor working again, and copy the helper file from lms.
|
2012-11-16 13:02:38 -05:00 |
|
Don Mitchell
|
842bbe92d1
|
Everything tested and ready for Tom to fix
|
2012-11-16 12:53:49 -05:00 |
|
Don Mitchell
|
fbc48026f2
|
Hopefully the course-info changes I had made w/o link destruction
|
2012-11-16 12:51:31 -05:00 |
|