Commit Graph

118 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
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
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
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
Ahsan Ulhaq
95b2b82896 Forums vote tracking missing spaces causes awkward reading
AC-102
2015-05-02 19:52:20 +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
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
Marco Morales
951773150f updated icons on discussion forums 2015-01-31 18:40:38 -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
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
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
Jonathan Piacenti
6e4ccfb7bd Added Jasmine tests for always_cohort_inline_discussions. 2014-12-26 18:03:51 +00: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
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
jsa
786fc806f5 Add topic selection to inline thread editing, fixing errors
Co-Authored-By: Brian Talbot <btalbot@edx.org>

TNL-549
2014-10-14 15:45:19 -04:00
Waqas Khalid
f023b62bd0 Endorsement username shouldn't be broken
If we endourse the answer of the question in discussion
the username link that is created is broken whereas it
should point to the userprofile.

TNL-188
2014-10-13 16:58:30 +05:00
Nimisha Asthagiri
d7f850a764 Merge branch 'release'
Conflicts:
	lms/djangoapps/instructor/features/data_download.py
2014-10-07 16:23:28 -04:00
jmclaus
c2716d470c TNL-172: Change type of a previously posted post. IMPORTANT: this commit depends on commit 774887b in cs_comments_service. 2014-10-03 18:29:25 +02:00
Andy Armstrong
7be11b47da Address PR review comments 2014-10-02 13:07:58 -04:00
Andy Armstrong
ba491195e6 Update final text strings & readthedoc URL
TNL-401
2014-10-02 11:54:23 -04:00
Waqas Khalid
92d2a332d6 Pinned thread should come first when sorting
Pinned threads come on the top when we sort threads
by most recent activities but in the most activities
and most vote case it doesn't come on top. Pinned
thread should come on top in any case of sorting

TNL-90
2014-09-30 17:37:40 +05:00
Waqas Khalid
787f880009 Click on posts I'm following should load threads
When as course moderator when we click on posts
I'm followng from sidebar dropdown it gives error
that threads cannot be loaded. It should show all
the threads the user is following.

TNL-469
2014-09-26 19:50:33 +05:00
polesye
00c7e60e07 TNL-171: Change topic of a previously posted post. 2014-09-24 20:28:14 +03:00
Waqas Khalid
fcf46546c3 Don't allow commenting while the thread is closed
When someone closes thread there is still option to add
comment which cause error when submitted. User shouldn't
be able to comment while the thread is closed.

TNL-150
2014-09-24 15:28:34 +05:00
jsa
eef28a4f25 allow TAs to select the cohort of new posts.
TNL-153
2014-09-16 12:44:41 -04:00
Waqas Khalid
6dec04ba0f Cancel the new post resets the state of form
When user is creating new post and then cancel it
the data remains in the form which appears when we
click on new post again. The state of form should
be reset.

TNL-148
2014-09-15 16:10:52 +05:00
Greg Price
3cf2481e6c Merge pull request #5077 from edx/gprice/forum-cohort-selector-test
Test cohort selector in NewPostView
2014-09-08 11:54:30 -04:00
Adam Palay
cfeb76e67f Merge remote-tracking branch 'origin/release' into adam/resolve-merge-conflicts
Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
2014-09-05 13:20:15 -04:00
Adam Palay
58553a7fb8 escape html for inline discussions (TNL-182) 2014-09-05 11:02:17 -04:00
Greg Price
1de17fb745 Move more forum nav rendering logic to front end
The cohort selector is rendered only for a privileged user in a cohorted
course, and that logic is now in an Underscore template instead of Mako.
2014-09-04 18:22:19 -04:00
Greg Price
cd0ea052ed Ensure forum nav cohort selector works correctly
One minor case is fixed (to pass "" instead of "all" as the group_id
parameter to indicate viewing all threads), and tests are added.
2014-09-04 18:00:43 -04:00
Greg Price
5c8daf4144 Improve thread list view tests
An obsolete test case was passing because the assertions were too weak,
so the assertions are improved and the test case removed.
2014-09-04 17:13:30 -04:00
Greg Price
d2a9b53e27 Use some real templates in forum list view tests
Unfortunately, one template (thread-list-template, defined in
_thread_list_template.html) still relies on complex Mako processing, so
that is still being mocked in the tests.
2014-09-04 15:36:45 -04:00
Andy Armstrong
8349dbfa42 Implement forum cohort visibility labels correctly
TNL-25
2014-09-04 13:47:48 -04:00