Ned Batchelder
c3b571bf9b
Make sure temp directories are properly cleaned up so running tests doesn't leave them behind.
2013-02-21 11:38:45 -05:00
Vik Paruchuri
dbe93502f1
Fix tests
2013-02-20 12:44:12 -05:00
Diana Huang
03a4deb847
Merge pull request #1489 from MITx/feature/vik/settings-to-xmodule
...
Feature/vik/settings to xmodule
2013-02-20 08:06:20 -08:00
Jay Zoldak
040f840c9d
Remove portal (fake) app, move tests to courseware.
...
Comment out tests that don't run correctly without prerequisites.
2013-02-19 16:46:32 -05:00
Vik Paruchuri
4d57f1b9ee
Merge remote-tracking branch 'origin/master' into feature/vik/settings-to-xmodule
2013-02-19 10:43:55 -05:00
Victor Shnayder
4f8757600a
merge
2013-02-14 12:49:14 -05:00
Victor Shnayder
5e44846596
Foldit integration.
...
- ops view for the desktop app to talk to
- xmodule that talks to the foldit model and displays the student's state
- grading tweak to make grade updates from an external service work:
- Add an always_recalculate_grades property to XModuleDescriptor.
2013-02-14 12:45:06 -05:00
Ned Batchelder
857edaf6f3
Remove dogfood and quickedit.
2013-02-13 12:23:08 -05:00
Vik Paruchuri
ba650202b4
Add in logic to pass settings to peer grading xmodule
2013-02-11 18:09:57 -05:00
Vik Paruchuri
aca5e2300b
Fix dev settings
2013-02-11 17:33:16 -05:00
Vik Paruchuri
9bca4ebf21
Start to refactor grading settings
2013-02-11 17:32:11 -05:00
David Ormsbee
b947b88453
Merge pull request #1460 from MITx/fix/cdodge/remove-csrf-cookie-domain
...
remove CSRF cookie domain setting in aws.py
2013-02-07 08:17:34 -08:00
Chris Dodge
0394e33652
remove CSRF cookie domain setting in aws.py
2013-02-07 11:15:23 -05:00
David Ormsbee
976776643b
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
2013-02-06 22:46:22 -05:00
David Ormsbee
a470a62d12
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 22:37:41 -05:00
Calen Pennington
cfae1cdf62
Pep8 autofixes
2013-02-06 11:13:50 -05:00
David Ormsbee
b68aff72f2
Merge pull request #1436 from MITx/debug/dave/sass
...
undo pipeline changes
2013-02-05 13:26:22 -08:00
David Ormsbee
1ef9d6388f
re-add compression flag to sass
2013-02-05 16:25:59 -05:00
David Ormsbee
706a1072b9
undo pipeline changes
2013-02-05 16:24:53 -05:00
Diana Huang
120aa3cd3b
Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule
...
Feature/vik/peer grading xmodule
2013-02-05 12:55:48 -08:00
Calen Pennington
2551243dfa
Install the static_replace app for the management command
2013-02-05 11:06:46 -05:00
Calen Pennington
b05ead864f
Revert "Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic""
...
This reverts commit c4f56620df
2013-02-05 11:06:45 -05:00
David Ormsbee
ecce3e5761
Merge pull request #1426 from MITx/debug/dave/sass
...
Comment out YUI compressor (cause *something* is still causing CSS compression)
2013-02-05 05:59:59 -08:00
David Ormsbee
818cd3aa48
Comment out YUI compressor (cause *something* is still causing CSS compression)
2013-02-05 08:58:59 -05:00
David Ormsbee
fae51815d8
Merge pull request #1420 from MITx/debug/dave/sass
...
Force it to do expanded mode, because it's still generating compressed CSS output
2013-02-04 15:04:03 -08:00
David Ormsbee
aeaad6f58d
Force it to do expanded mode, because it's still generating compressed CSS output
2013-02-04 18:03:05 -05:00
Vik Paruchuri
bf97a6a9a9
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-xmodule
...
Conflicts:
lms/djangoapps/open_ended_grading/peer_grading_service.py
2013-02-04 17:55:55 -05:00
Diana Huang
fb777de18d
Merge pull request #1401 from MITx/feature/vik/peer-grading-flagging
...
Feature/vik/peer grading flagging
2013-02-04 14:45:59 -08:00
Vik Paruchuri
1dab4aba96
Fix accidental commit of dev.py
2013-02-04 17:44:09 -05:00
David Ormsbee
9f634aba3c
Remove compressed flag from SASS call in pipeline so we can diff the generated CSS
2013-02-04 17:33:26 -05:00
Vik Paruchuri
d89ab000d2
Fix a function call
2013-02-04 17:30:45 -05:00
Vik Paruchuri
eb049bda9e
Merge remote-tracking branch 'origin/master' into feature/vik/peer-grading-flagging
2013-02-04 17:18:59 -05:00
Vik Paruchuri
81b86bb8fe
Retrack dev
2013-02-04 14:16:26 -05:00
Vik Paruchuri
43ddf1fbcf
Proper redirect behavior
2013-02-04 14:14:15 -05:00
Vik Paruchuri
c6c89e4216
Make peer grading xmodule work with notifications
2013-02-04 13:16:05 -05:00
John Jarvis
f525b17b1a
pep8 cleanup
2013-02-01 13:13:16 -05:00
e0d
969737c58e
service variant code for loading different config
2013-01-31 21:43:35 -05:00
Vik Paruchuri
bdb82cda65
Strip out JS, old urls
2013-01-31 18:23:30 -05:00
Vik Paruchuri
10c7155d4d
Add open ended to JS pipeline
2013-01-30 21:28:42 -05:00
Calen Pennington
c4f56620df
Revert "Merge pull request #1374 from MITx/feature/cale/no-course-collectstatic"
...
This reverts commit ab437b94637a8e87c789
2013-01-30 16:49:49 -05:00
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
