Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
26,516 Commits 1 Branch 0 Tags
dfd00a02762f6c53e3aaa4ea5670e4fdd1cc0fa4
Commit Graph

234 Commits

Author SHA1 Message Date
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
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
e26457748e Merge pull request #5127 from aboudreault/discussion-request-abort-issue 
Fix discussion error popup on http request abort
 2014-09-08 17:46:16 -04:00
Alan Boudreault
78fd5cc12a Fix discussion error popup on http request abort 2014-09-08 15:43:37 -04: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
Piotr Mitros
5364508e48 Merge pull request #5108 from edx/pmitros/retrofix-xargs 
XBlock argument passing support backport from SDK
 2014-09-07 12:51:56 -04:00
Piotr Mitros
167f4171c4 XBlock argument passing support 2014-09-07 12:01:25 -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
Greg Price
696ebf0993 Add cohort selector tests in forum NewPostView 2014-09-04 12:26:08 -04:00
Greg Price
6496963eb9 Use real templates in forum NewPostView tests 2014-09-04 11:45:46 -04:00
jsa
50741304dc remove use of ngettext in discussion jasmine test 2014-09-03 15:09:44 -04:00
Greg Price
988e4e6da5 Update UI for forum actions 
The actions are now consolidated in one location for each piece of
content. Primary actions (vote, follow, endorse, mark as answer) are
buttons, and secondary actions (pin, edit, delete, report, close) are in
a menu. This also includes improved front-end error handling for the
actions and significant test cleanup.

Co-authored-by: jsa <jsa@edx.org>
Co-authored-by: marco <marcotuts@gmail.com>
Co-authored-by: Frances Botsford <frances@edx.org>
Co-authored-by: Brian Talbot <btalbot@edx.org>
 2014-08-29 15:59:33 -04:00
Greg Price
a99196a164 Clear search alerts when a forum topic is selected 2014-08-29 15:59:33 -04:00
Greg Price
748d76600f Remove "flagged discussions" from forum topic menu 
This feature is supplanted by the flagged option in the filter menu,
which can work within topics as well as across all topics.
 2014-08-29 15:59:33 -04:00
Greg Price
80d1cae6a0 Add filter menu to forum nav sidebar 
The menu allows filtering to unread, unanswered, or flagged threads.
This includes passing through the appropriate query parameters to the
comments service.
 2014-08-29 15:59:33 -04:00
Greg Price
eaa93bf615 Hide comments in marked answers in forum questions 
A link to show the comments appears in their place.
 2014-08-29 15:59:33 -04:00
Greg Price
ec482c0dc2 Allow authors of forum questions to mark answers 
Co-authored-by: jsa <jsa@edx.org>
 2014-08-29 15:59:32 -04:00
Greg Price
c23a27bac4 Add post type control to forum new post form 
Also change server to pass post type through to the comments service.
 2014-08-29 15:59:32 -04:00
Greg Price
2e30874180 Add post type indicators to forum sidebar nav 
The previously existing checkmark for threads with endorsed responses is
removed, as it is mostly redundant.
 2014-08-29 15:59:32 -04:00
Greg Price
dd05423732 Re-render forum responses when marked as answer 2014-08-29 15:59:32 -04:00
Greg Price
182ae7aeb0 Add endorsement info to marked answers in forum 
Co-authored-by: jsa <jsa@edx.org>
 2014-08-29 15:59:31 -04:00
Greg Price
10063a3120 Distinguish forum thread types in rendering 
Each thread's type is now included in its post details, and question
threads have marked answers shown immediately below the body of the
initial post.
 2014-08-29 15:59:31 -04:00
Greg Price
7470e60004 Unify forum thread views (and templates) 2014-08-29 15:59:31 -04:00
Greg Price
ab2b7f344d Clean up dead forums front-end code 2014-08-29 15:59:31 -04:00
Greg Price
854621be60 Update forum new post form 
Add help text to several fields, update visual styling, and make it
appear in the right-hand pane of the discussion tab instead of sliding
down from the top.

Co-authored-by: jsa <jsa@edx.org>
Co-authored-by: marco <marcotuts@gmail.com>
 2014-08-29 15:59:31 -04:00
Waqas Khalid
01aa38fb82 Truncated markup can be displayed in forums user profile view 
FOR-581
 2014-08-20 14:33:23 +05:00
Calen Pennington
50082387eb Add a request-token to identify which xblock html was rendered as part of the current request 
[STUD-2903]
 2014-08-15 11:04:52 -04:00