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
Calen Pennington
9bd42278e9
Don't hide the logs in tests
2012-12-28 14:55:32 -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
Victor Shnayder
d28cd4f429
use a dict for backend config. Load it on aws.
2012-11-30 10:03:31 -05:00
Victor Shnayder
b48b389a56
implement login into staff grading service.
2012-11-30 10:03:31 -05:00
Victor Shnayder
edd3277597
Tweaks to actually work with the backend.
...
- specify mime type
- right urls
2012-11-30 10:03:31 -05:00
Victor Shnayder
ff11926570
Initial impl and basic access tests for staff grading service
2012-11-30 10:00:01 -05:00
Victor Shnayder
7d1d135c16
Wire in some initial js.
2012-11-30 09:51:34 -05:00
JM Van Thong
d1fe2c3361
Added analytics tab in instructor dashbaord, and call to the analytics back-end to display sample data.
2012-11-26 18:18:18 -05:00
JM Van Thong
278ed85c10
Merge branch 'master' into jmpm-analytics
2012-11-26 16:20:22 -05:00
Chris Dodge
2524cd614a
fix edit conflict
2012-11-26 09:36:59 -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
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
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
Calen Pennington
630c2fa21e
Make jasmine testing quieter
2012-11-13 10:55:17 -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
01dcf291b6
Adding setting variable for CERT_QUEUE
2012-11-09 18:18:36 -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
Ned Batchelder
90e3386751
WIP for quieter tests with coverage.
2012-11-08 11:19:33 -05:00
