Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,819 Commits 1 Branch 0 Tags
e2bfcf2a36fb56fcbcd1f099aeef3debc19c9952
Commit Graph

287 Commits

Author SHA1 Message Date
Stephen Sanchez
c9f707f49d Release for Apr 27, 2014 2014-04-27 16:21:33 -04:00
John Cox
ce0b640712 Add third-party auth implementation and tests 2014-04-25 12:11:20 -07:00
David Baumgold
7c89055089 Merge pull request #3404 from edx/watchdog-in-paver-reqs 
Added watchdog to Paver requirements
 2014-04-22 14:39:27 -04:00
Stephen Sanchez
575c92c8c3 Release for Apr 22, 2014 2014-04-22 13:02:04 -04:00
Stephen Sanchez
cd412448bb Release for Apr 22, 2014 2014-04-22 11:17:54 -04:00
Dave St.Germain
5bd944a3a6 Update codejail to enable logging 2014-04-22 09:46:48 -04:00
Jay Zoldak
a78b3225bb Merge pull request #3387 from edx/zoldak/update_page_objects 
Update bok-choy page definitions
 2014-04-18 16:07:04 -04:00
David Baumgold
fdcafa9427 Added watchdog to Paver requirements 2014-04-18 15:38:26 -04:00
Jay Zoldak
5e1964dd87 Update bok-choy page definitions 2014-04-18 09:35:10 -04:00
Will Daly
0b40354c12 Reset submission API scores in beta and legacy instructor dash 2014-04-16 09:25:53 -04:00
Stephen Sanchez
d0635b852d Release Apr 14, 2014 2014-04-14 13:17:55 -04:00
Adam
69f11c7d53 Merge pull request #3322 from edx/release 
Release
 2014-04-11 14:40:44 -04:00
Chris Rossi
f04cd649e4 Upgrade JSDraw. 2014-04-10 12:01:02 -04:00
Stephen Sanchez
3f184082f5 Updating ORA2 requirements for patch fix 2014-04-08 09:29:09 -04:00
Stephen Sanchez
af17ae9f6a Updating the release with a tagged hash 2014-04-07 11:38:21 -04:00
Stephen Sanchez
6c43f279d4 Updating the ORA2 hash for release week 2014-04-07 2014-04-07 09:57:55 -04:00
David Baumgold
6292e55997 Merge pull request #3204 from edx/db/upgrade-django-nose 
Upgrade django_nose to 1.2
 2014-04-04 10:43:37 -04:00
David Baumgold
63c58bb26d Merge pull request #3189 from edx/db/upgrade-pyparsing 
Upgrade pyparsing to 2.0.1
 2014-04-03 13:02:54 -04:00
David Baumgold
176392225f Upgrade django_nose to 1.2 2014-04-03 10:48:52 -04:00
David Baumgold
cb5e3c8111 Upgrade pyparsing to 2.0.1 2014-04-02 16:09:53 -04:00
Stephen Sanchez
e6e818a5a2 Updating the hash of the ORA2 release candidate in the requirements 2014-04-02 16:05:54 -04:00
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