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

8659 Commits

Author SHA1 Message Date
Muhammad Ammar
81a5a7b962 CMS Video Handout Tests 2014-07-10 05:45:49 +00:00
Nimisha Asthagiri
8855b12b76 Update tests to allow LMS tests to use published branch setting. 
Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py
 2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
ea32529866 Fix all modulestore calls to pass in user ids. 2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
f5abef88c2 LMS-2947 remove get_error_courses in Split. 
LMS-2950 move delete_course to Mongo.
 2014-07-09 21:10:12 -04:00
Julia Hansbrough
545cfd8406 Merge pull request #4353 from edx/flowerhack/lms-deprecated-urls 
Enables LMS to handle deprecated URLs
 2014-07-09 18:23:00 -04:00
jhelbert
451953752e Merge pull request #4285 from edx/jhelbert/enrollment-mode-change-events 
Jhelbert/enrollment mode change events
 2014-07-09 17:57:39 -04:00
Julia Hansbrough
d9dd45662e Enables LMS to handle deprecated URLs 
LMS-2651
 2014-07-09 21:51:37 +00:00
Nimisha Asthagiri
cd8f0e6ced Merge pull request #4309 from edx/nimisha/refactor_mixed_context_managers 
Nimisha/refactor mixed context managers
 2014-07-09 17:01:08 -04:00
Justin Helbert
e78a398f45 This emits enrollment mode changes events 2014-07-09 20:27:00 +00:00
Christina Roberts
227205fb10 Merge pull request #4344 from edx/christina/revert_to_published 
Add revert_to_published method.
 2014-07-09 16:01:13 -04:00
Nimisha Asthagiri
ce9aea80b1 Move context_managers to base class, overridden by mixed. 2014-07-09 15:55:53 -04:00
Don Mitchell
211f0797fb Merge pull request #4294 from edx/split_mongo_assets_cherry 
Split mongo assets cherry
 2014-07-09 14:22:04 -04:00
Minh-Tue Vo
a5a3f6255d Merge pull request #4343 from edx/mvo/removing_unused_action_chains 
Removing unused import
 2014-07-09 13:38:56 -04:00
cahrens
e984ca15a1 Add revert_to_published method. 
STUD-1860
 2014-07-09 13:12:39 -04:00
Greg Price
98d7b28c6b Merge pull request #4318 from edx/gprice/forum-sidebar-debt 
Reduce tech debt in forum sidebar
 2014-07-09 12:13:54 -04:00
Don Mitchell
a74ba6b932 Make pictures smaller 2014-07-09 08:34:03 -04:00
Minh Tue Vo
ba989424f8 removing unused import 2014-07-08 15:57:07 -04:00
Andy Armstrong
4cb1a510fc Merge pull request #4326 from edx/andya/fix-stud-1948 
Fix user handling bug in split test module
 2014-07-08 15:09:14 -04:00
Andy Armstrong
afb311ff51 Fix user handling bug in split test module 
STUD-1948
 2014-07-08 15:01:22 -04:00
Adam
115d8c64f1 Merge pull request #4320 from edx/merge-rc-to-master 
Merge rc to master
 2014-07-08 13:14:18 -04:00
Don Mitchell
173be7d279 Allow to_deprecated_string to do its magic 2014-07-07 17:48:46 -04:00
Don Mitchell
cc6dfbbc75 Asset support in split 
LMS-2876
 2014-07-07 17:11:43 -04:00
Andy Armstrong
5f11aa9aee Revert "First attempt to fix split test" 
This reverts commit a16f5487bc.
 2014-07-07 16:49:11 -04:00
Andy Armstrong
a16f5487bc First attempt to fix split test 2014-07-07 16:40:17 -04:00
Don Mitchell
356da9ca75 Merge pull request #4315 from edx/bug/delete_draft 
Deleting a child of a unit should convert the unit to draft
 2014-07-07 14:50:00 -04:00
Greg Price
a4de82e1c3 Remove sidebar class from forum nav 
This will enable much cleanup of the relevant SASS rules.
 2014-07-07 14:21:53 -04:00
Adam Palay
d63a5abfbc Merge branch 'rc/2014-07-02' into testmergemaster 
Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py
 2014-07-07 13:54:03 -04:00
Tim Babych
34ac6abe1c Merge pull request #4316 from edx/anton/group-experiments 
BLD-1117, BLD-1217: Add read-only list of Group Configurations, Create feature flag.
 2014-07-07 20:03:43 +03:00
Don Mitchell
1f71a67a85 Deleting a child of a unit should convert the unit to draft 
if the unit is draftable but isn't yet draft.
 2014-07-07 11:01:02 -04:00
Greg Price
f3a8436e68 Tweak forum topic browse menu 
The filter box will now remain fixed while the rest of the menu scrolls.
This also fixes a minor cosmetic bug in which the thread list would
overflow its container if the user opened the browse menu, scrolled the
page, and then closed the browse menu.
 2014-07-03 14:14:55 -04:00
Ben McMorran
db5dd34a60 Fixes has_changes to search all the way to leaf nodes 2014-07-03 11:26:37 -04:00
Tim Babych
a153092cb5 Add FEATURE['ENABLE_GROUP_CONFIGURATIONS'] and os.environ['FEATURE_GROUP_CONFIGURATIONS']. 2014-07-03 15:30:18 +03:00
louyihua
ba30f0387e Missing "_()" in course_module.py 2014-07-03 10:55:00 +08:00
Ben McMorran
1952743985 Merge pull request #4273 from edx/benmcmorran/subtree-edited-info 
Adds subtree_edited_on, subtree_edited_by, and fixes has_changes
 2014-07-02 18:42:04 -04:00
Ben McMorran
a59f8494a6 Adds subtree_edited_on, subtree_edited_by, and fixes has_changes 2014-07-02 17:34:39 -04:00
Greg Price
6d87443a39 Update discussion tab sidebar header 
The home button is removed, the search box is always displayed, and many
visual adjustments are made, along with a large amount of refactoring.

Originally reviewed in #4211
 2014-07-02 16:58:34 -04:00
Greg Price
05d8eeecd7 Improve forum sorting and cohort filtering UX 
Thread entries now show an activity count that includes the original
post, and only one of the vote count and activity count is displayed
based on the user's selected sort. The sorting and filtering options now
both use a select and are somewhat more verbose, and the visual styling
of the sort/filter bar is updated.

Originally reviewed in #4165 with a bugfix in #4211
 2014-07-02 16:58:34 -04:00
Greg Price
e049cfaf3b Make "load more" in forums not appear incorrectly 
The rendering of the link happens in an event handler, and the
collection's attributes were not getting set properly before the reset
event triggering the rendering occurred.

Originally reviewed in #4072
 2014-07-02 16:58:34 -04:00
Greg Price
551cea9379 Add labels to forum thread list 
A thread will be labeled if it is pinned, if the user is following it,
or if it was authored by a staff member or community TA. This also
slightly changes the color used for community TA labels.

Originally reviewed in #4072
 2014-07-02 16:58:33 -04:00
Greg Price
89ba90a695 Re-design forum thread list 
Use larger and lighter title font, decrease padding, and use lighter
solid backgrounds instead of gradients. Also, refactor SASS code to
conform better to our new style, including using more specific class
names.

Originally reviewed in #4072
 2014-07-02 15:31:55 -04:00
Greg Price
1a0d8827f5 Refactor global var setup for forum Jasmine tests 
Originally reviewed in #4072
 2014-07-02 15:31:35 -04:00
Calen Pennington
3893a9aee6 Merge pull request #4258 from cpennington/studio-deprecated-urls 
Make Studio able to handle deprecated key formats in urls
 2014-07-02 14:26:46 -04:00
Adam
ad43c25c78 Merge pull request #4188 from edx/adam/fix-skiptests 
Explicitly skip tests in common unless we know we're running the LMS unittest suite
 2014-07-02 12:43:16 -04:00
polesye
d38b51cb4a BLD-1117: Add read-only list of Group Configurations. 2014-07-02 18:26:27 +03:00
Jay Zoldak
3515212196 Merge pull request #4266 from edx/revert-4050-linkedin-email 
Revert "Make LinkedIn auth provider request email by default."
 2014-07-01 14:36:50 -04:00
jsa
59e2a6ddde update NewPostViewSpec to correctly initialize NewPostView 2014-07-01 13:43:54 -04:00
Adam
653d6f21dd Merge pull request #4171 from edx/adam/fix-lms-2773 
Prevents students from accidentally changing their enrollment on login (...
 2014-07-01 10:38:50 -04:00
David Baumgold
ca7d895350 Revert "Make LinkedIn auth provider request email by default." 2014-07-01 10:05:01 -04:00
Usman Khalid
6a3d5eb079 Do not refund student if a certificate entry already exists for them. 
LMS-2920
 2014-07-01 16:29:07 +05:00
Adam Palay
536b9dbe31 in some cases we do want that redirect url 2014-06-30 17:05:48 -04:00