Commit Graph

7051 Commits

Author SHA1 Message Date
Ned Batchelder
d8c22dbeb3 Add a Django setting for course allowed to run unsafe code. 2013-05-06 11:39:21 -04:00
Will Daly
7b26c50e32 Added instructions for clearing the cache before running tests 2013-05-06 11:39:20 -04:00
Will Daly
ac660ead3e Added load test of CustomResponse 2013-05-06 11:39:20 -04:00
Ned Batchelder
5e7d328e7f Use the Django cache for sandboxed code execution. 2013-05-06 11:39:19 -04:00
Ned Batchelder
ceb6cedaae Fix merge 2013-05-06 11:39:19 -04:00
Ned Batchelder
5acb225816 Print the full traceback when execution fails. 2013-05-06 11:39:17 -04:00
Ned Batchelder
839c568474 Hmm, turns out exec wants just one dict to properly simulate Python module execution. 2013-05-06 11:39:17 -04:00
Ned Batchelder
ec7a04fdb3 A /debug/run_python endpoint for staff to test the sandboxing of Python code. 2013-05-06 11:39:17 -04:00
Victor Shnayder
fe12c64523 Merge pull request #1951 from edx/victor/epfl-desc
update EPFL profile.  LH # 374
2013-05-06 08:34:48 -07:00
Victor Shnayder
06846d9187 update EPFL profile. LH # 374 2013-05-06 11:06:05 -04:00
Ned Batchelder
5d4b61c7f5 Better configuration for codejail. 2013-05-06 10:55:05 -04:00
Ned Batchelder
7c498be606 Move packages around so we can install packages into the sandbox. 2013-05-06 10:55:05 -04:00
Ned Batchelder
249ba4be33 Finish the test for computed_answer 2013-05-06 10:55:04 -04:00
Ned Batchelder
a6677aa0a8 Computed answers are run through safe_exec. 2013-05-06 10:55:04 -04:00
Ned Batchelder
6297d64528 Now these can be in the same test class 2013-05-06 10:55:04 -04:00
Ned Batchelder
ff1df569cb Refactor submitting problems so we don't need custom code for each test. 2013-05-06 10:55:04 -04:00
Ned Batchelder
33abe54e0d Work in progress to sandbox the uses of eval in LMS. 2013-05-06 10:55:03 -04:00
Ned Batchelder
9249bafd00 Add a test of a bad answer also. 2013-05-06 10:55:03 -04:00
Ned Batchelder
e69a073161 Add a test for the Python in schemaresponse, and refactor the tests while I was in there. 2013-05-06 10:55:03 -04:00
Ned Batchelder
9827a0e218 Oops, this line can go too. 2013-05-06 10:55:03 -04:00
Ned Batchelder
9cc43f1d9b Simplify this test setup. 2013-05-06 10:55:03 -04:00
jarv
bf5ac6c263 Merge pull request #1950 from edx/jarv/drupal-new/iframe
Jarv/drupal new/iframe
2013-05-06 07:46:28 -07:00
Jay Zoldak
8ef88fa5b0 Fix tests that randomly fail when run in concurrent jobs on jenkins. 2013-05-06 10:24:38 -04:00
David Baumgold
b344976fe7 Making linters happier 2013-05-03 15:08:28 -04:00
Diana Huang
c9a6fe18f0 Create new marketing_link function to abstract link generation
and use it for the new marketing site links.
2013-05-03 15:06:24 -04:00
Diana Huang
e4e6c0dd7b Add new URLS to MKTG_URLS. 2013-05-03 15:05:03 -04:00
Diana Huang
3e217c8f85 Use new login page for marketing site when student is trying to
access login_required page.
2013-05-03 15:04:41 -04:00
Jason Bau
7720c0fc8d Inserts overrides in env.lms.aws for email settings and timezone
overrides what is set in env.lms.common using the lms.env.json
file
2013-05-03 11:45:21 -07:00
Brian Talbot
192e1d798d edx.org - trying a fix for IE ignoring styles within registration button iframe 2013-05-03 13:33:47 -04:00
John Jarvis
258537e3d2 adding csrf middleware token to form submission 2013-05-03 13:05:10 -04:00
John Jarvis
58dbcf9d31 break out of iframe 2013-05-03 13:04:36 -04:00
Greg Price
d61945081d Fix disable/re-enable submit button 2013-05-03 13:01:39 -04:00
Brian Talbot
7dd763212e edx.org - fixes to the iframe-based register button's styling 2013-05-03 11:55:14 -04:00
Greg Price
0f7378a171 Modify UserFactory to create a profile for the user
This allows specification of profile parameters when creating a user. Because
the profile contents are always accessed from the database, the user must be
saved to the database before the profile is created. This means that the
profile cannot be created if the user is merely being built (and not saved)
rather than created.
2013-05-03 10:31:35 -04:00
Diana Huang
d35283cf65 Reduce the amount of repeated HTML and add checks for the correct settings. 2013-05-03 10:17:40 -04:00
Greg Price
031a74865e Add login link to registration page if user is trying to enroll in a class
If an unauthenticated user clicks on a course registration button, they will
be redirected to the user registration page. Now, that page will include a link
to the login page. If the user follows the link and logs in successfully, then
they will be enrolled in the class.
2013-05-03 10:01:11 -04:00
Greg Price
e5846e64bd Modify course registration flow for new login and registration pages
Now that we are using separate pages for login and registration rather than
modals, clicking the registration button for a course should direct an
unauthenticated user to the registration page, and the user should be enrolled
in the course upon successful registration. Likewise, an unauthenticated user
attempting to unenroll from a course should be directed to the login page and
subsequently unenrolled from the course upon successful login. The enrollment
change service also now uses HTTP status codes rather than JSON to communicate
status to the front end.
2013-05-03 10:01:11 -04:00
Diana Huang
1d42df8cb1 Add MKTG_URLS to settings for new footer and header links. 2013-05-03 09:31:47 -04:00
Diana Huang
e0ac6834da Fix links between marketing site and courseware.
Update links in footer to point to the right pages.
Update link on dashboard without any classes.
Update links in header.
Update links on sign in and register pages.
2013-05-03 09:31:47 -04:00
Victor Shnayder
aae40b4378 Press updates
LH: 381, 382, 383
2013-05-03 08:55:40 -04:00
Diana Huang
45baf013fe Merge branch 'master' into drupal-new 2013-05-02 17:04:39 -04:00
Brian Talbot
d7d68a1e8c edx.org - resolved JQuery submit() method error on <iframe> register button actions 2013-05-02 15:31:17 -04:00
John Jarvis
59c56c2610 fixing old about view, iframe updates 2013-05-02 15:05:12 -04:00
Brian Talbot
7705941a65 edx.org - added in isolated register button styling/states for <iframe>-based registration fix 2013-05-02 11:54:16 -04:00
Jay Zoldak
f2fd90bc61 Merge pull request #1917 from MITx/fix/cale/lms-jasmine-tests
Fix/cale/lms jasmine tests
2013-05-01 08:23:41 -07:00
Christina Roberts
a537bd7f05 Merge pull request #1908 from MITx/fix/btalbot/studio-courseinfo
Fix/btalbot/studio courseinfo
2013-04-30 13:34:52 -07:00
dcadams
6a1a907339 Fix pep8 violations. 2013-04-30 11:48:23 -07:00
Calen Pennington
771937b3da Remove duplicate libraries used while jasmine testing the LMS (as they are also defined in vendor) 2013-04-30 14:09:42 -04:00
Calen Pennington
dfd369b9e9 Make ordering of js bundles during jasmine tests consistant 2013-04-30 14:09:17 -04:00
John Jarvis
aa895cbc6b Adding mktg_iframe.html 2013-04-30 13:13:31 -04:00