Calen Pennington
d132f2e18a
Only put data repos in STATICFILES_DIRS if we're serving them from django (which is only in dev)
2013-01-30 09:12:50 -05:00
Brian Wilson
9cf0f0900b
Fix Pearson unit tests.
2013-01-28 12:56:26 -05:00
e0d
956ccb06e9
explicitly set the domain for the csrf cookie to match the session domain.
2013-01-26 21:10:14 -05:00
Victor Shnayder
6847779f22
Merge remote-tracking branch 'origin/master' into feature/victor/cohorts
...
Conflicts:
common/djangoapps/student/models.py
2013-01-26 12:37:26 -05:00
Kevin Chugh
07c1999a95
prep for staging
2013-01-24 21:43:36 -05:00
Victor Shnayder
771a55a631
turn forums on in test.py
...
- this may not be a good idea, but needed for testing cohorts for now...
2013-01-24 18:35:34 -05:00
Ashley Penney
b02ebc4618
Add these two options in as well.
2013-01-24 15:20:27 -05:00
Victor Shnayder
0e78eaaf80
Add a course_groups djangoapp with a CourseUserGroup model.
2013-01-24 15:12:52 -05:00
Brian Wilson
ba62a657bf
Merge remote-tracking branch 'origin/master' into bugfix/brian/openid_provider_post
2013-01-22 23:50:38 -05:00
Calen Pennington
75b0a8eed6
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
2013-01-22 14:47:52 -05:00
Brian Wilson
9653631e9a
Add initial openid_provider tests (covers xrds and authentication requests)
2013-01-22 11:15:30 -05:00
Valera Rozuvan
61c68b740c
Set up of basic RequireJS skeleton structure.
2013-01-21 15:53:44 +02:00
David Ormsbee
0f035b7692
Remove extra RequireJS.js entry.
2013-01-18 17:03:55 -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
3b28e328c4
disable export of testcenter_exam from course module (and add test).
2013-01-15 17:54:10 -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
David Ormsbee
36b024ab95
Merge pull request #1203 from MITx/feature/alex/gst-mitx
...
Feature/alex/gst mitx
2013-01-15 08:24:09 -08:00
David Ormsbee
ad261706c8
Merge pull request #1263 from MITx/feature/ichuang/instructor-dashboard-upgrade3
...
Upgrade to instructor dashboard: enrollment, offline grades, remote gradebook
2013-01-15 08:22:19 -08:00
valera-rozuvan
0913e9ef69
Work on GST.
2013-01-15 12:51:55 +02:00
Calen Pennington
fc2d5c43f1
Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
...
Conflicts:
lms/envs/aws.py
2013-01-14 12:51:19 -05:00
Vik Paruchuri
1316728aaa
Minor naming fix
2013-01-14 12:32:31 -05:00
Vik Paruchuri
0e11deffcf
Fix staff and peer grading settings to not fail catastrophically
2013-01-14 12:31:50 -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
ichuang
200493a54f
instructor dashboard upgrade - add enrollment management
2013-01-10 23:31:45 -05:00
Brian Wilson
8ad9bc5949
Move Pearson URL to settings. Fix Register button. Other small changes.
2013-01-09 11:26:54 -05:00
Diana Huang
bbc5cd50bc
Add in default value for MOCK_PEER_GRADING
2013-01-07 15:49:48 -05:00
Diana Huang
e1ec4eec71
Get tests to pass by creating a mock peer grading service
2013-01-07 14:46:32 -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
ad63c492be
Minor updates to the page to handle showing Calibration feedback.
...
Also, allow for the hiding of the Prompt and the Rubric.
2013-01-04 12:42:38 -05:00
Diana Huang
28501ca58e
Merge branch 'master' into diana/peer-grading-views
2013-01-03 16:23:14 -05:00
David Ormsbee
2daddff2ef
Merge pull request #1217 from MITx/feature/zoldak/lms-acceptance-testing
...
Merge the lettuce acceptance test framework to master
2013-01-03 09:06:47 -08:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
valera-rozuvan
62271fe5c6
Added namespaced RequireJS.
2013-01-03 10:14:06 +02:00
Jay Zoldak
56d17d8a8a
Improve some comments and names in the acceptance test framework
2013-01-02 10:44:21 -05:00
Jay Zoldak
d5111b9ed9
Get lettuce tests running against test database
2013-01-02 10:44:21 -05:00
Jay Zoldak
6df565e468
Interim work on open-ended grading acceptance testing POC
2013-01-02 10:44:20 -05:00
Jay Zoldak
20cc930312
Bring over acceptance test changes from cms master branch.
2013-01-02 10:44:20 -05:00
Jay Zoldak
0a77dd4431
Smart accordion walkthrough working for cms-master branch
...
Conflicts:
lms/envs/cms/acceptance.py
2013-01-02 10:44:19 -05:00
Jay Zoldak
668bc81d7f
New branch for clean lms acceptance tests
2013-01-02 10:44:19 -05:00
Diana Huang
deffa188ff
Fix some minor problems and add new key for peer grading.
2013-01-02 09:43:21 -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
David Ormsbee
5171fe6871
Merge pull request #1199 from MITx/fix/zoldak/test-logger-settings
...
Remove logger setting override from test settings configuration file.
2012-12-21 12:22:47 -08:00
Jay Zoldak
3bbfb4851b
Remove logger setting override from test settings configuration file.
2012-12-21 10:25:14 -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
David Ormsbee
e3b4d78d87
IE7 compatibility: no trailing commas in arrays, including the third party json2.js lib because IE<8 has no JSON object.
2012-12-07 16:03:05 -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
Victor Shnayder
53580af952
fix aws setting name
2012-12-07 10:35:44 -05:00
Calen Pennington
251f552e64
Don't try and send exceptions to newrelic with a busted logging interface
2012-12-03 14:30:36 -05:00
Victor Shnayder
835f18795a
Make tests pass again
2012-11-30 10:27:34 -05:00
