Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
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
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
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
Adam Palay
4bb4efe9d9 Merge remote-tracking branch 'origin/release' into rc/2015-06-29 
Conflicts:
	requirements/edx/github.txt
 2015-06-29 16:55:57 -04:00
Adam Palay
61431015c2 update xblock only to mark field values as dirty if they've changed (TNL-2475) 
force save "download_video" field if not set

set timezone to UTC explicitly
 2015-06-29 14:28:45 -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
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
Jonathan Piacenti
412f120547 Make resetting of attempts and student state on blocks recursive. 2015-06-29 13:08:01 +00:00
Awais
b8e04f30a1 ECOM-1597 adding signals to update min-grade requirement. 2015-06-29 15:01:19 +05:00
Zia Fazal
bcbd1464d4 New course cannot be started till web certificate is active 
fixed broken test

changes based on feedback on 6/24

fixed broken unit test after feedback changes

added more checks and updated tests

fixed broken bok choy test

Fixed pylint quality error

trying to fix pylint quality error
 2015-06-29 12:53:21 +05:00
Sarina Canelake
e83e88172b Don't i18n test files 2015-06-26 17:50:21 -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
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
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
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
Sarina Canelake
9f46d9f0c5 Regression test: dark lang stays set through multiple pages 2015-06-26 13:15:44 -04:00
Sarina Canelake
cf80c96f0b Add i18n roundtrip regression tests for language pref and dark lang 
Tests would have caught issues raised in LOC-87
 2015-06-26 13:15:44 -04:00
Sarina Canelake
5fcdafd0cf Add i18n regression tests (LOC-72, LOC-85) 2015-06-26 13:15:42 -04:00
Calen Pennington
ba971db1ba Merge pull request #8594 from cpennington/pass-xblock-parents 
Pass xblock parents
 2015-06-26 12:15:41 -04:00
Matt Drayer
700eb8b702 mattdrayer/fix-progress/template: Improved web certificates support 2015-06-26 10:43:26 -04:00
Muhammad Shoaib
0442e70072 PHX-40 added the sorting of the most popular coupon codes used. 2015-06-26 00:35:24 +05:00
Calen Pennington
fdf81042f5 Pass XBlock parents down to their children when constructing them, for caching 2015-06-25 13:59:46 -04:00
Calen Pennington
324d4785c1 Include stack traces when counting calls in unit tests 2015-06-25 13:58:00 -04:00
Nimisha Asthagiri
8b5e5c5910 Merge branch 'release' 2015-06-25 13:11:41 -04:00
Utkarsh
091dc4c3aa Merge pull request #8650 from edx/utkjad/platform-eusc 
Moving xblock_user_state to edx-user-state-client, and add dependency to edx-platform
 2015-06-25 11:05:17 -04:00
Andy Armstrong
aa76d9482a Update Bok Choy to use optimized static assets 
TNL-2465
 2015-06-25 09:58:27 -04:00
Utkarsh
dac018f459 Adding dependency for edx-user-state-client 2015-06-25 03:10:50 +00:00
Will Daly
75d194e279 Update credit eligibility 
* Update credit eligibility when a user satisfies an eligibility requirement.
* Refactor set_credit_requirement_status arguments.
* Use django-simple-history to track requirement status changes.
* Refactor progress page by moving credit into a helper function and adding comments.
 2015-06-24 15:19:27 -07:00
Marco Morales
2dfca626a7 Merge pull request #8151 from edx/marco/capa-styling 
Updated styling for basic capa problems (multiple choice, dropdown, checkboxes, numerical input and text input) including support for mobile app experience.
 2015-06-24 09:05:34 -04:00
Christopher Lee
13dbfb8679 Merge pull request #8589 from edx/gprice/discussion-api-abuse-flagged 
Add abuse flagging to discussion API
 2015-06-23 18:08:58 -04:00
Greg Price
52a3306e2a Add abuse flagging to discussion API 
Flagging/unflagging is done by issuing a PATCH request on a thread or
comment endpoint with the "abuse_flagged" field set.
 2015-06-23 17:22:54 -04:00
Christine Lytwynec
9d42971440 Merge pull request #8646 from edx/clytwynec/fix-TestEmailMessageWithCustomICRVBlock 
don't use hardcoded date in verification email test
 2015-06-23 17:01:51 -04:00
Christopher Lee
9d6d922e68 Merge pull request #8544 from edx/gprice/discussion-api-thread-list-following 
Add followed thread retrieval to discussion API
 2015-06-23 16:08:51 -04:00
Christine Lytwynec
f81e373bd4 don't use hardcoded date in verification email test 2015-06-23 14:33:25 -04:00
Nickersoft
e184c78c0a XCOM-416: Embargo restrictions are now enforced during logistration 2015-06-23 14:17:43 -04:00
Greg Price
54756317f1 Add followed thread retrieval to discussion API 
This implements the "following" value for the "view" query parameter on
the thread list endpoint.
 2015-06-23 13:38:34 -04:00
Calen Pennington
de142b2b51 Set a minimum number of Xblock constructions in field override tests 2015-06-23 13:32:50 -04:00
Diana Huang
ecd237396e Merge pull request #8617 from edx/diana/course-tab-cleanup 
Switch tabs to use ugettext_noop for titles.
 2015-06-23 12:33:06 -04:00
Diana Huang
e6cbff47b7 Switch tabs to use ugettext_noop for titles. 2015-06-23 11:08:41 -04:00
Kyle McCormick
aa5e2f49bd Fixes tests, adds internationalized strings for new state tooltips, corrected tooltip javascript, etc. 2015-06-23 10:27:22 -04:00
Kyle McCormick
d84c3bd7a9 MA-776 change UserCourseEnrollmentsList endpoint to use course_overviews 2015-06-22 18:33:12 -04:00
Renzo Lucioni
f78d45080d Correct logistration GET parameter preservation test case 2015-06-22 16:25:52 -04:00
Sarina Canelake
e7cbcfff20 Merge pull request #8618 from edx/sarina/revert-8402 
Revert "Merge pull request #8402 from edx/sarina/annotate-middleware"
 2015-06-22 16:05:49 -04:00
Matt Drayer
f0f3766443 mattdrayer/ECOM-1773: Fixed invalid URL reversal 2015-06-22 14:04:43 -04:00
Sarina Canelake
1e21945e22 Revert "Merge pull request #8402 from edx/sarina/annotate-middleware" 
This reverts commit 09425c3d8f, reversing
changes made to 410b9282af.
 2015-06-22 13:55:53 -04:00