Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,471 Commits 1 Branch 0 Tags
a2fa59cd4b6f37ed90dd83dff366912236da9ae3
Commit Graph

1161 Commits

Author SHA1 Message Date
Matt Drayer
a2fa59cd4b Merge pull request #10308 from edx/ziafazal/SOL-1332 
SOL-1332: use a generic function to check if entrance_exam feature is enabled or not
 2015-10-26 09:46:22 -04:00
Bill DeRusha
60fc3f5705 Conditionally show unenroll action based on certificat status 2015-10-23 14:59:17 -04:00
Zia Fazal
9bb6f6e88d use a generic function check if entrance_exam is enabled or not 2015-10-22 16:45:19 +05:00
Ned Batchelder
a0c25f88c3 Merge pull request #10279 from edx/ned/cleaner-django-meta 
No need for docstrings on "class Meta"
 2015-10-21 09:35:40 -04:00
Arbab Nazar
034ac1c808 Merge pull request #10271 from edx/arbab/enrollment-user-list 
take the list of users for enrolment change
 2015-10-21 08:24:48 -04:00
Ned Batchelder
322ca34b20 Remove pylint pragmas from "class Meta" 
Also remove useless docstrings where they were added to keep pylint
quiet.
 2015-10-21 07:37:00 -04:00
Sarina Canelake
105d611cc9 Create distinct terms for gender, education sign up terms 2015-10-20 18:55:51 -04:00
arbabnazar
85e67bea4a help updated 2015-10-20 15:37:09 -04:00
arbabnazar
b3e37e54ba remove the append action 2015-10-20 15:30:06 -04:00
arbabnazar
361035c098 change the help text 2015-10-20 14:51:18 -04:00
arbabnazar
c4dc624c7f take the list of users for enrolment change 2015-10-20 14:00:59 -04:00
Afeef Janjua
713689dffe invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit) 
Squashed commits:
[62dd3f1] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+2 squashed commits)
Squashed commits:
[4bfe22b] remove the delete case because there is none in current scenario
[802c259] moved the test case to user profile properties file

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[98d2415] added better log info message

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[62dd3f1] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+2 squashed commits)
Squashed commits:
[4bfe22b] remove the delete case because there is none in current scenario
[802c259] moved the test case to user profile properties file

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[eb32c9a] fixed the python quality issue of accessing protected fields
fixed the failing tests

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[4269e3b] disble protected access in pylint

invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[0246b1b] invalidate UserProfile.country cache when UserProfile is updated (+1 squashed commit)
Squashed commits:
[7c4fecf] invalidate UserProfile.country cache when UserProfile is updated
 2015-10-20 18:32:21 +05:00
Matt Drayer
1eab25f292 mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations 
* Fix paver violations to stablize edx-lint update
* Parens, Line2Long
* Fix missing docstrings
* Fix PEP8 issues
* Address PR feedback (thanks @nedbat!)
 2015-10-19 10:11:59 -04:00
Clinton Blackburn
17f0193362 Merge pull request #10044 from edx/merge-release-into-master 
Merging changes for hotfix/2015-10-05
 2015-10-05 16:11:31 -04:00
Bill DeRusha
fe23052511 Merge pull request #9979 from edx/bderusha/boardman-traffic 
Add IP to all python Segment tracking calls
 2015-10-05 14:55:55 -04:00
Clinton Blackburn
f967cfce8b Merged release to master 
Resolved conflicts from hotfix-2015-10-05
 2015-10-05 14:46:32 -04:00
Clinton Blackburn
0dba843608 Multiple credit fixes 
- Added support for Unicode characters when creating the signature
- Using <textarea> for form data to support newline characters
- Generating form with jQuery instead of relying on existing DOM element
- Removed duplicated credit request code
- Corrected spaing on dashboard
- Enabled functionality by default

Dashboard cleanup
-- Cleaned styles
-- Added wrapper class to use for hiding the actions
-- Cleaned JS toggling of error container
-- Corrected dashboard and receipt text

ECOM-2172
 2015-10-05 09:35:10 -04:00
David Baumgold
0219e18fa8 Merge pull request #10023 from edx/release 
Release into master
 2015-10-02 12:58:50 -04:00
Bill DeRusha
ca6633bd98 Add IP to all python Segment tracking calls 2015-10-01 21:21:16 -04:00
Bill DeRusha
bcb71a3255 Rename SEGMENT_KEY to have a unique key name for both CMS and LMS 2015-10-01 19:40:27 -04:00
Awais Qureshi
c486f857ca Merge pull request #9881 from edx/awais786/ECOM-1988-upgrade-msg-with-credit-mode 
Hide upgrade message on student dashboard for credit enrollments
 2015-09-30 12:51:38 +05:00
Awais
0ca586f65b If enrollment mode is credit then upgrade message should not appear. 
Fixing certificates for credit mode.
ECOM-1988
 2015-09-29 20:56:32 +05:00
Bill DeRusha
c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY 2015-09-24 11:49:03 -04:00
Bill DeRusha
d75a36a347 Merge pull request #9853 from edx/bderusha/mailchimp-sync 
Add mailchimp list fields and config for new users
 2015-09-23 12:44:57 -04:00
Bill DeRusha
ccc43cfe98 Add mailchimp list fields and config for new users 2015-09-22 10:24:24 -04:00
Clinton Blackburn
8cd297ec08 Merge pull request #9816 from edx/clintonb/admin-updates 
Additional Admin Updates
 2015-09-21 15:34:02 -04:00
muhammad-ammar
6a5ce5d544 Upgrade factory_boy 
TNL-3179
 2015-09-18 18:02:38 +05:00
Clinton Blackburn
f7a7cce881 Using a better admin interface for UserProfiles 
This interface should actually be useful as it doesn't attempt to load all users on the edit page.

ECOM-2172
 2015-09-17 15:51:16 -04:00
Clinton Blackburn
d0a4284893 Corrected read-only field display for CourseEnrollment admin 
Read-only fields are read-only for existing models. These values can be set when creating new models.

ECOM-2172
 2015-09-17 15:49:15 -04:00
Dennis Jen
305f88f646 Merge pull request #9488 from edx/dsjen/courses-via-overview 
Optimize OpenID Course Claims for users.
 2015-09-17 13:35:49 -04:00
Dennis Jen
844edac443 Optimize OpenID Course Claims for users. 
- Course overviews will cache courses upon publish.
- Added management command to warm up cache.
- OAuth2 handler returns courses via course overviews.
 2015-09-17 11:29:28 -04:00
Clinton Blackburn
70866104bf Merge pull request #9790 from edx/clintonb/enrollment-admin 
Built a better course enrollment admin
 2015-09-16 17:28:34 -04:00
John Eskew
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
Clinton Blackburn
7625c6eec3 Built a better course enrollment admin 2015-09-16 14:28:58 -04:00
Max Rothman
628eb86654 Merge pull request #9558 from edx/max/set-superuser 
Add management command for granting superuser access
 2015-09-16 10:59:37 -04:00
Chris Dodge
410d692090 fix error where users who received a no-id-professional certificate did not get a link on his/her dashboard to download the PDF 2015-09-14 11:49:35 -04:00
Max Rothman
5923675c35 Add management command for granting superuser access 2015-09-11 15:43:21 -04:00
Tasawer
02d4606e57 Fixing IntegrityError happened on concurrent requests for course enrollment 
ECOM-1730
 2015-09-10 10:51:14 +00:00
William Ono
4d1194800e Support LTI third-party-auth providers 
PR #8930
 2015-09-03 22:53:45 -07: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
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
Tasawer
07148c6350 Removing experimental logistration endpoints 
ECOM-1017
 2015-08-27 06:21:47 +00: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
Tasawer
cefe0daa74 Updating validation error message on signup page. 
ECOM-1956
 2015-08-19 12:50:12 +05:00
Waheed Ahmed
f1af5b5c29 Fixed admin course access role required field value not populating. 
TNL-3049
 2015-08-17 19:22:06 +05: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
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
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
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