Commit Graph

1860 Commits

Author SHA1 Message Date
Bill DeRusha
eec2bed0c7 Add edx-search configuration to lms
remove "defensive code" until we can figure out how to actually
catch the errors,
2015-09-11 13:55:39 -04:00
Clinton Blackburn
b5d6b210fd Merge pull request #9681 from edx/release
Release 2015-09-09
2015-09-09 12:38:15 -04:00
Bill DeRusha
8bfa4e9c21 Add ENABLE_SEARCH_TEAMS flag to tests 2015-09-08 19:12:48 -04:00
Bill DeRusha
49807ab6a5 Add search specific feature flag in front of search features 2015-09-08 17:13:30 -04:00
Andy Armstrong
a08fe9fb06 Merge pull request #9059 from edx/andya/faster-update-assets
Don't package or optimize assets on devstack
2015-09-08 16:48:11 -04:00
zubair-arbi
d2a4790855 use the standard syntax to load JavaScript dependencies on logistration js files
ECOM-2044
2015-09-07 18:19:56 +05:00
Calen Pennington
7c62d09eba Merge pull request #8930 from ubc/wmono/lti-sso
Feature: LTI third-party-auth providers
2015-09-04 10:40:55 -04:00
Marko Jevtic
080a44b663 (SOL-1105) Requirement for enabling search in devstack 2015-09-04 10:50:40 +00:00
William Ono
4d1194800e Support LTI third-party-auth providers
PR #8930
2015-09-03 22:53:45 -07:00
David Ormsbee
57085c011c Merge pull request #9582 from edx/ormsbee/lti_passback_delay_config
Add lms/envs/aws.py entry for LTI_AGGREGATE_SCORE_PASSBACK_DELAY
2015-09-03 16:17:43 -04:00
Andy Armstrong
fb19d32815 Don't package or optimize assets on devstack 2015-09-03 13:28:26 -04:00
Waheed Ahmed
8f12fdf6eb Fixed duration not display on youtube player.
TNL-3056
2015-09-03 12:14:55 +05:00
Andy Armstrong
4be74937df Add searching to the teams view
TNL-1935
2015-09-02 12:26:07 -04:00
David Ormsbee
d81b674789 Add lms/envs/aws.py entry for LTI_AGGREGATE_SCORE_PASSBACK_DELAY 2015-09-02 09:27: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
741f06864a Merge pull request #9502 from edx/ned/import-path-differently
Change imports from path to use the stablest name.
2015-08-28 11:12:10 -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
Braden MacDonald
586c237543 Fix for Twitter compatibility 2015-08-27 11:19:39 -07:00
Ned Batchelder
2a0259095d Change imports from path to use the stablest name.
The old line:

    from path import path

produced pylint errors because of the baroque way that path.py defined
"path".  We tried to get them to change how they defined it, but they
deleted the name instead: https://github.com/jaraco/path.py/issues/102

(Jason then changed his mind, but this is a better way to use path.py,
it avoids the pylint error at least.)
2015-08-27 12:59:25 -04:00
David Ormsbee
ff62a8eaaa Merge branch 'release' into release-2015-08-26-conflict 2015-08-26 14:28:35 -04:00
Fred Smith
16ac5801c9 Revert "DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENRO…" 2015-08-26 11:10:21 -04:00
Braden MacDonald
79a075328f Allow configuring sensitive third_party_auth settings via lms.auth.json 2015-08-25 16:35:35 -04:00
Fred Smith
28368a0d71 DEVOPS-2620 - get setting from environment for DISPLAY_ANALYTICS_ENROLLMENTS 2015-08-25 09:29:17 -04:00
Bill DeRusha
973314de7b Add basic elasticsearch search for teams
TNL-3014

Add tests for search

Add text_search to TeamsListView

Add reindex command line tool for course teams

Add Search Pagination and update comments

Move paginate_search_results to common library
2015-08-24 09:22:06 -04:00
Ned Batchelder
346ff84076 Merge pull request #9311 from edx/ned/quiet-devstack-logs
Quiet some devstack log messages
2015-08-14 12:08:19 -04:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration
Integration of Proctoring into the LMS
2015-08-14 07:18:14 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Andy Armstrong
01065b6ae5 Merge pull request #9217 from edx/andya/land-teams
Enable teams and deprecate the advanced setting
2015-08-13 17:47:15 -04:00
Ned Batchelder
2c8ab7db4b Quiet some devstack log messages 2015-08-13 17:26:47 -04:00
Diana Huang
2ac1590df4 Merge pull request #9276 from edx/diana/update-status-message
Make status use ConfigurationModel instead.
2015-08-13 16:37:23 -04:00
cahrens
bb910ca632 Add toggle_login_modal to list of base_application_js.
TNL-3051
2015-08-13 11:28:51 -04:00
Bill DeRusha
716c1f74cf Merge pull request #9237 from edx/bderusha/teams-expand-users-api-fix
Team API include correct info when expanding users
2015-08-12 15:27:48 -04:00
Bill DeRusha
09acca2de8 Team API include correct info when expanding users TNL-2975
Create read-only serializer to handle User/UserProfile data
together.

Refactor GET accounts to use the new read-only joint serializer

Fix tests to check for new expanded user info

Update tests in teams/tests/test_views.py to test for both
public and private profiles on expands user

Update serializer to utilize the request object for creating absolute uris
2015-08-12 14:33:07 -04:00
Will Daly
ad9d9eb04e Support team UI for regenerating certificates
* Add new role for support staff.
* Move dashboard/support functionality into a new Django app called "support".
* Add support view for searching and regenerating certificates.
* Refactor certificates views into separate files.
2015-08-12 07:09:46 -07:00
Diana Huang
82eb1f6b74 Make status use ConfigurationModel instead. 2015-08-11 17:51:39 -04:00
Clinton Blackburn
58865ee0a8 Added API endpoints for CreditCourse
Endpoints support create, read, and list operations.

NOTE: This commit also includes a retrofitted SimpleRouter that supports overriding the lookup regex. This retrofit is simpler to implement than updating edx-ora2 which is pinned to DRF 2.3.x.

XCOM-524
2015-08-11 15:44:37 -04:00
Waheed Ahmed
5e2c2b1e93 Fixed course_id pattern regex.
PLAT-776
2015-08-11 13:36:07 +05:00
Kevin Falcone
891dab621f Merge pull request #9141 from Stanford-Online/aliang8/devstack-https
Deactivate HTTPS on devstack
2015-08-10 17:29:05 -04: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
Carson Gee
cb678b9c35 Merge pull request #8979 from mitocw/feature/cg/lti_provider_config
Additional configuration options for LTI provider feature.
2015-08-09 09:10:14 -04:00
Andy Armstrong
e845dda8b0 Enable teams and deprecate the advanced setting 2015-08-07 10:35:19 -04:00
cahrens
fd31c68404 Include coffee dependency files in discussion_js. 2015-08-07 09:14:11 -04:00
cahrens
e95e23faf1 Allow discussion vendor files to be bundled.
Improve client-side performance.
2015-08-07 09:14:11 -04:00
cahrens
68645db38b Reduce dependency on courseware_js.
TNL-2945
2015-08-07 09:14:06 -04:00
Ned Batchelder
ee0f4b2594 Remove 'pylint: disable=no-value-for-parameter' that we no longer need. 2015-08-03 15:44:29 -04:00
Sarina Canelake
db2d8f6594 Allow microsites to use logistration page (ECOM-1976) 2015-07-31 09:33:59 -04:00
Albert Liang
46434582c8 Deactivate HTTPS on dev and devstack
When running locally, XBlocks which access third-party software no longer
cause server errors.

Because devstack inherits from aws, the HTTPS flag was implicitly set to 'on'.
This meant that XBlocks attempted to use SSL when dealing with third-party
components like LTI.  Since SSL is not enabled on devstack, this caused server
errors whenever these features ran.
2015-07-30 13:22:33 -07:00
jsa
ba239125f1 disable course discovery feature by default in devstack. 2015-07-29 17:40:57 -04:00
Will Daly
47b81c9274 Allow users to submit initial verification at in-course checkpoints.
* Combine verification and reverification photo submission end-points.
* Combine verification and reverification Backbone models.
* Allow deletion of verification status in Django admin.
* Initial verification from a checkpoint is associated with the checkpoint.
* Fix critical bug in which an invalid link was sent to Software Secure
  for the photo ID image of reverification attempts.
2015-07-27 19:32:18 -07:00
muzaffaryousaf
38ef22b8a2 Using youtube api (v3) instead of v2 to get the video duration .
TNL-2413
2015-07-24 17:03:46 +05:00