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

920 Commits

Author SHA1 Message Date
Bill DeRusha
bcb71a3255 Rename SEGMENT_KEY to have a unique key name for both CMS and LMS 2015-10-01 19:40:27 -04:00
chrisndodge
cc15a9ada8 Merge pull request #9975 from edx/cdodge/bump-proctoring 
update reference to edx-proctoring to account for requested iconograp…
 2015-09-30 12:38:31 -04:00
David Baumgold
459f2e0705 Disable some tests for comprehensive theming 
Depends on functionality that has been temporarily reverted
 2015-09-30 12:18:09 -04:00
Chris Dodge
bf26b09265 update reference to edx-proctoring to account for requested iconography changes from UX team. Also update test to conform with changes 2015-09-30 10:10:23 -04:00
Bill DeRusha
a6873cb883 Merge pull request #9875 from edx/bderusha/segment-cleanup 
Segment Clean Up
 2015-09-29 10:33:03 -04:00
Chris Dodge
3b650133bf bump version of edx-proctoring to 0.9.11 2015-09-27 17:53:13 -04:00
Bill DeRusha
c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY 2015-09-24 11:49:03 -04:00
clrux
0b64f2d612 Merge pull request #9525 from edx/clrux/ac-76 
LMS: Course navigation revamp
 2015-09-23 14:26:10 -04:00
Ahsan Ulhaq
508ded2673 LMS: course navigation menu refactor 2015-09-23 13:13:18 -04:00
Nimisha Asthagiri
946102a3e0 Merge pull request #9823 from edx/mobile/xblock-rendering-api 
MA-1337 xBlock Rendering View
 2015-09-21 17:00:05 -04:00
Nimisha Asthagiri
31d5d513f8 MA-1337 xBlock Rendering View 2015-09-21 16:17:11 -04:00
David Baumgold
03aeae4bd7 Merge pull request #8271 from edx/sass-theming 
Comprehensive Theming
 2015-09-21 10:55:18 -04:00
muhammad-ammar
6a5ce5d544 Upgrade factory_boy 
TNL-3179
 2015-09-18 18:02:38 +05:00
David Baumgold
6ebf2515f4 Comprehensive theming 
This is a squash of 38 commits ending with
5b080f979d692804452400ac5bed9b17c50b001e
 2015-09-17 15:39:03 -04:00
Waheed Ahmed
18411cd480 Fixed discussion module get_course. 
TNL-3237
 2015-09-12 00:27:18 +05:00
Chris Dodge
68ee28f8b0 update edx-proctoring to 0.9.x 2015-09-11 10:00:05 -04:00
David Ormsbee
127467f20a Merge pull request #9023 from mcgachey/lti-collated-grades 
[LTI Provider] Grade passback for non-leaf blocks.
 2015-09-02 07:34:10 -04:00
Ned Batchelder
af609f103f Merge pull request #9494 from edx/ned/move-recommender-tests 
Move recommender XBlock tests to openedx/tests/external
 2015-09-01 10:20:24 -04:00
Ned Batchelder
f925a4af9c Move recommender XBlock tests to openedx/tests/xblock_integration 
I want to make clear that these tests rely on XBlocks in other repos,
and that ideally in time we would move these tests into the XBlock repo.
 2015-08-31 17:14:47 -04:00
clrux
5b545c2b0d Revert "Course navigation menu accessibility issue" 2015-08-28 13:28:08 -04:00
clrux
52a8bc50cb Merge pull request #9367 from edx/clrux/ac-76-course-nav 
Course navigation menu accessibility issue
 2015-08-28 13:27:44 -04:00
chrisndodge
69ddbc0dc4 Merge pull request #9370 from edx/cdodge/add-course-id-to-survey-answers 
add the ability to persist the course_key where the user answered the…
 2015-08-28 13:03:58 -04:00
Chris Rodriguez
c0bfdf5e5d Removing instances of old mechanism; tests 2015-08-28 07:50:33 -04:00
Chris Rodriguez
c9b775bda2 wip test fixes 2015-08-28 07:50:33 -04:00
Ahsan Ulhaq
b32d2205d4 Course navigation menu accessibility issue 
Following have been done
1- Change the structure of the course navigation Menu HTML
2- Add some basic styling
3- Add basic JS for html rendering
4- Update tests according to new structure

AC-76
 2015-08-28 07:49:31 -04:00
Phil McGachey
9e6c44911d [LTI Provider] Grade passback for non-leaf blocks. 
This change allows graded assignments to be added to a campus LMS
regardless of the granularity at which the problem sits. Previously
a grade could only be returned if the usage ID for the problem itself
was specified in the LTI launch.

The code assumes that courses taking advantage of this functionality
are arranged in a hiearchy (with sections being parents to verticals,
and verticals being parents to problems). When a grading event occurs
it traverses the parent hiearchy to identify any previous graded LTI
launches for which the new scoring event should generate a grade
update. It then calculates and sends scores to each of those outcome
services.

Since grade calculation is an expensive operation, the code optimizes
the case where a problem has been added only once as a leaf unit. In
that case it is able to behave as before, just taking the grade from
the signal without having to calculate grades for the whole course.
 2015-08-27 15:54:43 -04:00
Peter Fogg
38fb6eaede Add signals for user's discussion activity. 
These signals are caught by the Teams app and used to update
`last_activity_at` on both teams and individual users.

TNL-2497
 2015-08-26 12:07:54 -04:00
David Ormsbee
6b12969ea2 Use bulk_operations in group access tests. 2015-08-24 01:00:36 -04:00
David Ormsbee
3d1ce45187 Switch TestRecommender to use SharedModuleStoreTestCase (for performance) 2015-08-21 13:41:09 -04:00
Chris Dodge
d3c08f89ed add the ability to persist the course_key where the user answered the survey 2015-08-21 13:40:57 -04:00
Matt Drayer
ebed8cd42a Merge pull request #9339 from edx/ziafazal/SOL-493 
ziafazal/SOL-493: Fetch scores via ScoresClient
 2015-08-20 10:20:48 -04:00
Ahsan Ulhaq
a495847b45 Merge pull request #9373 from edx/ahsan/ECOM-2114-Add-USD-to-prices-on-track-selection-pages 
Add USD labels to prices on track selection pages
 2015-08-20 00:37:27 +05:00
Ahsan Ulhaq
3d62580fc2 Add USD labels to prices on track selection pages 
ECOM-2114
 2015-08-19 23:59:15 +05:00
Chris Dodge
c08fbd1406 only include JS when feature flag is on and the course has proctoring enabled 2015-08-19 11:07:14 -04:00
Zia Fazal
05e2cc9402 fetch StudentModule via query-chunking 
using ScoresClient instead of StudentModule

using ScoresClient without FieldDataCache
 2015-08-19 12:57:32 +05:00
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release 
Release
 2015-08-17 13:17:55 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00
Brian Talbot
944f51a60b LMS: removing old and not needed edx.org MKTG iframe assets 
* removing templates/styling
* removing test logic and URLs
 2015-08-14 16:17:19 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Sven Marnach
55ace6baa8 Make new masquerading code compatible to existing session data. 
The new masquerading code introduced in PR #8775 adds a new attribute to
CourseMasquerade objects stored in the user's session.  When users who have
active masquerading configuration access instances with the new code, and
AttributeError occurs when trying to access the attribute user_name.

This fix ensures that CourseMasquerade objects receive all required attributes
when they are unpickled from the session.
 2015-08-11 10:47:25 +02:00
Matt Drayer
e1ee5ac6df mattdrayer/SOL-981: Integrate edx-organizations application 
* asadiqbal08/SOL-1058: Add edx-organizations to certificate web view
  * Support organization logo asset management
  * Remove organization fields from Studio certificate configuration model

* SOL-981 pull request feedback fixes
 2015-08-10 10:29:45 -04:00
cahrens
2b57603436 Handle case of video in a content library with no transcripts. 
This partially addresses TNL-1776
 2015-08-07 13:19:12 -04:00
Ned Batchelder
ceb5655b2d Merge pull request #9171 from edx/ned/update-pylint 
Update pylint and astroid, reduces pylint count by 400
 2015-08-04 09:28:35 -04:00
Ned Batchelder
f54fe787c6 Remove needless 'disable=no-member' pragmas 2015-08-03 17:47:44 -04:00
John Eskew
ffc8a11789 Merge pull request #9092 from cpennington/user-state-client-tests 
User state client tests
 2015-08-03 12:25:05 -04:00
Linda Liu
8aa2d67b6d Merge pull request #8946 from edx/lliu/view-course-access 
Add access response information into view_course_access
 2015-08-01 13:55:25 -04:00
Calen Pennington
83c10331fa Add a test of submission history display 2015-08-01 08:13:25 -04:00
Calen Pennington
704ae7139a Add a subclass-implementation of the UserStateClient tests 2015-08-01 08:12:04 -04:00
tlindaliu
3b483d14bc MA-851: Add access response information into view_course_access 2015-07-31 09:30:40 -04:00
David Baumgold
c1a38a6dc7 Pull discussion underscore templates out into individual files 
No need to go through Mako
 2015-07-28 09:36:31 -04:00