Victor Shnayder
6d9a9ec46f
Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge"
...
This reverts commit e4819a1b55b6ec41cae0
2013-02-08 15:00:25 -05:00
David Ormsbee
80843c1561
Merge pull request #1463 from MITx/feature/brian/pearson-exam
...
Feature/brian/pearson exam
2013-02-08 11:07:15 -08:00
David Ormsbee
1e197df3c1
Merge pull request #1471 from MITx/victor/jobs-page
...
Posting lots of new jobs
2013-02-08 10:53:27 -08:00
chrisndodge
891e350a83
Merge pull request #1464 from MITx/bug/bug161
...
On first request for handouts, create the db record. (bug 160)
2013-02-08 10:49:01 -08:00
Brian Wilson
f51876da6a
cosmetic changes
2013-02-08 13:42:54 -05:00
Don Mitchell
2cdfed9efe
Merge pull request #1472 from MITx/feature/christina/misc2
...
A couple minor bug fixes.
2013-02-08 10:15:11 -08:00
cahrens
98026e4325
A couple minor bug fixes.
...
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
2013-02-08 12:46:32 -05:00
Victor Shnayder
a68094515c
fix capitalization and spacing
2013-02-08 12:33:19 -05:00
Victor Shnayder
83a4f40ac6
fix typo; fix phrasing for software engineer job
2013-02-08 12:24:07 -05:00
Victor Shnayder
61f5991885
Posting lots of new jobs
2013-02-08 12:15:09 -05:00
Jay Zoldak
0d0049ec76
Merge pull request #1465 from MITx/feature/ichuang/fix-test-conditional
...
fix test_conditional
2013-02-08 08:13:01 -08:00
chrisndodge
7244425996
Merge pull request #1467 from MITx/feature/cale/cms-no-collect-course-static
...
Make it so that cms doesn't try to run collectstatic on course content
2013-02-08 08:05:56 -08:00
Calen Pennington
33a3d5dbb7
Make it so that cms doesn't try to run collectstatic on course content
2013-02-08 10:49:43 -05:00
Calen Pennington
dd4db0601f
Remove generated files
2013-02-08 10:45:59 -05:00
Brian Wilson
ab6f383be1
support for Pearson test user
2013-02-08 03:05:28 -05:00
Brian Wilson
f1198b5f5f
for starting pearson exam, just call jump_to() instead of reverse(jump_to...)
2013-02-08 02:15:45 -05:00
ichuang
7b7b0690b6
fix test_conditional
2013-02-07 18:19:48 -05:00
Brian Wilson
290368ef0d
merge out from master
2013-02-07 17:40:54 -05:00
Don Mitchell
fa5537ab71
On first request for handouts, create the db record. (bug 160)
2013-02-07 17:09:57 -05:00
Christina Roberts
7f70637331
Merge pull request #1462 from MITx/bug/bug161
...
bug 171
2013-02-07 13:31:57 -08:00
Don Mitchell
48e582647c
bug 171
2013-02-07 16:24:43 -05:00
Victor Shnayder
095ec9d3b9
Merge pull request #1457 from MITx/feature/cale/dev-staticfiles
...
Fix loads of local static files when running in dev mode
2013-02-07 13:23:30 -08:00
Brian Wilson
80e4944314
minor cleanup
2013-02-07 16:12:02 -05:00
Brian Wilson
2974b9eec3
Merge branch 'feature/brian/pearson-exam' of github.com:MITx/mitx into feature/brian/pearson-exam
2013-02-07 15:58:12 -05:00
Brian Wilson
cc11dc2aa3
switch to using timelimit module for Pearson test
2013-02-07 15:57:43 -05:00
Ned Batchelder
3ccbd504aa
Pillow needs libjpeg-dev to build JPG support.
2013-02-07 15:20:42 -05:00
Brian Talbot
6d4cb558d3
lms - pearson: styled return to exam link on timer and revised timer positioning to not interfere with main course nav
2013-02-07 12:35:52 -05:00
David Ormsbee
1c07fae501
Merge pull request #1408 from MITx/feature/ichuang/instructor-dashboard-datadump
...
add instructor dashboard feature to download profile & problem state
2013-02-07 08:19:52 -08: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
Christina Roberts
bfb411ad3a
Merge pull request #1459 from MITx/bug/bug161
...
Put DnD back into edit_subsection page
2013-02-07 07:46:37 -08:00
Don Mitchell
70560d2237
Put DnD back into edit_subsection page
2013-02-07 10:41:37 -05:00
Calen Pennington
2b637fe511
Fix loads of local static files when running in dev mode
2013-02-07 10:13:53 -05:00
Brian Wilson
33a5a5fd9f
add implementation for fixed_time_module
2013-02-07 05:17:56 -05:00
ichuang
bf17341fdb
add select_related("profile")
2013-02-06 23:16:44 -05:00
David Ormsbee
a6b35853f9
Merge pull request #1455 from MITx/hotfix/dave/youtube_object
...
Set USE_YOUTUBE_OBJECT_API to False since YouTube has fixed the issue.
2013-02-06 19:47:25 -08: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
Victor Shnayder
37b735d708
Merge pull request #1454 from MITx/hotfix/dave/youtube_object
...
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 19:41:12 -08:00
David Ormsbee
a470a62d12
Hack to disable YouTube <iframe> API when they break it.
2013-02-06 22:37:41 -05:00
Victor Shnayder
18ddd1ee56
Merge pull request #1453 from MITx/victor/protex
...
Victor/protex
2013-02-06 18:03:53 -08:00
jmclaus
2627a2f12c
Protex now loads correctly in every scenario
2013-02-06 20:49:23 -05:00
jmclaus
98865bb7c0
Loading bug fixed by ugly hack
2013-02-06 20:49:16 -05:00
jmclaus
85b92f30de
GWT now does no set any target shape in onModuleLoad()
2013-02-06 20:49:06 -05:00
jmclaus
e27b1e04a7
Fixed small alighment pb, decreased font size of text box
2013-02-06 20:48:57 -05:00
jmclaus
3bd7e1b703
Crisper AA letters, canvases non-selectable
2013-02-06 20:48:48 -05:00
jmclaus
ef232c5976
Few bug fixes
2013-02-06 20:48:40 -05:00
jmclaus
f6dacff41e
Fixed layout, increased size of markers on proteins
2013-02-06 20:48:32 -05:00
jmclaus
5737f58b95
Added GWT Protex - reads target shape from xml writes answer to hidden input field
2013-02-06 20:48:25 -05:00
Victor Shnayder
e4819a1b55
Merge pull request #1452 from MITx/silly/victor/revert-forums-merge
...
Silly/victor/revert forums merge
2013-02-06 17:41:14 -08:00
Victor Shnayder
2af06ef1d4
Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes"
...
This reverts commit 66889b87240dd9c24e74
2013-02-06 20:29:17 -05:00
