Commit Graph

6956 Commits

Author SHA1 Message Date
Ned Batchelder
cab49716b5 Whitelisted courses now run Python code outside the sandbox. 2013-06-06 14:27:12 -04:00
Ned Batchelder
9a631fe476 All uses of safe_exec need to get the correct random seed. 2013-06-06 14:27:12 -04:00
Calen Pennington
5489a3b645 Merge pull request #44 from edx/feature/cale/run-all-tests
Run all tests on jenkins
2013-06-06 09:52:27 -07:00
dcadams
de1c68796b Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-06 08:48:10 -07:00
Peter Fogg
4415fb4c42 Started removing XML from video editor.
TODO: This breaks the 1.5x and .75x speeds. I'm still looking into
why.

TODO: VideoDescriptor inherits from RawDescriptor in order to
use the from_xml and export_to_xml methods. This seems really ugly,
though; I'd rather find a better way to do this.
2013-06-06 10:29:24 -04:00
Jay Zoldak
f00b42c950 Merge pull request #88 from edx/zoldak/revert-search-push
Revert accidental push of changes to master
2013-06-06 07:26:49 -07:00
Vasyl Nakvasiuk
b5ba7b8269 Merge pull request #7 from edx/anton/video_tests_fix
Video tests fix
2013-06-06 07:15:25 -07:00
Jay Zoldak
51b70e42a4 Revert "Merge branch 'master' of https://github.com/edx/edx-platform into slater/search"
This reverts commit e9c5d765ec, reversing
changes made to 5ff9f3be88.
2013-06-06 10:06:37 -04:00
Vasyl Nakvasiuk
45e32107e7 video module: remove old methods 2013-06-06 16:46:47 +03:00
Vasyl Nakvasiuk
68716f99cc video module: _get_timeframe -> get_timeframe 2013-06-06 16:46:47 +03:00
Anto Stupak
8b06916eb6 Fix tests for firefox 2013-06-06 16:45:16 +03:00
Anton Stupak
7eb18fe019 adds test files for video 2013-06-06 16:45:16 +03:00
Slater-Victoroff
e9c5d765ec Merge branch 'master' of https://github.com/edx/edx-platform into slater/search 2013-06-06 08:56:37 -04:00
Slater-Victoroff
3b165da170 Replaced troublesome pyes integration with direct calls made to elasticsearch rest api 2013-06-06 08:56:16 -04:00
Jay Zoldak
1f284c56c1 Skip a test that is causing intermittent failures due to the way it is overriding urls 2013-06-05 18:15:16 -04:00
dcadams
bc5d792338 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-05 15:14:48 -07:00
JonahStanley
d226a21eb0 Changed wording to I will 2013-06-05 16:01:45 -04:00
JonahStanley
f652a5d8c4 Small wording fix 2013-06-05 15:57:42 -04:00
JonahStanley
260659cfc6 Fixed wording in the step 2013-06-05 15:56:45 -04:00
Peter Baratta
83f1f9c2fc Set numpy so it does not print out warnings on student input 2013-06-05 15:50:35 -04:00
Peter Baratta
a85a7f71df Rename variables; get rid of OPS 2013-06-05 15:50:17 -04:00
JonahStanley
acc743eea8 Added functionality to bypass alerts
This is done with the following steps:
'I confirm all alerts' means that all alert and confirm windows are returned and returned true respectively
'I dismiss all alerts' means that all confirm windows are returned false
'I answer all prompts with "([^"]*)"' means that all prompts are returned with the given string

Please note that these settings are on a PER PAGE basis.  This means that for best results, the step must be given right before the alert is generated.
2013-06-05 15:08:58 -04:00
chrisndodge
5d3f6dc477 Merge pull request #74 from edx/fix/cdodge/about-elements-not-exporting
[STUD-244] add exporting of 'about' content as well as adding unit test checks
2013-06-05 11:53:24 -07:00
Nate Hardison
4031c193a1 Adjust available routes based on theme presence
Themes do not necessarily want all of the available LMS routes, such
as `/jobs` and `/university_profiles`. This change splits up the
`lms/urls.py` file and selectively enables/disables routes based on
whether or not a theme is enabled. This is a naive solution for now;
a better solution gives themes a way to selectively overrides such
routes.

Additionally, with the `MKTG_URL_LINK_MAP` setting that hits certain
routes immediately on each page render (whenever the `marketing_link`
helper function is called), themes may crash if they don't leave
all marketing link routes present in `lms/urls.py`. This change also
provides the ability to override the `MKTG_URL_LINK_MAP` in the
settings.

Finally, modify the mitxmako marketing URL middleware to not try to
reverse disabled URLs, which are those keys in the map whose values
are `None`.
2013-06-05 10:55:12 -07:00
Nate Hardison
34c49e73f7 Don't return any news if a theme is enabled
When a non-edX theme is enabled, then don't return anything for "top
news," which is edX-specific.
2013-06-05 10:27:23 -07:00
Calen Pennington
16fc7b37fb Make xmodule_assets incremental, rather than removing the entire generated asset tree 2013-06-05 13:08:53 -04:00
Slater-Victoroff
d1be90bbc4 Merge branch 'master' of https://github.com/edx/edx-platform into slater/search 2013-06-05 12:48:40 -04:00
Chris Dodge
4391783248 add exporting of 'about' content as well as adding unit test checks 2013-06-05 12:40:09 -04:00
dcadams
0fb1136559 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-05 09:25:49 -07:00
Diana Huang
ff7b851f95 Merge pull request #4 from edx/diana/fix-error-descriptor
Ensure that the original error gets preserved by the ErrorModule
2013-06-05 07:39:40 -07:00
Slater-Victoroff
1ac6e12304 Pyes working, considering switch to raw requests, phonetic and fuzzy search both working 2013-06-05 10:22:18 -04:00
dcadams
a8ec1ca9d5 Modified code such that non-logged in student activates correctly. 2013-06-04 17:08:34 -07:00
dcadams
1ea6545556 Worked on reducing pep8 violations. 2013-06-04 14:17:13 -07:00
Joe Blaylock
e092aadbf9 Merge pull request #48 from edx/jrbl/substitute-anonymous-user-id-in-html
Expose site-wide anonymized ids to HTML module
2013-06-04 14:13:59 -07:00
Nate Hardison
b606d7ce56 Merge pull request #53 from edx/nate/fix-mako-templ-encoding
Specify UTF-8 encoding when loading Mako template
2013-06-04 13:02:05 -07:00
Jay Zoldak
59b26a791b Turn off automatic snapshot to tmp dir on lettuce failure 2013-06-04 15:09:44 -04:00
Nate Hardison
7bccce4e9c Add comment to dynamically-generated asset files
To avoid confusion about where these files come from, add a header
comment upon preprocessing that warns people to not modify the
generated files directly, and points them to the appropriate
template file.
2013-06-04 11:14:02 -07:00
dcadams
56f81fb104 Merge branch 'master' of github.com:edx/edx-platform into feature-dcadams-usermanagement 2013-06-04 10:29:04 -07:00
Diana Huang
d895c64f4a Use full descriptor when showing errors, not just the model data. 2013-06-04 10:43:06 -04:00
Nate Hardison
64a85e19e7 Specify UTF-8 encoding when loading Mako template
When loading a Mako template from a Django template, the file
encoding of the Mako template was left unspecified. In some cases,
this would cause the Mako template to be interpreted as an ASCII
template, resulting in blowups if the template was encoded in
UTF-8 (e.g., lms/templates/footer.html).

Now, both the input and output encodings are specified as UTF-8.
2013-06-03 17:19:33 -07:00
Diana Huang
f3b36b8bc9 Use from_descriptor instead of from_xml to make ErrorDescriptor 2013-06-03 17:21:41 -04:00
Joe Blaylock
6262274805 Expose site-wide anonymized ids to HTML module
Co-authored-by: Nate Hardison <natehardison@gmail.com>
2013-06-03 11:35:42 -07:00
Ned Batchelder
c865641f13 Merge pull request #23 from edx/ned/move-loncapa-etc-into-sandbox
Ned/move loncapa etc into sandbox
2013-06-03 11:27:16 -07:00
Jonah Stanley
cdadcba9da Merge pull request #10 from edx/jonahstanley/add-more-tests
Jonahstanley/add more tests
2013-06-03 10:25:53 -07:00
Nate Hardison
1001b315a3 Preprocess assets as Django management command
Rather than directly invoke command-line Python (and Mako) from the
assets Rakefile, or call an external Python script, use a Django
management command to preprocess all asset template files.

An "asset template file" is defined as a static asset file with a
file extension indicating that it needs to be run through a template
engine prior to Sass/CoffeeScript compilation or packaging with other
assets. The preprocess_assets management command will look through
all of the files listed in the `STATICFILES_DIRS`, preprocessing each
as needed. Preprocessing strips off the special template file
extension, creating a new file in the process.

Currently, the only variable accessible in an asset template file is
the `THEME_NAME`, defined in the settings.
2013-06-03 09:58:01 -07:00
jkarni
4bc27b930c Merge pull request #47 from edx/hotfix/jkarni/folditpartialcred
Add partial credit for foldit
2013-06-03 09:19:10 -07:00
Julian Arni
198d63db86 Update docstring for get_score 2013-06-03 12:13:05 -04:00
Julian Arni
c639bbc6f0 Add partial credit for foldit 2013-06-03 11:15:45 -04:00
Peter Baratta
72d149caae Add docstrings and comments 2013-06-03 10:46:11 -04:00
Peter Baratta
ed45c505a3 Simpler pyparsing 2013-06-03 10:44:06 -04:00