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

2652 Commits

Author SHA1 Message Date
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
William Ono
4d1194800e Support LTI third-party-auth providers 
PR #8930
 2015-09-03 22:53:45 -07:00
Calen Pennington
821cc59415 Merge master into release-2015-09-02, leaving conflicts 2015-09-03 16:36:56 -04:00
Afzal Wali Naushahi
f80720d09e Merge pull request #9541 from edx/afzaledx/extending_auto_auth_for_verified_users 
Added the ability to change the enrollment mode in the auto_auth API
 2015-09-02 23:27:36 +05:00
Afzal Wali
257aaaee83 Added the ability to change the enrollment mode in the auto_auth API (used for bokchoy and load tests). 
Modified some tests to use the modified API.

Quality

Quality

Updated the comment.

Quality
 2015-09-02 19:05:34 +05:00
Adam Palay
f099a7e911 fix issue where video player renders twice (TNL-3064) 2015-09-01 15:11:31 -04:00
Tasawer
cd69ca2b23 Removed unused url endpoints + fixed broken tests 
ECOM-1017
 2015-08-31 12:50:08 +00:00
Matt Drayer
a8cc585021 Merge pull request #9498 from edx/ziafazal/MAYN-86 
MAYN-86: Use microsite platform_name and email_from_address if available
 2015-08-28 10:37:28 -04:00
Zia Fazal
f6ec9360e3 Use microsite platform_name and email_from_address if available 
fixed broken test

fixes for broken tests
 2015-08-28 15:24:26 +05:00
Braden MacDonald
586c237543 Fix for Twitter compatibility 2015-08-27 11:19:39 -07:00
Peter Fogg
5d26938158 Merge pull request #9366 from edx/peter-fogg/team-signals 
Add signals for user's discussion activity.
 2015-08-27 14:07:29 -04:00
Christina Roberts
df76994ea5 Merge pull request #9415 from edx/christina/insensitive-check 
Do a case insensitive check for conflicts to improve performance.
 2015-08-27 12:57:29 -04:00
cahrens
41ac90fa7a Use team name prefix and UUID for team_id. 
TNL-3107
 2015-08-27 11:22:35 -04:00
Tasawer
07148c6350 Removing experimental logistration endpoints 
ECOM-1017
 2015-08-27 06:21:47 +00:00
David Ormsbee
ff62a8eaaa Merge branch 'release' into release-2015-08-26-conflict 2015-08-26 14:28:35 -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
Braden MacDonald
79a075328f Allow configuring sensitive third_party_auth settings via lms.auth.json 2015-08-25 16:35:35 -04:00
David Ormsbee
83c91e244c Convert Shib external auth test to use SharedModuleStoreTestCase. 2015-08-25 08:56:16 -04:00
zubair-arbi
ec28a75f14 In-course reverification access control 
* Automatically create user partitions on course publish for each ICRV checkpoint.
* Disable partitions for ICRV checkpoints that have been deleted.
* Skip partitions that have been disabled when checking access.
* Add verification access control UI to visibility settings.
* Add verification access control UI to sequential and vertical settings.
* Add partition scheme for verification partition groups.
* Cache information used by verification partition scheme and invalidate the cache on update.
* Add location parameter to UserPartition so the partition scheme can find the associated checkpoint.
* Refactor GroupConfiguration to allow multiple user partitions.
* Add special messaging to ICRV for students in the honor track.

Authors: Zubair Arbi, Awais Qureshi, Aamir Khan, Will Daly
 2015-08-20 08:43:55 -07:00
Ned Batchelder
0fed2f5987 Merge pull request #9364 from edx/ned/django-1-4-22 
Upgrade Django to 1.4.22
 2015-08-19 15:06:16 -04:00
Ned Batchelder
9f92054ca7 Fix tests to work with Django 1.4.22 
The 1.4.22 security fix makes it so that empty sessions are not written.
To keep the tests working, we now log in the user, so that some data is
saved to the session.
 2015-08-19 11:05:41 -04:00
Brian Beggs
9e31193100 Merge pull request #9295 from edx/bbeggs/ensure-indexes-PLAT-785 
Adding django admin command to create mongodb indexes
 2015-08-19 10:17:42 -04:00
Tasawer
cefe0daa74 Updating validation error message on signup page. 
ECOM-1956
 2015-08-19 12:50:12 +05:00
Clinton Blackburn
207ce4eda5 Resolved decompression errors during tests 
Note that this change will require deleting all CourseStructure data. This data should be regenerated using the generate_course_structure management command.

XCOM-513
 2015-08-18 10:25:09 -04:00
Brian Beggs
c71d61e533 Adding django command to create mongodb indexes 2015-08-17 17:05:27 -04:00
Waheed Ahmed
f1af5b5c29 Fixed admin course access role required field value not populating. 
TNL-3049
 2015-08-17 19:22:06 +05: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
Zia Fazal
2467d6971f ziafazal/SOL-1044: Database-Driven Certificate Templates 
* added certificate template model
* added certificate template asset model
* added django admin configs and migration
* initial LMS template matching logic
* improved LMS template matching
* improved LMS template matching and rendering logic
* address Django admin form/model load order incongruence
* add missing unique constraint migration.
 2015-08-13 08:01:34 -04:00
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release 
Release
 2015-08-12 13:06:39 -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
Brandon DeRosier
34526ddf6a Revert "Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment"" 
This reverts commit 42e78463a7.
 2015-08-11 13:03:58 -04:00
Peter Fogg
344ff8c1bc Merge pull request #9267 from edx/release 
2015-08-11 release
 2015-08-11 12:07:21 -04:00
Waheed Ahmed
5e2c2b1e93 Fixed course_id pattern regex. 
PLAT-776
 2015-08-11 13:36:07 +05: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
Peter Fogg
42e78463a7 Revert "Merge pull request #8986 from jazkarta/remove-ccx-enrollment" 
This reverts commit 53db053c18, reversing
changes made to 386a8a27dd.
 2015-08-07 16:59:56 -04:00
stv
d7c87221da Remove Stanford branding from external_auth view 
We're already running a version of this, with the default Stanford
address removed, so the community shouldn't be running it either.
 2015-08-07 12:50:25 -07: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
Jim Abramson
0e3be9de80 Merge pull request #9123 from edx/jsa/xcom-442 
Add historical course enrollment table.
 2015-08-03 17:06:24 -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
Peter Pinch
53db053c18 Merge pull request #8986 from jazkarta/remove-ccx-enrollment 
Use the standard enrollment table instead of a custom CCX table for CCX enrollments
 2015-08-03 13:18:41 -04:00
Will Daly
eaeb3256ab Merge pull request #9158 from edx/release 
Merging hotfix 2015-07-30 release back to master
 2015-08-03 08:42:28 -07:00
Carlos de la Guardia
458ed0a64e Use the standard enrollment table instead of a custom CCX table for CCX 
enrollments.

The goal for this PR is to have a single mechanism for registering users and
reducing the number of places where special-casing for ccx courses is needed. The
migration at this point is purposefully limited to convert ccx memberships into
student enrollments when moving forward. No backward migration is in place at the
moment. The ccx membership tables are not removed at this time. It is possible to go
backwards and forwards multiple times with no errors or data loss.
 2015-08-01 02:59:10 -05:00
Christina Roberts
b06e46c1db Merge pull request #9113 from edx/christina/team-discussion-permissions 
Christina/team discussion permissions
 2015-07-31 12:32:30 -04:00
Renzo Lucioni
50f920be3c Merge pull request #9135 from edx/renzo/always-allow-unenrollment 
Allow enrollments in expired modes to be deactivated
 2015-07-31 09:23:34 -04:00
Diana Huang
c12c2933a7 Make context for threads more implicit. 2015-07-31 08:58:01 -04:00
Braden MacDonald
659db2eb7d Merge pull request #9125 from open-craft/sso-metadata-email-config 
SSO: Make email addresses in SAML metadata fully configurable
 2015-07-30 13:59:49 -07:00
aamir-khan
a59be0f7f4 ECOM-1947: updated the middleware to exclude the password strings from event logging 2015-07-30 11:52:07 -07:00
Renzo Lucioni
4131aa4d38 Allow enrollments in expired modes to be deactivated 
Facilitates revocation of enrollments in expired modes. XCOM-490.
 2015-07-30 12:39:25 -04:00