Commit Graph

3684 Commits

Author SHA1 Message Date
Andy Armstrong
bc12869a00 Add more tests for the container page 2014-03-05 17:41:10 -05:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing
Also fixes STUD-1351
2014-03-05 13:46:03 -05:00
Victor Shnayder
281ad63d2b split testing support in the LMS.
Adds a split_test_module XModule, that can choose one of its children
to display, based on a get_condition_for_user API added to the runtime.

To test, add something like this to an xml course, or make equivalent
 tweaks in mongo.

 <vertical url_name="split_test_vert">
    <split_test url_name="split1" experiment_id="0" condition_id_to_child='{"0": "i4x://MITx/6.00x/html/split_test_cond0", "1": "i4x://MITx/6.00x/html/split_test_cond1"}'>
       <html url_name="split_test_cond0">condition 0</html>
       <html url_name="split_test_cond1">condition 1</html>
    </split_test>
  </vertical>

Also needs an experiment configured in the course policy json: e.g.

        "user_partitions": [{"id": 0,
                                      "name": "Experiment 0",
                                      "description": "Unicorns?",
                                      "version": 1,
                                      "groups": [{"id": 0,
                                                        "name": "group 0",
                                                        "version": 1},
                                                        {"id": 1,
                                                        "name": "group 1",
                                                        "version": 1}]}]

(This particular snippet will work inside a course with org MITx
 and course name 6.00x)

Co-Author: Sarina Canelake <sarina@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Diana Huang <diana@edx.org>
Co-Author: Calen Pennington <cale@edx.org>

[LMS-2095]
2014-03-05 13:45:08 -05:00
Xavier Antoviaque
3856257e80 xblock-mentoring: Add repository to requirements & installed apps
Adding to installed Django applications is required due to the use
of a Django model by the XBlock
2014-03-05 12:19:24 -04:00
John Jarvis
955950164a updating commit 2014-03-05 10:21:46 -05:00
John Jarvis
04ff0b4fe2 updating commit 2014-03-04 09:04:51 -05:00
Adam
f400f1a6a3 Merge pull request #2773 from edx/release
Release
2014-02-28 16:03:11 -05:00
Adam Palay
db90cd7985 update js_draw req 2014-02-28 13:53:29 -05:00
Dave St.Germain
7126a2283d Update django-wiki revision 2014-02-28 13:18:19 -05:00
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release'
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
2014-02-27 17:33:40 -05:00
Will Daly
fbd2e3a0bc Merge pull request #2724 from edx/will/studio-xblock-save
Native XBlock Studio Save UI
2014-02-27 10:50:51 -05:00
Sarina Canelake
e71bbeb1e2 Tests for embargo middleware feature 2014-02-27 09:33:17 -05:00
Julia Hansbrough
a7ae152d9b Embargo Middleware feature
Adds configurable middleware in common/djangoapps/embargo that
allows specific courses to comply with US Export regulations by
embargoing students from specific countries, whilst simultaneously
allowing other courses to be freely open to all.
2014-02-27 08:37:58 -05:00
Will Daly
5f09953125 Hide save/cancel buttons for native XBlocks in Studio
Add Studio client-side runtime notifications for saving/cancelling XBlock edits.
2014-02-26 16:17:02 -05:00
Xavier Antoviaque
73ef78f8ae splash-url-exclusion: Exclude '/heartbeat' from redirect
Update the dependency to load this commit:
6e8bd68521

Which allows to prevent `/heartbeat` from being redirected, which is
necessary on production servers
2014-02-25 18:06:54 -05:00
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test
Add tests of local_resource_url
2014-02-25 16:46:10 -05:00
Calen Pennington
c72d410083 Remove doc-ready tests, which were flaky 2014-02-25 14:01:37 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
John Jarvis
dfb47ddf4c adding edx-private requirements file to add jsdraw 2014-02-24 14:06:08 -05:00
Will Daly
812e71bbbb Revert "Fix sys.path manipulation in pavement.py, with detailed comment"
This reverts commit 544616be4b.
2014-02-24 11:30:40 -05:00
Will Daly
38d403f6c9 Merge pull request #2615 from edx/will/paver-attempt-2
Paver (Part 1) -- Attempt 2
2014-02-24 07:51:05 -05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
2014-02-21 15:01:20 -05:00
zubiar-arbi
6892bc73b2 get courses by reversing django groups for non global users (studio dashboard)
STUD-1133
2014-02-20 20:23:12 +05:00
David Baumgold
549fbe4815 Rollback Django Debug Toolbar from 1.0.1 to 0.9.4
Due to issues with require.js and the latest version of the toolbar.
Also included a note in the requirements file explaining the situation, and what
needs to happen before this can be upgrade properly.
2014-02-19 11:41:12 -05:00
Ned Batchelder
cad2d43939 Refer to the corresponding change in XBlock. 2014-02-18 17:35:56 -05:00
Will Daly
544616be4b Fix sys.path manipulation in pavement.py, with detailed comment
Restore reverted changes from paver part 1
2014-02-18 15:09:07 -05:00
David Baumgold
1e826996c7 Merge pull request #2391 from edx/yarko/debug-toolbar-v2
fix partial work done for changes in django-debug-toolbar-1.0.1
2014-02-18 12:56:28 -05:00
Will Daly
c85c4b22ed Revert "Replace rake functions with python paver functions"
This reverts commit df2e410f2a.
2014-02-14 14:25:28 -05:00
David Glance
df2e410f2a Replace rake functions with python paver functions
Deprecated rake functions issue a warning and then call paver
replacements

Bring Paver commands up to date with master for servers, assets, and docs.
Revert deprecation of quality, tests, and i18n for a future pull request.
Deprecate workspace migration
2014-02-14 11:25:55 -05:00
Calen Pennington
6125d97301 Add acceptance tests using the AcidBlock for LMS and Studio
[LMS-1645]
[LMS-2062]
[LMS-2063]
[LMS-2064]
2014-02-13 13:22:10 -05:00
Xavier Antoviaque
e6f4f4f4f8 splash-screen: Add ability to redirect to a splash screen URL
Checks for the presence of a cookie with specific values when activated,
and redirect the user to a configurable URL when it is not found, or not
with an accepted value.

To be used to display a splash screen to users upon the first visit.
It's the responsability of the splash page at the redirected URL to set
the proper cookie value before sending users back to the LMS.
2014-02-11 14:26:19 -05:00
David Baumgold
50291b81f6 update version for django debug toolbar 2014-02-10 15:39:04 -05:00
Ned Batchelder
35c28e55b1 Use the latest django-wiki revision. 2014-02-10 15:23:13 -05:00
Calen Pennington
b0bed170de Enable (and test) xml export of pure XBlocks
[LMS-179]
[LMS-209]
[LMS-1345]
2014-02-05 13:02:40 -05:00
Will Daly
eae4adeb9b Merge pull request #2361 from edx/will/bok-choy-upgrade-and-lms-tests
Bok-choy upgrade, LMS tests, cleanup
2014-02-03 08:11:03 -08:00
Will Daly
89c029d281 Pinned version of sure library 2014-02-02 18:17:45 -05:00
Will Daly
577c77f080 Added sphinx_rtd_theme to requirements 2014-02-01 14:34:24 -05:00
Will Daly
e859a37001 Fix an issue with cache being cleared for bok_choy fast test
Change text in bok_choy scripts to green
Added feedback check for AI-assessment test
Added peer assessment feedback test
Updated Studio/LMS page objects and tests to use bok-choy v0.1.0
Added LMS bok-choy tests from e2e repo
2014-01-31 14:33:24 -05:00
Calen Pennington
ce19f2887c Merge pull request #2294 from cpennington/language-dark-launch
Add the ability to dark-launch languages
2014-01-29 10:52:06 -08:00
jorr-at-google
87aa71c450 Merge pull request #2309 from edx/jorr/feature/use-xblock-publish-api
Use the publish() api from xblock.runtime.Runtime
2014-01-29 09:25:33 -08:00
Calen Pennington
d379b35fa9 Add config_model, a library for database backed configuration
ConfigurationModels can be managed using the admin site. They are
append-only, and track the user who is making the change, and the time
that the change was made. The configuration is stored in the database,
and cached for performance.

[LMS-1220]
2014-01-29 09:17:19 -05:00
Will Daly
382fa9be1f Pin subunit and testtools libraries to prevent test failures after release of these libraries on 1/29/14 2014-01-29 08:08:40 -05:00
jorr
58c76afa9e Use the publish() api from xblock.runtime.Runtime 2014-01-28 14:16:34 -08:00
David Baumgold
78963565b8 Moved brew-formulas.txt to Brewfile
http://robots.thoughtbot.com/brewfile-a-gemfile-but-for-homebrew
2014-01-27 10:51:31 -05:00
Calen Pennington
cb77826a4d Merge pull request #2257 from cpennington/test-compiled-translations
Add tests of compiled translated strings, so that we can check them into the repo safely.
2014-01-23 07:22:24 -08:00
Calen Pennington
efa2cafa07 Upgrade the transifex client 2014-01-22 14:51:35 -05:00
Ned Batchelder
a2145c059e Add a setup.py so we can import top-level directories. 2014-01-22 12:33:45 -05:00
Greg Price
7515decebd Upgrade mako
This is necessary to pick up a bug fix for extraction of translator
comments.
2014-01-21 15:28:39 -05:00
Adam Palay
981a7f9479 Revert django-debug-toolbar related updates on master, set version to 0.9.4
(STUD-1201)

Revert "Specific django-toolbar version (stable released) and update the panels in dev envs"

This reverts commit a465b082da.

Revert "Updated settings for devstack django debug toolbar"

This reverts commit 30199e8a61.
2014-01-17 14:17:38 -05:00
Cristian Salamea
a465b082da Specific django-toolbar version (stable released) and update the panels in dev envs 2014-01-16 14:11:17 -05:00