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

139 Commits

Author SHA1 Message Date
Will Daly
05ea62fb78 Fix credit requirement "criteria" name 
The CreditRequirement "configuration" field was renamed in Django
code without updating the migration.  This commit adds a second
migration to delete the incorrect field and add a new field.
The credit feature is currently disabled in production, so
the model isn't currently used by application code.
 2015-05-29 08:22:45 -04:00
aamir-khan
97b5ff7e8b ECOM-1590: added the min_grade as a requirements 2015-05-28 12:28:38 +05:00
Awais
2599445190 ECOM-1590 adding models for credit eligibility. 2015-05-20 14:18:37 +05:00
Ned Batchelder
e97b94bde2 Merge pull request #8060 from edx/ned/add-supers 
Add super() calls to setUp/tearDown that are missing them
 2015-05-15 12:29:14 -04:00
muzaffaryousaf
cae5623fd9 Updating the django-countries version to support sorting. 
Adding the pyuca to support sorting in differnet languages.

TNL-2047
 2015-05-15 17:07:14 +05:00
Ned Batchelder
78e9445aa1 Add super() calls to setUp/tearDown that are missing them 
Also, I replaced a number of tearDown methods with addCleanup instead.
And also remove some unneeded patch.stopall() calls.
 2015-05-14 18:14:21 -04:00
Daniel Friedman
3acd7a008c Refactor and add tests for new grade report. 
* Handle grading errors
 2015-05-13 06:58:02 -04:00
Daniel Friedman
9269ec3b00 Add new instructor task for weighted problems 2015-05-12 16:32:00 -04:00
Greg Price
1f03a4df95 Merge pull request #7966 from edx/gprice/discussion-api-thread-list-more-fields 
Add fields to threads returned by Discussion API thread list endpoint
 2015-05-12 13:45:18 -04:00
Greg Price
7ce579c274 Add group fields to thread list endpoint 2015-05-11 15:59:35 -04:00
Mark Hoeber
9e82d305d2 Adds preferences API and updates users to V1 with PEP8 fixes 2015-05-11 15:15:14 -04:00
Ben Patterson
937a16e589 Revert "Adds preferences API and updates users to V1" 2015-05-11 12:31:38 -04:00
Mark Hoeber
00184b83af Merge pull request #7862 from edx/markhoeber-doc1820 
Adds preferences API and updates users to V1
 2015-05-11 10:43:10 -04:00
Mark Hoeber
14ea62b3ec User preferences API doc 2015-05-11 10:42:35 -04:00
Ned Batchelder
24e0c2c80f Run pylint on all our code, and only our code. TE-855 
With the old logic, we weren't running pylint on openedx at all.  We
were also running it on lms/lib/comment_client twice, and on the
installed xblock third-party library.
 2015-05-04 15:23:55 -04:00
Will Daly
f6e8ce24af Merge pull request #7879 from edx/will/restore-remember-me 
Add remember me checkbox back to the combined login/registration page
 2015-05-01 09:57:45 -04:00
Will Daly
05baddb2a6 Add remember me checkbox back to the combined login/registration page 2015-04-30 17:13:03 -04:00
Adam
af3519ce15 Merge pull request #7835 from edx/release 
Release (DO NOT MERGE)
 2015-04-30 16:24:47 -04:00
Ned Batchelder
777be12ada Add missing __init__.py files 2015-04-30 07:43:08 -04:00
Andy Armstrong
f439a09e71 Obey microsite configuration for default profile image 
TNL-2073
 2015-04-27 15:04:51 -04:00
muhammad-ammar
cfcb38c498 Update user message strings 2015-04-17 17:23:19 -04:00
Andy Armstrong
17392ef3bf Code review feedback and test cleanup. 2015-04-17 17:23:19 -04:00
Andy Armstrong
7742735fb0 Event on user preference updates 
TNL-1851
 2015-04-17 17:23:19 -04:00
cahrens
9907cb5251 Tests for profile image eventing. 2015-04-17 17:23:18 -04:00
cahrens
4797a74e5c Emit events for language proficiencies from the update_account_settings method. 2015-04-17 17:23:18 -04:00
Daniel Friedman
97c43adaa4 Track user settings changed events on User save 2015-04-17 17:23:18 -04:00
Diana Huang
3f20a6f304 Add model change event tracking to UserProfile. 2015-04-17 17:23:18 -04:00
Andy Armstrong
c3a39934a0 Limit the size of the user profile's "bio" field 
TNL-1990
 2015-04-17 17:23:16 -04:00
Andy Armstrong
6c3b94d249 Bump User API and Profile Images API to v1 
TNL-1669
 2015-04-17 17:23:13 -04:00
jsa
a37166c3be remove catchall exception handling in profile image api 2015-04-17 17:23:13 -04:00
jsa
bb2599cecd Include profile image version in URLs. 
TNL-1860
 2015-04-17 17:23:13 -04:00
Daniel Friedman
23f02d9492 Configurations for filesystem and s3 backends. 
TNL-1789
 2015-04-17 17:23:13 -04:00
Daniel Friedman
44c78c609c Add logging to image uploads/deletes. 
Conflicts:
	openedx/core/djangoapps/profile_images/views.py
 2015-04-17 17:23:13 -04:00
Andy Armstrong
c898e4137b Add default profile images 
TNL-1796
 2015-04-17 17:23:12 -04:00
jsa
46b63164a0 Implement profile_image upload and remove endpoints 
TNL-1537

Co-Authored-By: Andy Armstrong <andya@edx.org>
Co-Authored-By: cahrens <christina@edx.org>
 2015-04-17 17:23:12 -04:00
Daniel Friedman
97e44ed20f Implement language proficiencies. 
TNL-1488
 2015-04-17 17:23:12 -04:00
Daniel Friedman
4125bf96d6 Add documentation for is_active and profile_image 2015-04-17 17:23:12 -04:00
Andy Armstrong
e710a5b2d0 Implement parental controls for the User API 
TNL-1739
 2015-04-17 17:23:12 -04:00
Andy Armstrong
650a9a9b85 Implement parental controls for user profiles 
TNL-1606
 2015-04-17 17:23:11 -04:00
Daniel Friedman
8e08ff52ff Rebase cleanup 2015-04-17 17:23:11 -04:00
Daniel Friedman
6f6fdbfb5f Integrate profile images into Accounts API 
TNL-1545
 2015-04-17 17:23:11 -04:00
cahrens
fad63938e5 New bio field in UserProfile. 2015-04-17 17:23:11 -04:00
Jesse Zoldak
5b93992ecb Fix trailing whitespace issues 2015-04-02 16:32:22 -04:00
Mark Hoeber
b78f25c8d1 Platform API Documentation 2015-04-01 16:04:50 -04:00
zubair-arbi
d0126959fc change education level option label to read "Associate" degree 
ECOM-579
 2015-03-31 13:31:16 +05:00
Adam
dad4b673e2 Merge pull request #7505 from edx/release 
Release
 2015-03-27 16:46:33 -04:00
Clinton Blackburn
9a8ecc65a7 Removed invalid kwarg 2015-03-27 10:37:04 -04:00
Christina Roberts
3f07660d27 Merge pull request #7454 from edx/andya/user-api-transaction-handling 
Clean up transactional behavior in User API
 2015-03-25 15:08:21 -04:00
Andy Armstrong
a9dce7c331 Clean up transactional behavior in User API 2015-03-25 13:44:03 -04:00
Sarina Canelake
c6ab15c64c Merge pull request #7352 from edx/sarina/pep8-quality-report 
Improve pep8 reporting
 2015-03-23 21:10:58 -04:00