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

25426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
fb56588090 Tweak mongo count numbers 2014-09-02 10:29:23 -04:00
Calen Pennington
880673b97f Merge remote-tracking branch 'edx/master' into andya/merge-hotfix-2014-08-29 2014-09-02 09:38:25 -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
b8049c01ef Merge pull request #4957 from edx/forums/new-post-type 
Add post types to forums

This requires edx/cs_comments_service@66482b5
 2014-08-29 17:15:07 -04:00
Ned Batchelder
b89dccdc27 Merge pull request #5028 from edx/pmitros/update-xblock 
New XBlock with final/tested/non-prototype scope_key
 2014-08-29 16:58:18 -04:00
Andy Armstrong
4fcc59b318 Merge branch 'release' into andya/merge-hotfix-2014-08-29 
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
 2014-08-29 16:50:40 -04:00
Andy Armstrong
7b26e85478 Merge branch 'release' into andya/merge-hotfix-2014-08-29 
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
 2014-08-29 16:50:10 -04:00
Jesse Zoldak
765cd93d0b Merge pull request #5030 from edx/revert-5024-sanchez/ECOM-216-django-template-settings 
Revert "The main django template needs header and footer feature flags."
 2014-08-29 16:45:47 -04:00
Jesse Zoldak
96153ceed0 Revert "The main django template needs header and footer feature flags." 2014-08-29 16:43:30 -04:00
Will Daly
5cc6455fe3 Merge pull request #5006 from edx/will/ecom-199 
ECOM-199: Auto-registration bugfix
 2014-08-29 16:33:20 -04:00
Andy Armstrong
1838d9d432 Merge pull request #5020 from edx/hotfix/reduce-studio-mongo-calls 
Hotfix - reduce number of Studio mongo calls
 2014-08-29 16:20:55 -04:00
Alison Hodges
c9bf9ada7f New UI for discussions 2014-08-29 16:00:41 -04:00
Alison Hodges
02b42d5cb3 Added endorsement and thread_type fields 2014-08-29 16:00:41 -04:00
Piotr Mitros
520fc2b09d New XBlock with final/tested/non-prototype scope_key 2014-08-29 16:00:10 -04:00
Alison Hodges
fe9763ab61 Adding question and discussion categories for posts 2014-08-29 15:59:33 -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
a3703fbf79 Refactor a small amount of forum permission code 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
aaa2f35336 Change endorsement UI for forum question threads 
Responses to question threads can be "marked as answer" instead of
"endorsed".
 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
8d2211a698 Handle question posts from comments service 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
Stephen Sanchez
e33d9b7367 Merge pull request #5025 from edx/ora2/release-2014-08-29T17.33 
Updated ORA2 tag for release for August 29th, 2014
 2014-08-29 15:16:48 -04:00
Stephen Sanchez
1f4eb739f3 Merge pull request #5024 from edx/sanchez/ECOM-216-django-template-settings 
The main django template needs header and footer feature flags.
 2014-08-29 15:16:12 -04:00
Stephen Sanchez
cd683cecd2 Updated ORA2 tag for release for August 29th, 2014 2014-08-29 18:14:39 +00:00
Andy Armstrong
c14891e920 Pre-cache has_changes when computing ancestors 2014-08-29 14:09:42 -04:00
Don Mitchell
1db107c2ce Add memoization for has_changes 2014-08-29 14:09:41 -04:00
Calen Pennington
3afc125ecb Add test to verify bad query behavior of xblock_handler 2014-08-29 14:09:41 -04:00
Calen Pennington
8dc7f34295 Improve debuggability when call-count numbers don't match up 2014-08-29 14:09:35 -04:00
Stephen Sanchez
20a66ee2ef The main django template needs header and footer feature flags. 2014-08-29 15:38:28 +00:00
clytwynec
118baafb1f Merge pull request #4943 from edx/mvo/bumping_bok_choy_version 
bumping bok choy version
 2014-08-29 10:08:51 -04:00
Will Daly
9d4bf89058 Exclude courses from the auto-registration A/B test 2014-08-29 08:24:04 -04:00
Waheed Ahmed
539dd0c46b Merge pull request #5010 from edx/waheed/refactor-verify-course-id-decorator 
Refactor verify course id decorator and fixed tests.
 2014-08-29 17:07:26 +05:00
Waheed Ahmed
2e88e33847 Refactor verify course id decorator and fixed tests. 2014-08-29 16:05:33 +05:00
zubair-arbi
dbe1ba095a Merge pull request #4805 from edx/zub/bugfix/std2007-jumptoid 
update get_parent_location method to select non-orphan parents from mult...
 2014-08-29 16:01:14 +05:00
Waheed Ahmed
cb826dd465 Merge pull request #4985 from edx/waheed/lms11132-fix-invalid-key-error-change-enrollment 
Fixed InvalidKeyError on change enrollment.
 2014-08-29 15:46:26 +05:00
zubair-arbi
89e03d5225 update get_parent_location method to select non-orphan parents from multiple parents 
STUD-2007
 2014-08-29 14:52:46 +05:00
Waheed Ahmed
048984ba1d Fixed InvalidKeyError on change enrollment. 
LMS-11132
 2014-08-29 14:45:54 +05:00
Daniel Friedman
8a7fef072d Merge pull request #4937 from edx/dan-f/improve-course-group-coverage 
Improve test coverage for course groups
 2014-08-28 19:08:56 -04:00