Commit Graph

277 Commits

Author SHA1 Message Date
clrux
a5e34d4e12 Merge pull request #11105 from edx/clrux/ac-23
Updating forum buttons and overall icon cleanup
2016-02-09 10:53:31 -05:00
Chris Rodriguez
4454c819c8 LMS: forum markup tweaks and cleanup 2016-02-09 09:34:58 -05:00
Eric Fischer
d1ef73e90a Don't renderAttrs unnecessarily
It is unneeded here, and causes bad behavior.
2016-01-26 13:08:42 -05:00
Andy Armstrong
10ca0a3870 Discussion Test Updates
Updates discussion tests to not mock out so much. Also adds new
test coverage for the bug being investigated here.
2016-01-26 13:08:42 -05:00
Andy Armstrong
8914aaf8d4 Refactor discussions code to address flaky test
TNL-3247

Removed remaining synchronous AJAX calls from discussions
Updated the profile view tests to use an attached view for testing
Removed one-time JQuery intiialization that could fail and break multiple tests
2015-10-07 11:22:48 -04:00
Chris Rodriguez
f63ff69097 Assigning focus to the selected topic
TNL-2620
2015-09-17 17:31:30 -04:00
Peter Fogg
2f7fa6fd8b Enforce discussions permissions in teams UI.
Adds a read-only mode to the discussion module which disables any
controls for updating the discussion (votes, follows, replies,
etc). This mode is enabled for users who are not a member of the team,
and are also not moderators, admins, or community TAs.
2015-08-06 11:15:56 -04:00
Marco Morales
dd67f8aa72 updated inline discussion styling to account for lack of expand / show message (which was being relied on for layout) and also removed issues of generic pagination styling impacting the older inline discussion pagination pattern with a class renaming 2015-08-06 11:15:55 -04:00
Andy Armstrong
63da1907eb Show inline discussion component on Team view
TNL-2515
2015-08-06 11:15:55 -04:00
Ned Batchelder
ff243eaa70 Merge pull request #9187 from edx/release
Release merge to master
2015-08-04 14:18:50 -04:00
Andy Armstrong
540e8464d9 Remove Mustache usage from discussions 2015-08-01 17:13:14 -04:00
Andy Armstrong
96e14e3f8b Fix forums escaping bug
TNL-2919
2015-07-31 19:40:04 -04:00
David Baumgold
c1a38a6dc7 Pull discussion underscore templates out into individual files
No need to go through Mako
2015-07-28 09:36:31 -04:00
Andy Armstrong
1689004189 Create a common paginated list view
TNL-2384

Refactored Studio's PagingView to use RequireJS Text and moved it
to common so that it can also be used by LMS.
2015-06-15 13:51:09 -04:00
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
Ahsan Ulhaq
702663d978 Merge pull request #7889 from edx/ahsan/AC-102-forums-vote-tracking-missing-spaces-awkward-reading
Forums vote tracking missing spaces causes awkward reading
2015-05-05 05:48:59 -04:00
Ahsan Ulhaq
95b2b82896 Forums vote tracking missing spaces causes awkward reading
AC-102
2015-05-02 19:52:20 +05: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
Waqas Khalid
daadfeab66 View discussion of user profile return 404
If you open a particular user profile page there
will be discussion where that user has collaborated.
If you click on view discussion link it would return
404 becuase of the missing discussion id in the link.
I fixed it by adding the thread commentable id to link
instead of getting the id from discussion object.

TNL-1717
2015-03-19 15:33:45 +05:00
Waqas Khalid
11159ba71e Discussion forum doesn't work when mathjax is down
When mathjax is down discussion forum doesn't work
as we were using markdown.js with processor as
mathjax. Unavailability of mathjax raise error in
js which stops discussion to render. So I made
markdown independent of mathjax. Markdown now will
use mathjax when it is available otherwise ignore it.

TNL-1149
2015-02-10 13:12:41 +05:00
Mat Moore
d857695d62 Vote buttons should be disabled while in use
Clicking quickly on up/down votes in forums generates a race condition
where the votes can continue going up or down (and I can get e.g. large
negative numbers). This is client-side; the server-side is not affected.

This is caused by safeAjax calling code (including updateWithUndo) not
handling the possible undefined return value. This is returned in the case
where the element that triggers the event is already disabled.

Corrected typo in DiscussionThreadView cleanup: @responseRequest -> @responsesRequest

Resolves TNL-1061
2015-02-07 09:52:39 +00:00
Chris
6266dcf1e7 Merge pull request #6820 from edx/clrux/forums-assign-regions
Assign regions/landmarks for easier navigation
2015-02-03 16:03:18 -05:00
Chris Rodriguez
66f909cd50 Assigning regions to forum areas and adding ARIA to new post form 2015-02-03 10:34:37 -05:00
Marco Morales
951773150f updated icons on discussion forums 2015-01-31 18:40:38 -05:00
David Baumgold
6134bedfca Merge pull request #6443 from open-craft/kelketek/hide-irrelevant-cohort-menu
Add classes to cohort selector element group
2015-01-29 11:49:33 -05:00
Chris Rodriguez
d30088dd0d Using .sr instead of aria-label 2015-01-29 08:39:54 -05:00
Chris Rodriguez
42486a5ee6 Adding ARIA label to selected conversation 2015-01-29 08:39:54 -05:00
Jonathan Piacenti
ed20d5a136 Inverted boolean for rendering in CheckVisible. 2015-01-28 22:58:56 +00:00
Jonathan Piacenti
bd57d56bdd Add classes to group of elements for cohort selector.
Retriggring Jenkins build
2015-01-28 22:51:46 +00:00
Andy Armstrong
ac58ebf7da Rename 'cohort groups' to just 'cohorts' 2015-01-15 10:33:48 -05:00
Bertrand Marron
c4a7d770cc Remove all ellipses
It's a problem for accessibility
2015-01-15 09:03:12 -05:00
polesye
c7153be040 TNL-213: Let Students Add Personal Notes to Course Content.
Co-Authored-By: Jean-Michel Claus <jmc@edx.org>
Co-Authored-By: Brian Talbot <btalbot@edx.org>
Co-Authored-By: Tim Babych <tim@edx.org>
Co-Authored-By: Oleg Marshev <oleg@edx.org>
Co-Authored-By: Chris Rodriguez <crodriguez@edx.org>
2015-01-14 23:34:11 +02:00
Waqas Khalid
70b38fc3a3 Merge pull request #6034 from mlkwaqas/waqas/tnl776-multiple-inline-discussion-problem
In inline discussion two discussion module override actions
2015-01-13 19:59:23 +05:00
Waqas Khalid
2a67632b7b Unable to report/vote/endorse after editing response
When user update the response after editing he would
be unablt to report/vote/endorse the response. This
problem was caused due to double binding of event in
backbone view.

TNL-720
2015-01-13 13:47:02 +05:00
Brian Talbot
f128629f48 fixing styling and class syntax (to new FA-based classes) for missing UI elements 2015-01-09 12:01:26 -05:00
Waqas Khalid
82eed83f64 In inline discussion two discussion module override actions
In inline discussion if we have two discussion module the
new post button open form for both discussions as well as
cancel button of one discussion call the cancel of other.
Click and button actions are now being handled inside view
of each module so that they don't disturb eachother.

TNL-776
2015-01-09 17:10:10 +05:00
Chris
c5d2dd7536 Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0
* updating vendor files
* updating class syntax (to new FA-based classes) for all UI elements
* correcting broken tests
2015-01-06 15:24:12 -05:00
Waqas Khalid
e7be2f7311 Discussion thread response show dual vote count
When the responses of the thread is loaded it shows
dual vote count one with simple text and one with
button whereas only text should be shown when thread
is closed and only button when thread is open.

TNL-1016
2015-01-05 20:55:32 +05:00
Jonathan Piacenti
6e4ccfb7bd Added Jasmine tests for always_cohort_inline_discussions. 2014-12-26 18:03:51 +00:00
Alan Boudreault
68fcdcc030 Add always_cohort_inline_discussions in course settings 2014-12-26 18:03:50 +00:00
Waqas Khalid
0eab14a334 In user profile changing page should reposition window to top
When we change the page using pagination in the user
profile page the data gets updated but the position
of the window remains at pagination. It should change
position of window to top.

TNL-107
2014-12-17 17:22:10 +05:00
Calen Pennington
d919d2ae46 Teach LMS how to render XBlockAsides
[PLAT-217]
2014-12-13 08:26:28 -05:00
Waqas Khalid
1efa1b3169 Don't allow voting while the thread is closed
When someone closes thread there is still option
to add vote which cause error when click on add
vote button. User shouldn't be able to add vote
while the thread is closed.

TNL-152
2014-12-05 15:59:07 +05:00
Waqas Khalid
be19c1a9a5 Merge pull request #5610 from mlkwaqas/waqas/tnl607-forum-post-are-uneditable
Post with the discussion id containing dots uneditable
2014-10-20 19:39:29 +05:00
Waqas Khalid
9ba03c8aac Post with the discussion id containing dots uneditable
When user try to edit the post under dicussion whose
id contains dots it doesn't allow user to edit taht
post.

TNL-607
2014-10-18 01:07:27 +05:00
Waqas Khalid
ff8b281f5b Clicking the magnifying glass should perform search
In forum search is only working when user enter some
text in the search textfield and press the Enter
button. It should also work when we click on
magnifying glass.

TNL-526
2014-10-17 18:34:57 +05:00
Ben Patterson
5703adb722 Merge branch 'release'
Includes rc/2014-10-14
2014-10-16 20:11:55 -04:00
Calen Pennington
e00b666db9 Merge pull request #5590 from cpennington/xblocks-with-children
Enable pure XBlocks to use children in edx-platform
2014-10-16 10:23:35 -04:00
Calen Pennington
41f3c040c8 Add block type to the available attributes in the xblock javascript frontend 2014-10-16 09:08:57 -04:00
E. Kolpakov
4f3240e488 Fixed errors in discussion XModule, caused by c2716d4 [TNL-606]
Co-Authored-By: jmclaus <jmc@edx.org>
Co-Authored-By: jsa <jsa@edx.org>
2014-10-15 12:29:27 -04:00