Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
31,222 Commits 1 Branch 0 Tags
890cd6a47028a7e266d5739e13bb451cea55ebca
Commit Graph

31222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Fogg
890cd6a470 Add grading spec tests. 2015-07-01 09:08:39 -04:00
Peter Fogg
46ea862f04 Fix not being able to set course passing grades above 80%. 2015-07-01 09:08:39 -04:00
Ahsan Ulhaq
36e31e10e4 Merge pull request #8687 from edx/ahsan/ECOM-1782-Order-Credit-Eligibility-line-items-progress-page 
Order of Credit Eligibility line items
 2015-07-01 14:45:33 +05:00
Ahsan Ulhaq
7787974dd5 Order of Credit Eligibility line items 
Displayed eligibility line items on the Progress page of a Credit course
in the order of appearance in the courseware.

ECOM-1782
 2015-07-01 13:40:39 +05:00
Clinton Blackburn
1ee3094dd3 Merge pull request #8670 from edx/clintonb/course-mode-api 
Added Courses endpoint for Commerce API
 2015-06-30 23:29:55 -04:00
Clinton Blackburn
45de93a250 Added course endpoints for Commerce API 
XCOM-314
 2015-06-30 22:36:47 -04:00
Renzo Lucioni
39dadb57f0 Merge pull request #8698 from edx/renzo/fulfillment-logging 
Improve logging of ecommerce interactions
 2015-06-30 21:31:41 -04:00
Sarina Canelake
5f95226b00 Merge pull request #8731 from Stanford-Online/aliang8/missing-comma 
Add missing comma to tuple
 2015-06-30 18:20:02 -04:00
Renzo Lucioni
d330831871 Improve logging of ecommerce interactions 
Adds standardized audit logging for checkout and enrollment change requests. XCOM-427.
 2015-06-30 17:34:16 -04:00
Albert Liang
fe19d0cc7e Add Albert Liang to AUTHORS 2015-06-30 14:17:14 -07:00
Albert Liang
4b332bfcf0 Add missing comma to tuple 
Currently, Python implicitly concatenates two string entries located next to
each other because there is no comma separating them.  The code concatenates
"*.pyc" and "sass/*.scss", creating a single entry called "*.pycsass/*.scss".
 2015-06-30 14:02:07 -07:00
Braden MacDonald
e145d7f855 Merge pull request #8699 from open-craft/sso-a11y 
Improve screen reader user experience on logistration page
 2015-06-30 11:11:38 -07:00
David Baumgold
a9c67c562e Merge pull request #8527 from edx/db/ensure-noseids-dir-exists 
Ensure noseid dir exists when running tests
 2015-06-30 10:03:56 -04:00
Muhammad Ammar
06a1486934 Merge pull request #8450 from edx/ammar/tnl2303-course-outline-ora1-warning-message 
Display message on course outline in Studio when course contains ORA 1
 2015-06-30 15:04:02 +05:00
muhammad-ammar
b0eda4cac9 Display warning message on course outline in Studio when course contains deprecated features/components 
TNL-2303
 2015-06-30 13:26:18 +05:00
Braden MacDonald
49d200c7ec Improve screen reader user experience on logistration page 2015-06-29 14:38:41 -07:00
Alison Hodges
1a9a69829a Merge pull request #8712 from edx/ahodges/template_typo 
Fixes DOC-1957
 2015-06-29 17:00:28 -04:00
Alison Hodges
caa6a07d15 Fixes DOC-1957 2015-06-29 13:48:11 -04:00
Christopher Lee
a26b00ba41 Merge pull request #8656 from edx/gprice/discussion-api-set-group-id 
Allow group_id to be set in discussion API
 2015-06-29 12:02:29 -04:00
Awais Qureshi
1aa074da8a Merge pull request #8606 from edx/awais786/ECOM-1597-min-grade-update-with-signals 
Awais786/ecom 1597 min grade update with signals
 2015-06-29 20:26:34 +05:00
Greg Price
b8576e74d6 Allow group_id to be set in discussion API 
This also fixes two bugs:
* A thread created by a non-privileged user in a cohorted course would
  not have group_id set
* Any user could set the endorsed field on creation of a comment
 2015-06-29 11:08:03 -04:00
Christina Roberts
1e8ebc807d Merge pull request #8705 from edx/christina/delete-dead-code 
Delete unused student_profile code (WIP profile).
 2015-06-29 09:43:29 -04:00
cahrens
a4da143ca6 Delete unused student_profile code (WIP profile). 2015-06-29 08:56:11 -04:00
Sarina Canelake
0b42c7724f Merge pull request #8701 from edx/sarina/20150628-update-translations 
Update translations (autogenerated message)
 2015-06-29 08:49:39 -04:00
Sarina Canelake
bd37853e45 Update translations (autogenerated message) 2015-06-29 08:42:06 -04:00
Sarina Canelake
13dc7ed485 Fix i18n paver command wrt cleanup 2015-06-29 08:23:14 -04:00
Sarina Canelake
65d68a888f Merge pull request #8694 from edx/sarina/default-OpenedX-no-search 
Set Courseware Search to False in default devstack, because it doesn't work.
 2015-06-29 07:45:34 -04:00
Davorin Šego
fe9887a99c Merge pull request #8389 from edx/dsego/SOL-734 
Make header & footer responsive
 2015-06-29 13:15:13 +02:00
Davorin Sego
2c22a4d879 Responsive Homepage Hero, Header, Footer 2015-06-29 12:14:55 +02:00
dino-cikatic
f5275a54e8 Merge pull request #8575 from edx/dcikatic/fix-search-engine-set 
Fix SEARCH_ENGINE set logic in settings files
 2015-06-29 12:06:39 +02:00
Awais
b8e04f30a1 ECOM-1597 adding signals to update min-grade requirement. 2015-06-29 15:01:19 +05:00
Sarina Canelake
614bcafb7c Merge pull request #8696 from edx/sarina/update-i18n-tools 
Update i18n-tools to latest version LOC-67
 2015-06-28 04:16:16 -04:00
Sarina Canelake
e83e88172b Don't i18n test files 2015-06-26 17:50:21 -04:00
Sarina Canelake
ed51fe0d74 Update i18n-tools to latest version 2015-06-26 17:29:25 -04:00
Braden MacDonald
072ae99d12 Merge pull request #8140 from edx/feature/shibboleth-tpa 
Feature: Shibboleth/SAML SSO
 2015-06-26 14:17:24 -07:00
David Ormsbee
936256715d Merge pull request #8620 from mcgachey/lti-deployment 
[LTI Provider] Added an authentication backend to log in LTI users
 2015-06-26 17:16:52 -04:00
Diana Huang
42d8091b49 Merge pull request #8688 from edx/diana/polling-cleanup 
Clean up capa polling to have exponential backoff
 2015-06-26 17:00:53 -04:00
Braden MacDonald
cf308d87b9 New Hinted Login View - PR 8591 2015-06-26 13:24:01 -07:00
Braden MacDonald
7437bcfe12 New provider config options, New Institution Login Menu - PR 8603 2015-06-26 13:24:01 -07:00
Braden MacDonald
5bf0b1794d Bump python-social-auth and python-same to upstream's latest master - PR 8599 2015-06-26 13:24:00 -07:00
Braden MacDonald
00226bf3c0 Asynchronous metadata fetching using celery beat - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
cd941eada7 New SAML/Shibboleth tests - PR 8518 2015-06-26 13:24:00 -07:00
Braden MacDonald
b4904adc1e Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155 2015-06-26 13:23:59 -07:00
Braden MacDonald
caca3e1bdf SAML2 third_party_auth provider(s) - PR 8018 2015-06-26 13:23:59 -07:00
Chris
454986a029 Merge pull request #7589 from jolyonb/jbloomfield/printing-checkmarks 
Making background pictures printable
 2015-06-26 16:20:34 -04:00
Diana Huang
254d6c6821 Put a timeout on poling for codeinput and matlab problems. 2015-06-26 15:29:49 -04:00
Sarina Canelake
c7c11f2e4b Set Courseware Search to False in default devstack, because it doesn't work 2015-06-26 15:21:39 -04:00
Sarina Canelake
2942846afe Merge pull request #8667 from edx/sarina/update-middleware-LOC-87 
Fix dark lang and django.middleware.locale behaviors
 2015-06-26 15:17:32 -04:00
Sarina Canelake
e485e5ee24 Dark language should stay set until explicitly cleared. 
Adds a temporary user_preference key, DARK_LANGUAGE_KEY, to hold the user's dark lang preference.
This preference key is deleted when ?clear-lang is placed in query params.
 2015-06-26 13:41:14 -04:00
Phil McGachey
18734cf0a1 [LTI Provider] Added an authentication backend to log in LTI users 
This change adds a Django authentication backend which, when installed
will authenticate users based on their LTI identity rather than using
a username/password combination. The authentication method determines
first whether a user with the given username exists and, if so, whether
that user is associated with an LTI identity. It also verifies that
the LTI consumer and user ID passed to the LTI launch match those
stored in the LtiUser table. This will always be the case if the
authentication backend is reached through the LTI code, but it
provides an extra guarantee if the backend is called from elsewhere.
 2015-06-26 13:25:13 -04:00