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
JonahStanley
a17c487f16
Merged from Master
2013-06-03 09:46:19 -04:00
JonahStanley
8cc93cb5d8
Merge branch 'master' into jonahstanley/add-more-tests
2013-06-03 09:37:25 -04:00
Peter Fogg
8c5f9e6e41
Fix merge conflict.
2013-06-03 08:49:52 -04:00
Christina Roberts
52b76c87f4
Merge pull request #11 from edx/feature/christina/metadata-ui
...
Feature/christina/metadata ui
2013-06-01 16:01:53 -07:00
JonahStanley
286fcece4a
Fixed issue of searching for text
...
Now the step calls is_text_present and is_text_not_present with a wait time of 5 seconds so that the page can be properly refreshed/reloaded if needed.
This also gets rid of an assert not
2013-05-31 15:33:56 -04:00
Ned Batchelder
88d3f253b6
Move symmath to be its own directory, and install it into the sandbox.
2013-05-31 15:22:16 -04:00
JonahStanley
cb9da2cd03
Potentially fixed all flakey tests
...
New function was added: is_css_not_present
This function works like is_css_present in that it will wait and can take in an optional argument to wait longer. This should be used everywhere INSTEAD of not is_css_present as in the latter case, you are telling selenium to wait for the thing you don't want to be there to either be there or time out.
2013-05-31 15:16:45 -04:00
VikParuchuri
4a997842c7
Merge pull request #2 from edx/fix/vik/single-step-oe
...
Fix js that prevented single step OE problems (ie only self assessment) ...
2013-05-31 12:10:45 -07:00
Jay Zoldak
cd82bd054d
Merge pull request #20 from edx/zoldak/distribute-version
...
require distribute >= because there is an old branch out there that messes up the build server
2013-05-31 12:09:17 -07:00
JonahStanley
3308bb4be7
Fixed pull request comments and refactored the duplicate code
2013-05-31 14:53:29 -04:00
Ned Batchelder
98673f8e6a
Somehow, when I moved symmath, I left behind its test files!?
2013-05-31 14:39:23 -04:00
VikParuchuri
1c0bcf476a
Merge pull request #3 from edx/fix/vik/speed-up-oe-test
...
Fix/vik/speed up oe test
2013-05-31 11:05:35 -07:00
Peter Baratta
343d9019e0
Merge pull request #15 from edx/pbaratta/fix/trailing-period
...
Add test and functionality for trailing period in [Numerical/Formula]Response
2013-05-31 10:20:46 -07:00
Vik Paruchuri
badd3a8d13
Properly stub out the controller_qs variable in the tested module. Test times out without this.
2013-05-31 13:14:19 -04:00
Vik Paruchuri
9281a80089
Fix js that prevented single step OE problems (ie only self assessment) from working
2013-05-31 13:08:41 -04:00
marco
290d049c29
Merge branch 'feature/christina/metadata-ui' of https://github.com/edx/edx-platform into feature/christina/metadata-ui
2013-05-31 12:41:13 -04:00
marco
72e1fab1c4
SASS variable and naming standards sync-up based on @talbs feedback completed
2013-05-31 12:40:40 -04:00
Peter Baratta
ff3997e72e
Add test to verify a single period is not accepted as input
2013-05-31 12:37:14 -04:00
Ned Batchelder
1bedc2e4bd
Change the file paths to be less specific.
2013-05-31 12:23:58 -04:00
Ned Batchelder
35a1dc123a
Wrap the lines so I can read the text.
2013-05-31 12:23:16 -04:00
Ned Batchelder
9314154ec1
Move loncapa grading helpers into the sandbox-packages directory.
2013-05-31 12:01:33 -04:00
cahrens
ab5834fb41
Pylint cleanup.
2013-05-31 11:26:19 -04:00
Jay Zoldak
a5ee903ef5
Pin capa to require distribute greater than 28 because an old branch had it at 30
2013-05-31 11:24:49 -04:00
e0d
2e84540af0
removing the request debugger entirely.
2013-05-31 11:15:28 -04:00
Peter Baratta
087834337a
Pep8 newline
2013-05-31 11:05:21 -04:00
Peter Baratta
80a27f9391
Add test and functionality for trailing period
2013-05-31 10:41:08 -04:00
cahrens
e6dfa8e81c
Merge branch 'master' into feature/christina/metadata-ui
2013-05-31 09:46:17 -04:00
marcotuts
46967a78dc
Merge pull request #6 from edx/release
...
Release 2013-05-29, with Hotfix 2013-05-30 back into master
2013-05-30 16:34:22 -07:00
David Baumgold
bdc9570cd1
Removed Symbolset font files
2013-05-30 16:09:17 -04:00
Peter Baratta
e17f9f6c37
Merge pull request #2108 from edx/pbaratta/calc-tests
...
Add some testing to calc.py prior to changes
2013-05-30 12:54:52 -07:00
cahrens
46cf5e3338
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
2013-05-30 14:13:14 -04:00
cahrens
8fd15ce45d
Review feedback.
2013-05-30 14:13:10 -04:00
Jay Zoldak
86afe7279b
Refactor user factory usage for lettuce tests. Fix merge conflict.
2013-05-30 13:48:07 -04:00
Jay Zoldak
a1b62912f3
Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui
2013-05-30 12:33:15 -04:00
Jay Zoldak
4a64c0c9b6
Merge in from origin/feature/christina/metadata-ui
2013-05-30 12:33:02 -04:00
cahrens
14eb9c9a3b
Merge branch 'master' into feature/christina/metadata-ui
2013-05-30 12:27:03 -04:00
Jay Zoldak
6627ca5635
Tidy up the new lettuce tests for metadata editing a bit.
2013-05-30 12:26:18 -04:00
Diana Huang
5118b06ef2
Merge pull request #2147 from edx/diana/fix-error-descriptor
...
Fix XML Error Module so that it no longer shows the data to non-staff.
2013-05-30 08:52:41 -07:00
Peter Fogg
6eeb12ad1c
Add Lettuce tests for autoplay in Studio.
2013-05-30 11:34:15 -04:00
chrisndodge
5eaa6aea23
Merge pull request #2140 from edx/fix/cdodge/add-randomize-to-list-of-collections
...
add the new category which can act as a category
2013-05-30 06:20:21 -07:00
cahrens
b2fe7f5c01
Update documentation (per Toddi).
2013-05-29 17:19:33 -04:00
Peter Fogg
5465bda5f3
Use MITX_FEATURES to tell if we're in the CMS; this is much cleaner. Also use $.data instead of a hidden div.
2013-05-29 17:00:25 -04:00
cahrens
f0260757c5
Cleanup.
2013-05-29 16:50:22 -04:00
Diana Huang
910324fb49
Fix XML Error Module so that it no longer shows the data to non-staff.
2013-05-29 16:31:11 -04:00
