Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3583 Commits

Author SHA1 Message Date
Calen Pennington
7d8088d26b Add memcache as a requirement for running paver, because it's imported in pavelib/utils/envs.py 2014-08-27 16:29:47 -04:00
Don Mitchell
a0e697235d Merge pull request #4966 from edx/split/html_id 
Update opaque-keys library to use block_id for html_id for new keys.
 2014-08-25 18:06:02 -04:00
Nimisha Asthagiri
e42a3f15db Update opaque-keys library to use block_id for html_id for new keys. 
Catch more places where get_children was giving us version aware references.
LMS-11237
 2014-08-25 17:41:57 -04:00
Jesse Zoldak
b90e947b8d Revert "Update opaque-keys library to use block_id for html_id for new keys." 2014-08-25 17:11:39 -04:00
Piotr Mitros
b166503749 Merge pull request #4889 from edx/danielli/pyfs 
Adds pyfilesystem service from XBlocks to edx-platform
 2014-08-25 16:37:46 -04:00
Nimisha Asthagiri
f7efb50ffb Update opaque-keys library to use block_id for html_id for new keys. 
Catch more places where get_children was giving us version aware references.
LMS-11237
 2014-08-25 14:21:49 -04:00
swdanielli
504a7a21ba add pyfs service 2014-08-25 12:25:03 -04:00
Piotr Mitros
d0ac4c375e Update to latest XBlock 2014-08-25 10:24:55 -04:00
Ben McMorran
30fc0441d1 Merge pull request #4782 from edx/reruns/ui 
Reruns/ui
 2014-08-21 16:57:00 -04:00
Jesse Zoldak
337a75598f Update bok-choy version 2014-08-21 12:16:42 -04:00
Ben McMorran
46932ee0f9 Replace data-test-course and data-test-unsucceeded with data-course-key 2014-08-21 12:11:26 -04:00
Don Mitchell
0d1669c612 DateTime fields can support datetime values. 
LMS-11209
 2014-08-21 12:11:26 -04:00
Justin Helbert
dd7f09d36a This confirms the data api upgrade 2014-08-19 19:03:58 +00:00
Sarina Canelake
5f14959231 Merge pull request #4846 from edx/db/update-i18n-tools 
Update i18n-tools
 2014-08-15 11:02:11 -04:00
Calen Pennington
d54b347c86 Merge pull request #4755 from FiloSottile/mentoring_studio 
Update the reference to gsehub/xblock-mentoring#4
 2014-08-15 08:50:11 -04:00
David Baumgold
79f3526c6f Update i18n-tools 2014-08-14 17:05:10 -04:00
Matjaz Gregoric
16a2940977 Update django-splash. 
The new release supports wildcards in path exclusion rules.
 2014-08-14 19:03:41 +02:00
Sarina Canelake
6dd9d9ec3f Merge pull request #4586 from jazkarta/edx-jsme-1.0 
Release edx-jsme 1.0
 2014-08-14 10:02:55 -04:00
Filippo Valsorda
422a6e20db Update the reference to gsehub/xblock-mentoring#4 and gsehub/xblock-mentoring#5 
Port the Studio editor and remove the dataexport functionality
Use the enforce_type feature to parse the bools
 2014-08-13 09:25:09 +02:00
Calen Pennington
25963797c6 Merge pull request #3227 from FiloSottile/enforce_type 
Enforce type of the XBlocks Fields when set
 2014-08-11 16:13:53 -04:00
Chris Rossi
88af00904f Release edx-jsme 1.0 2014-08-11 09:04:27 -04:00
Feanil Patel
2a9c9ee7c8 Merge pull request #3894 from mtyaka/patch-3 
Update xblock-mentoring.
 2014-08-08 16:23:22 -04:00
Filippo Valsorda
6378c01a47 enforce-type: set the edx/XBlock#200 merge hash 2014-08-08 09:14:10 -07:00
Filippo Valsorda
a9930bf34a Make enforce_type an optional flag, to avoid conflicts 2014-08-08 09:14:10 -07:00
Filippo Valsorda
0482038756 Enforce type of the XBlocks Fields when set 
This updates the XBlock dependency to edX/XBlock@***
and add the newly introduced enforce_type methods
 2014-08-08 09:14:10 -07:00
Will Daly
6d263fe445 Merge pull request #4752 from edx/will/ora2-release-2014-08-08T13.47 
ORA2 release-2014-08-08T13.47
 2014-08-08 10:23:11 -04:00
clytwynec
8c8d388d1a Merge pull request #4744 from edx/clytwynec/remove_flaky_decorator_from_tests 
removing "flaky" plugin, since it is not reporting failures properly
 2014-08-08 10:15:03 -04:00
Will Daly
949c965648 ORA2 release-2014-08-08T13.47 2014-08-08 09:48:26 -04:00
Will Daly
228aa77150 ORA2 release-2014-08-07T20.03 2014-08-07 19:56:57 -04:00
Christine Lytwynec
0243d0afa1 removing "flaky" plugin, since it is not reporting failures properly 2014-08-07 16:48:31 -04:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00
Daniel Friedman
4b6035bafb Automatically collect HAR data for performance testing 2014-08-07 12:27:38 -04:00
Will Daly
41ba395900 ORA2 hotfix 2014-08-06 2014-08-06 13:59:31 -04:00
Muhammad Ammar
c237364e2d Refactor LMS Video Tests 2014-08-06 13:20:39 +00:00
Stephen Sanchez
062e723e8a Updating ORA2 hash for hotfix August 5th, 2014 2014-08-05 17:41:09 -04:00
Renzo Lucioni
3599e2eec7 Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"" 
This reverts commit 079808ee47.
 2014-07-30 17:01:52 -04:00
Julia Hansbrough
079808ee47 Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul" 
This reverts commit 252038c376, reversing
changes made to 7caf8c53b1.
 2014-07-29 17:41:46 +00:00
Will Daly
144b2578ab Merge pull request #4579 from edx/will/ora2-release-2014-07-28T12.09 
ORA2 release-2014-07-28T12.09
 2014-07-28 13:03:43 -04:00
Renzo Lucioni
252038c376 Merge pull request #4545 from edx/renzo/bi-analytics-overhaul 
Overhaul Segment.io integration
 2014-07-28 11:59:58 -04:00
Will Daly
5dc884bdb9 ORA2 release-2014-07-28T12.09 2014-07-28 11:56:35 -04:00
Renzo Lucioni
8bd84b5f3a Overhaul Segment.io integration 2014-07-28 11:08:02 -04:00
Calen Pennington
f6b278e7f8 Merge pull request #4537 from cpennington/new-locator-key-prefixes 
Use a version of opaque keys that identifies version numbers in the key prefixes
 2014-07-24 15:55:33 -04:00
Calen Pennington
3f47fe4a61 Use a version of opaque keys that identifies version numbers in the key prefixes 2014-07-24 09:32:06 -04:00
Jay Zoldak
c21dbe4cd2 Improvements to clicking and synchronization in Studio bok-choy tests. 2014-07-24 08:55:34 -04:00
Matjaz Gregoric
2b2dd942c7 Update xblock-mentoring. 
Update reference to the xblock-mentoring repository.

A bug where answers containing the string "??" would get mangled by jQuery has been fixed in xblock-mentoring.
 2014-07-22 08:14:29 +02:00
Stephen Sanchez
77d3c3fdb8 Updating the ORA2 hash for July 21st, 2014 2014-07-21 08:24:33 -04:00
swdanielli
3f1e9993f5 recommender prototype 2014-07-17 11:21:01 -04:00
Sarina Canelake
88a3bac947 Update opaque-keys library 2014-07-14 13:04:13 -04:00
Stephen Sanchez
a41d04e65b Updating release tag for July 14th, 2014 2014-07-14 10:23:14 -04:00
Diana Huang
ad7e0f94fb Update opaque-keys hash 2014-07-11 15:40:09 -04:00