Commit Graph

491 Commits

Author SHA1 Message Date
Awais Jibran
adfca9d480 TNL-2223 Inline discussion jumps to the bottom of the page when thread is expanded. 2015-05-25 18:31:17 +05:00
Christina Roberts
cff565060b Merge pull request #8052 from edx/christina/tag-events
Update student notes eventing for tags.
2015-05-19 13:55:57 -04:00
cahrens
0c7af25c79 Update student notes eventing for tags.
TNL-2172
2015-05-19 13:14:10 -04:00
Ben Patterson
6d38de1e5a Merge pull request #8098 from edx/benp/flaky-annotation
Skip test. TNL-1590
2015-05-19 12:34:13 -04:00
Ben Patterson
51ac5f7128 Skip test. TNL-1590
Even when using the flaky decorator, it is not reliable.
2015-05-18 17:02:18 -04:00
Sarina Canelake
1775dd5365 Merge pull request #7315 from edx/db/creative-commons
Allow custom licensing for course content
2015-05-18 15:36:50 -04:00
Sarina Canelake
ca64c665cc Default course license to All Rights Reserved
Clicking on conflicting option box unchecks all conflicts
LMS: Clicking license text should bring to new window
updated styles to reflect html reuse inside of xblock edit modal area.

Add ARIA attributes to license for a11y

Gracefully handle re-selecting of selected license
2015-05-18 14:37:32 -04:00
David Baumgold
a3887e951c Courseware license (Creative Commons): FED
Use native checkboxes for courseware license options
In Studio settings editor for video module, don't show license if feature-flagged off
Don't let Scope.contents fields leak to Studio editor
JS gettext() must all be on the same line for i18n
Add docstrings for bok-choy tests
Remove LicenseMixin from HTMLDescriptor
Responding to UX review feedback
Add aria-pressed attribute
Use https links instead of protocol-relative links for links to creativecommons.org
Remove license from course outline page in Studio
2015-05-18 14:36:04 -04:00
David Baumgold
ca2fee1259 Move LicenseMixin into VideoFields class 2015-05-18 14:35:07 -04:00
David Baumgold
2159d34128 Added a simple XBlockMixin for courseware licenses
This allows course authors to choose between two difference licenses for their
course content: All Rights Reserved, or Creative Commons. In the backend, XBlocks
that wish to allow custom licenses need only inherit from LicenseMixin, which
adds a `license` field as a string.

License information is displayed in the Studio editor view, and just below the
rendered XBlock in the LMS. In addition, if the course block itself has a custom
license set, this license will display just below the main body of the page
on courseware pages.

This entire feature is gated behind the LICENSING feature flag.
2015-05-18 14:34:28 -04:00
Ben Patterson
41e84a58dd Skip flaky test. SOL-618. 2015-05-18 14:11:20 -04:00
Martyn James
20a32a7e4f Merge pull request #8043 from edx/dcikatic/SOL-487-filter-staff-view-rebase
Dcikatic/sol 487 filter staff view (rebase against master)
2015-05-18 10:40:57 -04:00
Ned Batchelder
e97b94bde2 Merge pull request #8060 from edx/ned/add-supers
Add super() calls to setUp/tearDown that are missing them
2015-05-15 12:29:14 -04:00
muzaffaryousaf
cae5623fd9 Updating the django-countries version to support sorting.
Adding the pyuca to support sorting in differnet languages.

TNL-2047
2015-05-15 17:07:14 +05:00
Ned Batchelder
78e9445aa1 Add super() calls to setUp/tearDown that are missing them
Also, I replaced a number of tearDown methods with addCleanup instead.
And also remove some unneeded patch.stopall() calls.
2015-05-14 18:14:21 -04:00
Sarina Canelake
25eb6942b6 Merge pull request #8051 from edx/sarina/add-flaky-TNL-2199
Add flaky test decorator (TNL-2199)
2015-05-14 15:26:43 -04:00
Davorin Sego
a455d9d50a SOL-495 Cohort-Aware content search 2015-05-14 14:07:42 -04:00
Christina Roberts
3f2c370d58 Merge pull request #7923 from edx/christina/show-notes
Tags Tab in Student Notes
2015-05-14 12:30:38 -04:00
Sarina Canelake
f3f0f08422 Add flaky test decorator (TNL-2199) 2015-05-14 12:10:42 -04:00
cahrens
abd25b8b45 Add a "tags" view in student notes.
TNL-1926
2015-05-14 11:36:48 -04:00
Diana Huang
362c632ad7 Catch BSON errors as well as PyMongo errors when emitting
MongoDB events.

TNL-2035
2015-05-13 12:21:53 -04:00
Daniel Friedman
3acd7a008c Refactor and add tests for new grade report.
* Handle grading errors
2015-05-13 06:58:02 -04:00
Daniel Friedman
84f3c33df7 Address doc review 2015-05-12 16:32:01 -04:00
Andy Armstrong
2fafaec053 Implement grade report analytics
TNL-1988
2015-05-12 16:32:01 -04:00
Ben Patterson
31e56e77ae Make edxnotes bok-choy tests chrome-friendly.
This eliminates some flakiness related to the loading of the notes page. It also
sets the 'no content' version of that page as a separate page object so testing
that case is more explicit.

TE-849
2015-05-11 15:02:00 -04:00
Adam
58b34e1cc4 Merge pull request #7974 from edx/merge-release-to-master
Merge release to master
2015-05-08 14:24:14 -04:00
Adam Palay
8243d934e4 Merge remote-tracking branch 'origin/release' into merge-release-to-master
Conflicts:
	common/test/acceptance/tests/video/test_video_times.py
2015-05-08 10:23:04 -04:00
Ben Patterson
609feaae71 Ensure cohort management section has loaded.
TNL-2120, TE-849

The parent .cohort-management class was loading faster than its children (which makes sense). However,
flakiness existed on these tests because browser actions were depending on child elements that had not
painted yet.

Tested this using chrome with no X11 forwarding for extra speed. That exposed the ajax call
as well as the sub-class rendering issues.
2015-05-08 09:04:42 -04:00
Adam Palay
2842029a7f skip failing test 2015-05-07 14:34:44 -04:00
Gabe Mulley
411df0ae3a Merge pull request #7802 from edx/gabe/user-track
Make user_track use eventtracking
2015-05-07 08:43:21 -04:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
Ben Patterson
c049684dfd Merge pull request #7939 from edx/benp/tnl-1619-flaky
Mark test as flaky. TNL-1619
2015-05-06 10:27:34 -04:00
Ben Patterson
eacf25673a Mark test as flaky. TNL-1619 2015-05-05 19:37:55 -04:00
Christina Roberts
7c7b0dd7c2 Merge pull request #7915 from edx/christina/flaky-search
Label flaky test test_reindex.
2015-05-05 12:46:18 -04:00
Ben Patterson
7d9ac7da80 Merge pull request #7917 from edx/benp/pdf-tabs-skip
Setting this test to skip. TNL-2083.
2015-05-05 10:53:16 -04:00
Ned Batchelder
4cba033bbc Merge pull request #7854 from edx/ned/te-855
Run pylint on all our code, and only our code. TE-855
2015-05-05 10:37:48 -04:00
E. Kolpakov
fab123829d Added flaky decorator to potentally flaky test test_cohort_course_wide_discussion_topic 2015-05-05 12:52:24 +03:00
Christina Roberts
31a19c0f63 Merge pull request #7823 from edx/christina/notes-tagging
Add tags plugin.
2015-05-04 20:56:52 -04:00
Ben Patterson
8d81398e92 Setting this test to skip. TNL-2083. 2015-05-04 20:34:59 -04:00
cahrens
353caea766 Label flaky test test_reindex.
SOL-835
2015-05-04 17:03:39 -04:00
cahrens
5fe384ca2b Add tags plugin.
TNL-1924
2015-05-04 16:00:18 -04:00
Ned Batchelder
24e0c2c80f Run pylint on all our code, and only our code. TE-855
With the old logic, we weren't running pylint on openedx at all.  We
were also running it on lms/lib/comment_client twice, and on the
installed xblock third-party library.
2015-05-04 15:23:55 -04:00
Ben Patterson
fad6ad77df Merge pull request #7899 from edx/benp/annotation-flaky
Flag test as flaky.
2015-05-04 09:38:09 -04:00
Ben Patterson
0847f8c24e Flag test as flaky. 2015-05-04 07:00:57 -04:00
Awais Jibran
e9f26a99a8 Merge pull request #7829 from edx/aj/tnl1530-discussion-section-jump-to-bottom
Switching between discussion threads take focus to bottom of the page.
2015-05-04 12:03:51 +05:00
Ben Patterson
8cd5f42ca9 Merge pull request #7850 from edx/benp/bok-choy-shard-5
Add bok-choy shards 4 and 5. New default is 'shard 6'
2015-05-01 09:26:32 -04:00
Ben Patterson
5f0cd587fd Add bok-choy shards 4 and 5. When no shard is specified on a test, it
will fall in 'shard 6'
2015-04-30 17:34:24 -04:00
Adam
af3519ce15 Merge pull request #7835 from edx/release
Release (DO NOT MERGE)
2015-04-30 16:24:47 -04:00
Awais Jibran
6e6aa036e7 Switching between discussion threads take focus to bottom of the page.
TNL-1530
2015-04-29 20:28:52 +05:00
Ben Patterson
c2fd2739b8 Flag test as flaky. TNL-2083. 2015-04-27 16:55:01 -04:00