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

96 Commits

Author SHA1 Message Date
Mat Peterson
b2ae827fa4 Old style location urls removed from CourseFixture and CoursePage 2014-07-11 15:40:09 -04:00
Waqas Khalid
81dfcb04aa Show thread user to staff when only anonymous_to_peers is true 
FOR-122
 2014-07-11 13:09:13 +05:00
Muhammad Ammar
81a5a7b962 CMS Video Handout Tests 2014-07-10 05:45:49 +00: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
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
Minh Tue Vo
ba989424f8 removing unused import 2014-07-08 15:57:07 -04:00
Andy Armstrong
afb311ff51 Fix user handling bug in split test module 
STUD-1948
 2014-07-08 15:01:22 -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
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
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
polesye
d38b51cb4a BLD-1117: Add read-only list of Group Configurations. 2014-07-02 18:26:27 +03:00
Ben McMorran
400731c80f Uses present in bokchoy test 2014-06-26 14:01:29 -04:00
Ben McMorran
ff0bab8e55 Increases wait_for_notification timeout to 60 seconds 2014-06-26 13:47:34 -04:00
Andy Armstrong
20675857dc Merge pull request #3999 from edx/christina/updating-split-test 
Ability to change the associated group configuration for a split test
 2014-06-20 14:15:41 -04:00
Andy Armstrong
11c25e8c1a Add Studio handling for changes to group configurations 
STUD-1658
 2014-06-20 11:41:22 -04:00
Muhammad Ammar
15839147c2 Youtube Video Quality Button Tests 2014-06-20 13:48:27 +00:00
jsa
e6871af2d3 forums: add UX for username search results. 
JIRA: FOR-627
 2014-06-19 11:33:52 -04:00
Waqas Khalid
9e6333f689 Remember the user last thread sort preference 
FOR-545
 2014-06-18 14:26:30 +05:00
Gabe Mulley
2ca79f34cf Merge branch 'release' 2014-06-17 17:07:13 -04:00
Waheed Ahmed
872d7b6f42 Fixed MATLAB Run Code bug with answer boxes. 
LMS-2807
 2014-06-16 20:58:35 +05:00
Muhammad Ammar
dc135e4398 Video Test Improvements 2014-06-13 14:52:04 +00:00
Jim Abramson
f5cfd1ef96 Merge pull request #3986 from edx/jsa/search-spell-correction 
Add support for search spell corrections to Forums UX.
 2014-06-05 15:14:00 -04:00
jsa
58c5066e66 Add support for search spell corrections to Forums UX. 
Co-authored-by: Brian Talbot <btalbot@edx.org>

JIRA: FOR-591
 2014-06-05 15:00:29 -04:00
cahrens
5ab61fc4b2 Implement a custom editor for the split_module. 
STUD-1529
 2014-06-05 12:16:16 -04:00
zubair-arbi
56e0b86394 make only section name in headers editable 
STUD-1679
 2014-06-04 15:00:52 +05:00
muhammad-ammar
fd18165bbe Merge pull request #3682 from edx/ammar/bok-choy-video-tests-batch9 
Bok-Choy Video Tests Batch9
 2014-06-02 21:20:13 +05:00
Muhammad Ammar
d9fe111c5b Bok-Choy Video Tests Batch9 2014-06-02 11:48:40 +00:00
Waheed Ahmed
cc36162df1 Fixed links for units loaded via ajax. 
LMS-2711
 2014-06-02 14:19:19 +05:00
Andy Armstrong
6b3e100cc1 Allow editing of container xblocks/xmodules 
STUD-1312
 2014-05-29 14:02:45 -04:00
Muhammad Ammar
510d0ae153 Bok-Choy Tests for Video Start Time, End Time and Finish Time 2014-05-27 10:37:26 +00:00
Calen Pennington
cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
 2014-05-22 10:52:00 -04:00
Andy Armstrong
541d20ef83 Allow creation of components on container page 
This commit implements STUD-1490, allowing creation of components
on the container page. It also enables the delete and duplicate
buttons now that new content can be created that would benefit.

Note that it also creates shared functionality for adding components,
and refactors the unit page to use it too.
 2014-05-21 15:40:31 -04:00
clytwynec
b7816aafa2 Merge pull request #3775 from edx/clytwynec/bokchoy-language-test-fix 
added check for modal to disappear in _change_lang_promise
 2014-05-20 16:27:52 -04:00
clytwynec
722870eb5f Merge pull request #3762 from edx/clytwynec/bok-choy-auto_auth-page-fix 
made is_browser_on_page actually check for the right page in AutoAuthPag...
 2014-05-20 16:02:29 -04:00
jmclaus
678a92b4b2 Added new error message that displays when HTML5 video is not supported altogether. Make sure spinner gets hidden when error message is shown. [BLD-638] 2014-05-20 19:17:57 +02:00
Christine Lytwynec
36f4e55e2b added check for modal to disappear in _change_lang_promise 2014-05-19 12:45:45 -04:00
Christine Lytwynec
ed672f079e made is_browser_on_page actually check for the right page in AutoAuthPage 2014-05-16 14:06:47 -04:00
Calen Pennington
155ffe37ca Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/djangoapps/contentstore/views/tests/test_tabs.py
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/certificates/queue.py
	lms/djangoapps/certificates/views.py
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/tests/test_module_render.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/verify_student/views.py
 2014-05-09 15:29:32 -04:00
Carson Gee
379745e3a4 Merge pull request #2686 from edx/feature/ichuang/add-reset-links-to-staff-debug 
add problem reset link to staff debug page
 2014-05-09 13:29:29 -04:00
Muhammad Ammar
aa0e8041af Bok-Choy Video Tests Batch6 2014-05-09 07:22:03 +00:00
Carson Gee
b3ec4d1b6b Switching to new dashboard API and adding rescore to actions list 2014-05-08 19:03:14 -04:00
Muhammad Ammar
af6c5efbb3 Bok-Choy video tests batch4 2014-05-08 10:53:08 +00:00
Carson Gee
2998a2e9b7 Code review changes 
i18n
 2014-05-07 16:16:37 -04:00
Calen Pennington
974e66b74f Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit updates miscellaneous files in common.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
 2014-05-06 12:03:42 -04:00
cahrens
6f404fe2c5 Test cleanup. 2014-05-05 09:41:38 -04:00
Andy Armstrong
de80f892e2 Clean up coverage and code quality issues 2014-05-02 16:20:17 -04:00
cahrens
ff00fbd1f1 Bok choy acceptance test for drag and drop. 2014-05-02 16:20:17 -04:00
clytwynec
f4ace61579 Merge pull request #3467 from edx/clytwynec/add-auto-auth-page-object-for-lms-tests 
Add AutoAuthPage to lms pages for bok-choy tests
 2014-04-29 13:07:45 -04:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00