Commit Graph

393 Commits

Author SHA1 Message Date
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
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
Andy Armstrong
358aa7754b Add "Teams Configuration" advanced setting 2015-05-15 14:13:41 -04:00
Davorin Sego
a455d9d50a SOL-495 Cohort-Aware content search 2015-05-14 14:07:42 -04:00
cahrens
abd25b8b45 Add a "tags" view in student notes.
TNL-1926
2015-05-14 11:36:48 -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
07c5bbd96d Look for a consistent css class.
The former class, while less-flaky, does not always appear. (For example, if cohorts
are being toggled off.) This css class always appears. Initial findings point to
flakiness being a non-issue if we look for this class.
2015-05-12 13:38:05 -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
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
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
Muzaffar yousaf
0ca9f9667a Merge pull request #7810 from edx/muzaffar/tnl1261-studio-prview
Enable unit preview by default.
2015-05-06 21:06:49 +05:00
Ben Patterson
259092696e Merge pull request #7931 from edx/benp/chrome-add-user-to-team
Bok-choy on chrome: fix sequence for adding user to team.
2015-05-06 11:58:08 -04:00
Ben Patterson
02800dcd12 Bok-choy on chrome: fix sequence for adding user to team.
TE-849

This passes fine in firefox; however in chrome, the click is occurring before
the page is ready; and then the click itself is not specific enough. Also
refactored the add button method so it more-clearly returns the expected
end-state.
2015-05-06 11:56:48 -04:00
Ben Patterson
0a9ef9c422 Merge pull request #7935 from edx/benp/chromefix-csv-upload-wait
On faster browsers, we need to wait for the toggle option to appear.
2015-05-06 10:10:18 -04:00
muzaffaryousaf
f5de0bbf43 Enable unit preview by default.
TNL-1261
2015-05-06 12:40:44 +05:00
Ben Patterson
314accdf4d On faster browsers, we need to wait for the toggle option to appear.
TE-849
2015-05-05 17:25:20 -04:00
Ben Patterson
0cd749f6fc Merge pull request #7920 from edx/benp/fix-cohort-wait-chrome
Add wait for upload form.
2015-05-05 15:21:46 -04:00
Ben Patterson
6a0787de61 Add wait for upload form.
This is necessary for automation using chrome. TE-849
2015-05-05 09:04:39 -04:00
Christina Roberts
31a19c0f63 Merge pull request #7823 from edx/christina/notes-tagging
Add tags plugin.
2015-05-04 20:56:52 -04:00
cahrens
64047478d3 edxnotes is now enabled in bok choy configuration 2015-05-04 16:00:23 -04:00
cahrens
5fe384ca2b Add tags plugin.
TNL-1924
2015-05-04 16:00:18 -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
Jim Abramson
70d837ab62 Merge pull request #7777 from edx/jsa/baskets
use commerce api v2.
2015-04-27 22:30:37 -04:00
jsa
efde11d552 Use ecommerce api v2.
XCOM-213 XCOM-214
2015-04-27 16:57:17 -04:00
Martyn James
1eeca4d81f Merge pull request #7522 from edx/feature/dashboard-search
Feature/dashboard search
2015-04-27 09:46:35 -04:00
Davorin Sego
71feb068e3 Dashboard search feature 2015-04-24 09:45:12 -04:00
Waqas Khalid
97e6091bd7 Tab number in url doesn't take to correct tab
When there is multiple units in a particular subsection
then there will be tabs in courseware. When url have
tab number at the end of the url the code was not
considering it and showing the wrong tab. I have changed
such that it will always check the value of position.

TNL-1844
2015-04-24 17:50:32 +05:00
Awais Jibran
0b66dc4b42 Merge pull request #7718 from edx/aj/tnl1921-forgot-password-model-not-showing
Forgot password model not visible when user clicks 'Forgot Password' link on CMS.
2015-04-23 16:53:06 +05:00
Awais Jibran
8bd09d4057 Forgot password model not visible when user clicks 'Forgot Password' link on CMS.
TNL-1921
2015-04-22 18:06:36 +05:00
David Baumgold
764d5e6e89 _parse_time_str can be a standalone function 2015-04-21 13:38:37 -04:00
Andy Armstrong
17392ef3bf Code review feedback and test cleanup. 2015-04-17 17:23:19 -04:00
Andy Armstrong
7742735fb0 Event on user preference updates
TNL-1851
2015-04-17 17:23:19 -04:00
Andy Armstrong
1f3d2c24cc Isolate Bok Choy tests to unique test users 2015-04-17 17:23:19 -04:00
cahrens
9907cb5251 Tests for profile image eventing. 2015-04-17 17:23:18 -04:00
Andy Armstrong
8ff9fd84e4 Obey learner profile default visibility 2015-04-17 17:23:18 -04:00
muhammad-ammar
e50a641673 Accessibility changes for Account Settings and Learner Profile pages 2015-04-17 17:23:17 -04:00
muzaffaryousaf
c2d83bd4a6 Bok_choy tests for upload/remove profile image.
TNL-1538
2015-04-17 17:23:17 -04:00
muzaffaryousaf
3110cf6bb6 Remove account settings display and editing from dashboard sidebar.
TNL-1516
2015-04-17 17:23:15 -04:00
muzaffaryousaf
a378995f85 If user is not above age limit, show restricted learner profile.
TNL-1658
2015-04-17 17:23:15 -04:00
muzaffaryousaf
67848ff67b Link to learner profile page from username in discussions.
TNL-1503
2015-04-17 17:23:15 -04:00
muzaffaryousaf
4f97cd7a04 Learner profile page.
TNL-1502
2015-04-17 17:23:14 -04:00
Usman Khalid
229a37b983 Bokchoy tests for account settings page.
TNL-1499
2015-04-17 17:23:14 -04:00
Awais Jibran
efc1d5d3ef Merge pull request #7649 from edx/aj/tnl1902-fix-long-latex-post-discussion
Fixed Long discussion post not rendering Latex expressions
2015-04-16 10:49:58 +05:00
Jesse Zoldak
708203b3ef Increase timeout for library page to load after refresh in acceptance tests. TE-745 2015-04-15 11:58:32 -04:00