Renzo Lucioni 5bb0e90878 Merge pull request #12156 from edx/renzo/merge-release-into-master ...

Manually merge release into master

2016-04-15 00:47:54 -04:00

..

data

fixup! Remove ORA1 common/ acceptance tests

2015-12-11 15:07:07 -05:00

discussion

TNL-3818: fixed recent activity mapping in thread-list sort for Forums Web

2016-04-13 17:47:31 +05:00

lms

Manually merge release into master

2016-04-14 14:23:06 -04:00

studio

FEDX-88. Marking bok-choy test as flaky.

2016-04-10 09:28:07 -04:00

video

Video player: adding Dragabilly to closed captions

2016-04-14 15:29:38 -04:00

xblock

removed incorrect check

2016-03-26 18:02:33 -04:00

__init__.py

Quiet stevedore.extension logging in bok-choy tests

2014-10-01 12:14:51 -04:00

helpers.py

Enabling XSS vulnerability flag for bok choy tests

2016-03-22 10:16:27 -04:00

test_annotatable.py

Adding UXPL classnames to headings

2016-02-29 15:43:17 -05:00

test_cohorted_courseware.py

Enabling XSS vulnerability flag for bok choy tests

2016-03-22 10:16:27 -04:00