Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,719 Commits 1 Branch 0 Tags
17c8fa81f52b7708643a97c8d774b439337c00a7
Commit Graph

838 Commits

Author SHA1 Message Date
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
Sarina Canelake
825dbddd95 Merge pull request #5165 from lduarte1991/lduarte-harvardx-pr25 
Annotation Tool: Fixed TinyMCE issue when changing units
 2014-09-12 16:40:02 -04:00
Sarina Canelake
abb2c6bc56 Merge pull request #5146 from lduarte1991/lduarte-harvardx-pr23 
Text Annotation Tool: Reply/Grouping Bug Fix
 2014-09-12 15:48:06 -04:00
lduarte1991
cf95dc0b75 [TNL-293] Annotation Tool: Fixed TinMCE issue when changing units 
- fixed tinymce editors condition to check only positive numbers
 2014-09-12 13:12:56 -04:00
lduarte1991
3204016487 Annotation Tools: Clean-up 2014-09-11 12:38:48 -04:00
lduarte1991
d649e208a7 Annotation Tools: Adding Check for Grouping in MyNotes 
- Grouping instance checked instead of prototype

- adding comments
 2014-09-10 13:31:33 -04:00
lduarte1991
5dc9e79d91 [TNL-287] Text Annotation Tool: Reply/Grouping Bug Fix 2014-09-10 12:29:43 -04: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
Renzo Lucioni
ba7ff67a55 Merge pull request #5113 from edx/renzo/remove-unused-js 
Remove unused analytics JS left over by 3rd party auth changes
 2014-09-08 15:36:05 -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
Renzo Lucioni
823be96843 Remove unused analytics JS left over by 3rd party auth changes 2014-09-05 15:46:23 -04:00
Adam
58e6dcf79c Merge pull request #5107 from edx/adam/resolve-merge-conflicts 
Adam/resolve merge conflicts
 2014-09-05 14:55:24 -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
Waqas Khalid
4834e51aca Mathjax should be used after complete loading 
Student couldn't able to submit his answer in ie9
becuase mathjax was used before its complete loading
thats cuase the problem. Mathjax operations should be
handled synchronously inorder to avoid error.

BLD-1199
 2014-09-05 17:19:48 +05: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
Julia Hansbrough
c7d4183310 Merge pull request #4915 from edx/flowerhack/redo-third-party 
Facebook auth support.
 2014-08-30 02:50:57 -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
Julia Hansbrough
fd925e8970 Add server-side analytics logging for login 
Also, removed the client-side analytics for logging in.
Ensures that analytics are collected for third-party-auth logins.
Fixed failing tests related to third-party-auth.
 2014-08-29 19:49:42 +00:00
Daniel Friedman
a01e57ee71 Improve test coverage for course groups 2014-08-28 17:07:22 -04:00
jmclaus
037abb6d50 Replace reference to Google OpenSans with edX-hosted OpenSans 2014-08-27 10:34:53 -04:00
Don Mitchell
49ed732824 JS regex's need to escape special chars 
LMS-11260
 2014-08-25 18:07:37 -04:00
Brian Talbot
d808b742e5 Studio: revising %cont-text-sr Sass placeholder based on modern browser support 2014-08-20 14:48:37 -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
David Baumgold
2e02cefc90 Update comments to point to openedx.atlassian.net 
And whitespace corrections (automatically made by my editor, and I'm too lazy
to remove them)
 2014-08-18 15:34:06 -04: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
Jason Zhu
13846e074d Support ipv6 in geoinfo and Embargo 2014-08-14 16:13:35 +08:00