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

14265 Commits

Author SHA1 Message Date
Matt Drayer
289ec980a5 mattdrayer/update-num-queries-check: Modify value to reflect improved workflow(s) 2015-07-02 18:03:57 -04:00
Matt Drayer
1ca37737e9 Merge pull request #8566 from edx/ziafazal/SOL-980 
ziafazal/SOL-980: Generate certificates from instructor dashboard
 2015-07-02 16:07:33 -04:00
Will Daly
bfe01605b4 Merge pull request #8700 from edx/will/remove-provider-course-m2m-relation 
Credit eligibility/provider refactor
 2015-07-02 12:36:37 -07:00
Zia Fazal
611d16b25a ziafazal/SOL-980: Generate certificates from instructor dashboard 
* added generate certificates task and bok choy tests
* added unit tests
* changes based feedback and improved acceptance test
* Change header text
* changes based on feedback on 24/6
* added task_id to api output
* fixed broken test
* Remove "Instructor" from strings, per Docs team
* Fixed flaky entrance exam test
 2015-07-02 14:32:36 -04:00
Matt Drayer
4526b929b0 Merge pull request #8491 from edx/mattdrayer/fix-progress-template 
mattdrayer/SOL-1018: Fixed progress template for better web certificates support
 2015-07-02 13:51:49 -04:00
Ali Mohammad
eb70f2303c Merge pull request #8749 from edx/rc/2015-06-29 
Merge back into master
 2015-07-02 13:34:42 -04:00
Will Daly
e2acf3ab87 Credit eligibility/provider refactor 
* Remove m2m relation between credit course and credit providers.
* Separate eligibility and provider APIs into different modules.
* Add API call for retrieving a user's eligibilities.
* Cache credit course list.
* Style the dashboard purchase button.
* Display a link for the credit provider on the dashboard.
* Add analytics events for clicks on the purchase button.
* Expose more credit models to Django admin and add search functionality.
 2015-07-02 10:03:52 -07:00
Alison Hodges
9f08e78705 fixed trailing white space errors 2015-07-02 10:52:37 -04:00
zubair-arbi
e369939b4b change redirect url from '/accounts/login' to '/login' 
ECOM-1734
 2015-07-02 18:44:10 +05:00
Alison Hodges
8ccc27b427 fix pep8 violations 2015-07-02 09:15:05 -04:00
Alison Hodges
7410286104 Fixed pylint line-too-long violations 2015-07-01 15:23:15 -04:00
Alison Hodges
e473022c91 Additional references to "Pending Instructor Tasks" changed 2015-07-01 12:49:59 -04:00
Akiva Leffert
07fda73ffa Remove border from chromeless xblock 
JIRA: https://openedx.atlassian.net/browse/MA-972
 2015-07-01 12:11:15 -04:00
Kelketek
c676bf0460 Merge pull request #8679 from open-craft/recursive_state_reset 
Make resetting of attempts and student state on blocks recursive. (SOL-858)
 2015-07-01 10:05:42 -05:00
Chris Dodge
b741ce786b fix python unit tests 2015-07-01 13:46:55 +02:00
Marco Morales
b9ed758246 Initial syles cleanup and changes for course discovery on openedx 2015-07-01 13:46:54 +02:00
Zia Fazal
ad1f4951fc get_certificate_url should return certificate download_url in case of non html certificates 2015-07-01 16:14:37 +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
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