Commit Graph

266 Commits

Author SHA1 Message Date
Stephen Sanchez
1c55ce0a62 Updating ora2 requirements 2014-04-01 11:44:54 -04:00
Dave St.Germain
52ca42266c Merge pull request #3098 from edx/dcs/paver-watch-assets
Watch for asset changes.
2014-03-31 16:38:53 -04:00
Adam Palay
1a538388be Merge remote-tracking branch 'origin/release'
Conflicts:
	requirements/edx/edx-private.txt
2014-03-31 15:41:20 -04:00
Dave St.Germain
f886c9b7c5 Watch for asset changes. 2014-03-31 15:28:15 -04:00
Calen Pennington
f13d1460d2 Merge pull request #3107 from FiloSottile/optimize_dataexport
Update reference to the xblock-mentoring repo for optimized dataexport
2014-03-31 13:42:25 -04:00
Chris Rossi
587e9b5c1c Upgrade JSdraw input. 2014-03-31 12:36:36 -04:00
Filippo Valsorda
86e5c54a77 Update reference to the xblock-mentoring repo for optimized dataexport
The new ref is gsehub/xblock-mentoring@43aa320

Optimize mentoring-dataexport times by using values_list()
2014-03-29 16:01:13 +01:00
John Jarvis
e87e931681 this will allow for clientside javascript reporting 2014-03-28 14:04:19 -04:00
Gabe Mulley
d6052675da Support emitting analytical events from xblocks running in the LMS
XBlocks can and should use the "publish" method provided by the runtime to emit analytical events. In theory we could now start replacing calls to track_function with calls to publish, however, that migration is not handled by this change.

Fixes: AN-789
2014-03-27 18:50:46 -04:00
David Baumgold
2d452d8bb2 Merge pull request #3005 from singingwolfboy/db/paver
Paver v3
2014-03-26 13:41:05 -04:00
Valera Rozuvan
674345931e Removing ipython from edx dependencies.
Ipython is not strictly required to run edx-platform. It can
be setup as part of Vagrant provision scripts, or manually
by each developer as required in specific cases.
2014-03-26 12:16:14 +00:00
Piotr Mitros
20805974cd Merge 2014-03-25 12:28:02 -04:00
David Baumgold
1219bd757e Pull Paver requirements out into a separate file 2014-03-25 11:32:20 -04:00
Will Daly
44dad41ede Switch from Rake to Paver 2014-03-25 11:32:19 -04:00
Will Daly
ba00a442d7 Merge pull request #3037 from edx/will/tim-installation-rebase
Install new ORA (edx-tim)
2014-03-25 10:59:05 -04:00
Piotr Mitros
bd4eb72e31 Concept XBlock prototype 2014-03-25 10:58:35 -04:00
Will Daly
440d9ddb89 Install edx-ora2
Support for displaying submissions API scores in Progress page.
2014-03-25 09:42:55 -04:00
Dave St.Germain
93844b3ad1 Merge pull request #3025 from edx/dcs/fix-matlab-response
Fixes BLD-948 by escaping messages from xqueue, preventing malformed
2014-03-24 13:54:36 -04:00
Dave St.Germain
5cb145054d Fixes BLD-948 by escaping messages from xqueue, preventing malformed
html from getting onto the page. The client will then unescape the html
and display it.
2014-03-24 13:28:08 -04:00
Ned Batchelder
3db4f43fe4 Merge pull request #3009 from jazkarta/upgrade-jsdraw-input
Upgrade jsdraw input to latest version.
2014-03-24 10:05:08 -04:00
Jay Zoldak
806a6b9f99 Update edx-platform page objects and tests to be compatible with new bok-choy version
Change expectedFailure decorators to skip, because that still takes
a screenshot as if it were an error and at least one of those
take a super long time when running locally on devstack.
2014-03-21 17:10:15 -04:00
Chris Rossi
4ef46ef10e Upgrade jsdraw input to latest version. 2014-03-20 17:06:21 -04:00
Will Daly
1287268cb7 Update XBlock to latest version 2014-03-19 07:45:45 -04:00
Xavier Antoviaque
cabda59871 mentoring-noworkbench: Remove import of workbench module (moved to SDK) 2014-03-18 14:41:39 -04:00
Xavier Antoviaque
fd830f22c5 mentoring data export: Only export answers from the current course 2014-03-12 12:50:38 -04:00
Han Su Kim
2eaddefb3d Merge pull request #2866 from edx/release
Release Hotfix-03-06-2014
2014-03-07 15:15:57 -05:00
Han Su Kim
f42d42d1f8 Merge branch 'master' into release
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
2014-03-07 14:39:09 -05:00
Ned Batchelder
13c076e628 Merge pull request #2736 from johncox-google/johncox/feature/auth
Add auth module
2014-03-07 14:28:41 -05:00
Han Su Kim
ae562f5e5b typo error in this file causing it to fail to install 2014-03-07 12:25:07 -05:00
Andy Armstrong
2c9585ea5d Merge pull request #2811 from edx/andya/container-unit-tests
Add more tests for the container page
2014-03-07 11:31:41 -05:00
John Cox
8ecfa8679a Add common/djangoapps/third_party_auth; update pylintrc to allow test_* names.
third_party_auth contains a working settings mechanism, the start of the provider interface + 3 implementations (Google, Mozilla Persona, LinkedIn), and a stub for the auth pipeline. Modified existing lms settings files to use but deactivate the module.
2014-03-06 17:20:58 -08:00
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
2014-03-06 16:56:16 -05:00
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