John Jarvis
8a0cc6e610
Revert "Fixing namespace issue for "login""
...
This reverts commit dcc53c2bcd
2013-01-23 18:34:53 -05:00
John Jarvis
dcc53c2bcd
Fixing namespace issue for "login"
...
* renaming login to login_user
* renaming register to register_user
2013-01-23 18:22:14 -05:00
Brian Talbot
2c604bc473
changing url name to signin
2013-01-23 18:22:12 -05:00
John Jarvis
9af7c6cc5d
adding login views
2013-01-23 18:22:12 -05:00
Calen Pennington
75b0a8eed6
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2013-01-22 14:47:52 -05:00
Carlos Andrés Rocha
899c501d3d
Add announcement of Walter Lewin's course
...
[#157 ]
2013-01-21 16:58:27 -05:00
Chris Dodge
22695d80c7
Merge branch 'master' into feature/cdodge/cms-master-merge4
...
Conflicts:
common/djangoapps/student/models.py
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/setup.py
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/xml_module.py
jenkins/test.sh
lms/djangoapps/courseware/access.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/django_comment_client/models.py
requirements.txt
2013-01-17 09:15:37 -05:00
Brian Wilson
32b2d1b97f
Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations
2013-01-15 15:42:09 -05:00
Brian Wilson
9e157b91f0
change urls from xxx_test_registration to xxx_exam_registration.
2013-01-15 00:59:34 -05:00
Chris Dodge
08adf9c0d5
Merge branch 'master' into feature/cdodge/cms-master-merge3
...
Conflicts:
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/modulestore/mongo.py
common/lib/xmodule/xmodule/modulestore/search.py
common/lib/xmodule/xmodule/modulestore/xml.py
doc/development.md
lms/envs/common.py
2013-01-11 14:04:46 -05:00
Chris Dodge
3b5e17ef55
Merge branch 'master' into feature/cdodge/cms-master-merge2
...
Conflicts:
.gitmodules
common/djangoapps/__init__.py
common/djangoapps/track/migrations/__init__.py
common/lib/capa/capa/inputtypes.py
common/lib/capa/capa/responsetypes.py
common/lib/capa/capa/templates/openendedinput.html
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/video_module.py
common/static/sass/bourbon/css3/_box-sizing.scss
doc/development.md
lms/djangoapps/instructor/tests.py
lms/envs/aws.py
lms/envs/common.py
lms/templates/video.html
requirements.txt
test-requirements.txt
2013-01-07 12:34:48 -05:00
Diana Huang
d2228205e2
Merge branch 'master' into diana/peer-grading-views
2013-01-04 11:19:10 -05:00
Diana Huang
1c1034c63b
Pass location as a parameter, not as a part of the url
2013-01-03 13:47:03 -05:00
Carlos Andrés Rocha
bd0a2f6630
Add content and assets for media kit
...
[# 41872203]
2013-01-03 13:28:45 -05:00
Diana Huang
bd47b0c79a
New urls and corresponding views in the grading service
2013-01-03 12:59:34 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
Diana Huang
c89ff2ac0e
Basic peer grading view using mocks and some cleanup in
...
the peer grading service
2013-01-02 17:44:58 -05:00
Diana Huang
37f261f906
Move peer grading so that there are the individual problem pages
...
and the problem list page
2013-01-02 15:01:59 -05:00
Diana Huang
652a8eb440
New peer grading view on the lms side
2012-12-28 15:48:06 -05:00
Diana Huang
ecf04b3e49
Refactor existing grading logic into a new app.
2012-12-28 11:29:29 -05:00
Carlos Andrés Rocha
5d85fab283
Fix django auth login redirection
...
The django authentication decorator login_required, redirects to
settings.LOGIN_URL. If it is missing, it redirects to /accounts/login.
We did not have the setting enable, not a proper page where to
redirect. This cause users not logged in to see a 404 error when
accessing courseware directly, by using a link or a bookmark.
[#41499213 ]
2012-12-19 18:48:30 -05:00
Carlos Andrés Rocha
6d85accad8
Add news announcement for spring 2013 courses
...
[# 41258693]
2012-12-19 11:49:55 -05:00
Brian Wilson
bc40a7f127
make test-reg dialog non-modal, and pass course_id in URL. Add to course info.
2012-12-18 16:16:55 -05:00
Brian Wilson
c7d379beb6
add first pass at wiring test registration dialog
2012-12-18 03:20:02 -05:00
Victor Shnayder
c5c4305f9e
Merge pull request #1110 from MITx/diana/instructor-grading-styling
...
Updates to the instructor grading pages
2012-12-10 10:39:19 -08:00
Carlos Andrés Rocha
faae6a36dc
Merge pull request #1107 from MITx/content/btalbot/new-universities
...
Add Georgetown news announcement, landing page and updated FAQ
[Finished cd#40805397 #40805401 ]
2012-12-10 03:32:41 -08:00
Diana Huang
7f9fcfffdf
Add support for the new staff grading views on the backend
2012-12-07 17:01:27 -05:00
Carlos Andrés Rocha
cc68ba5bc9
Add Georgetown news announcement, landing page and updated FAQ
...
[#40805397 ]
2012-12-07 11:59:13 -05:00
David Ormsbee
7596deb40a
Merge pull request #1094 from MITx/feature/victor/instructor-grading
...
Feature/victor/instructor grading
2012-12-07 08:44:58 -08:00
Calen Pennington
c917725ff0
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/xmodule/xmodule/seq_module.py
common/lib/xmodule/xmodule/template_module.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/tests/tests.py
lms/djangoapps/courseware/views.py
lms/static/sass/course.scss
requirements.txt
2012-12-07 11:17:41 -05:00
Carlos Andrés Rocha
e3d180505f
Add Wellesley College news announcement and frontpage changes
2012-12-04 09:45:30 -05:00
Victor Shnayder
ed6a8f68ac
starting to stub out the backend staff grading service [wip]
2012-11-30 09:51:35 -05:00
Victor Shnayder
f5d9e963cc
Initial wiring of a staff grading tab.
...
- no actual functionality, but have a tab that renders static html via a view
2012-11-30 09:51:33 -05:00
Victor Shnayder
6b5125c4df
fix typos, logger configs
2012-11-30 09:51:33 -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
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
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
Calen Pennington
dbcb1adfaf
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
lms/static/sass/course/courseware/_courseware.scss
2012-11-13 10:22:42 -05:00
Victor Shnayder
2846c61d15
Revert "remove (almost) all references to askbot."
...
This reverts commit 793354a0dc
2012-11-09 18:18:37 -05:00
John Jarvis
fceed0fc70
view for the certificate callback URL
2012-11-09 18:18:34 -05:00
Victor Shnayder
76f0cf4a86
remove (almost) all references to askbot.
2012-11-09 18:18:33 -05:00
Calen Pennington
171e932266
Merge branch 'master' into feature/cale/cms-master
...
Conflicts:
rakefile
2012-11-08 12:28:40 -05:00
David Ormsbee
92f2fbf0f8
Ugly, ugly hack needed so that Pearson can test something today, to be replaced by a real implementation later this week or early next.
2012-11-07 13:55:08 -05:00
Victor Shnayder
8c27e3a249
Revert overly aggressive killing.
...
(don't worry--askbot is still dead)
2012-10-30 20:49:10 -04:00
Victor Shnayder
793354a0dc
remove (almost) all references to askbot.
2012-10-30 18:23:07 -04:00
Calen Pennington
6d5a1264b9
Move jasmine tests to their own environment
2012-10-30 10:58:38 -04:00
Calen Pennington
b52ed48221
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
common/lib/capa/capa/responsetypes.py
common/lib/xmodule/xmodule/js/src/html/display.coffee
lms/envs/common.py
2012-10-23 13:38:11 -04:00
David Ormsbee
2e03a4846c
Merge pull request #935 from MITx/feature/rocha/cengage-press-release
...
Add Cengage book press release
2012-10-18 11:55:02 -07:00
Carlos Andrés Rocha
2f7733ede0
Add Cengage book press release
2012-10-18 14:45:42 -04:00
David Ormsbee
491f10d1bf
Merge branch 'master' into feature/dave/email_bugfixes
2012-10-18 12:23:09 -04:00
