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

770 Commits

Author SHA1 Message Date
Ahsan Ulhaq
a4b04faf19 Merge pull request #10735 from edx/ahsan/ECOM-2993-Help-text-update-for-full-name 
Help text update for full name
 2015-11-27 15:14:08 +05:00
Clinton Blackburn
35639e772b Merge pull request #10744 from edx/clintonb/credit-migration 
Updated credit migration for CreditProvider.provider_id
 2015-11-25 16:55:48 -05:00
Jim Abramson
8f4c2264a1 Merge pull request #10701 from edx/renzo/studio-programs-tab 
Add Programs tab to Studio
 2015-11-25 16:37:34 -05:00
Renzo Lucioni
70d57327eb Add Programs tab to Studio 
Extends the Programs ConfigurationModel, cleans up Programs-related utilities and corresponding tests, and corrects caching. Uses the Programs API to list programs within Studio. ECOM-2769.
 2015-11-25 14:56:50 -05:00
Clinton Blackburn
c6bfac720f Updated credit migration for CreditProvider.provider_id 
There is no need for a separate migration for the validation. Updated the regex in the initial migration to appease Django.

ECOM-2609
 2015-11-25 14:52:34 -05:00
Peter Fogg
497622d4b4 Switch default course mode to 'audit'. 
ECOM-2972
 2015-11-25 11:22:29 -05:00
Ahsan Ulhaq
dffdd13928 Help text update for full name 
ECOM-2993
 2015-11-25 14:39:22 +05:00
Clinton Blackburn
92153752c0 Rewrote Credit API 
- API built atop Django REST Framework
- Added support for OAuth 2.0 and session authentication
- Added permissions around eligibility data

ECOM-2609
 2015-11-24 22:06:54 -05:00
Ned Batchelder
0872732cf0 Fix pylint C7630 (literal used as attribute) violations 
There's no need to use a string literal in setattr, delattr, or the
two-argument form of getattr.
 2015-11-23 15:32:54 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
muhammad-ammar
29acc3acfc resolve merge conflicts 
test fixes
 2015-11-18 19:13:54 +05:00
muhammad-ammar
8d5f153201 Merge remote-tracking branch 'origin/release' into dj18-release-merge 
Conflicts:
	common/djangoapps/util/testing.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/teams/tests/test_views.py
	openedx/core/djangoapps/programs/models.py
	openedx/core/djangoapps/user_api/accounts/tests/test_views.py
	requirements/edx/github.txt
 2015-11-18 17:53:44 +05:00
Awais Qureshi
06cd352e00 Merge pull request #10596 from edx/awais786/ECOM-2832-cache-programs-data 
Awais786/ecom 2832 cache programs data
 2015-11-18 12:40:21 +05:00
Awais
86c66f5534 Adding cache implementation for the programs api. 
ECOM-2832
 2015-11-17 20:25:27 +05:00
Giovanni Di Milia
64acf4846b Enforced maximum amount of students for CCX 
CCX overrides course max_student_enrollments_allowed
and set it to 200 during CCX creation
 2015-11-16 10:10:37 -05:00
Usman Khalid
6cb62f2697 Rebase upgrade Django to v1.8.5 
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
 2015-11-10 15:00:19 -05:00
Syed Hasan raza
40847db72c Merge pull request #10153 from edx/shr/bug/PLAT-875-Courses_Appear_in_search_after_deletion 
Delete course entry from CourseAboutSearchIndex
 2015-11-10 14:30:57 +05:00
Syed Hassan Raza
3102788bd1 Delete course entry from CourseAboutSearchIndex 2015-11-07 18:27:09 +05:00
J. Cliff Dyer
00b3051b73 Make sure proper logic is used for getting account privacy. 2015-11-06 15:53:08 +00:00
Nimisha Asthagiri
00e9237153 Course Blocks API 2015-11-05 22:30:44 +00:00
Eric Fischer
24ee5a68f5 Merge pull request #10490 from edx/release 
Release 4 November 2015 to master
 2015-11-04 13:19:09 -05:00
Eric Fischer
3609cc7a99 Post-migration management command 
On devops recommendation, now handling the potential for an 'inconsistency
window' via a management command instead of a hacky "re-run the data migration"
bash script.
 2015-11-03 10:30:43 -05:00
Peter Fogg
d7417d62cc Date summary blocks on the course home page. 
Enabled behind the
`SelfPacedConfiguration.enable_course_home_improvements` flag.

ECOM-2604
 2015-11-02 10:49:18 -05:00
Eric Fischer
e0380ad7ab Merge pull request #10295 from edx/efischer/cohort_membership_model 
TNL-3478 Cohort Membership race condition fix
 2015-10-30 13:08:56 -04:00
Ahsan Ulhaq
c47311b11f Add the html and css and backend changes required for the xseries. 2015-10-30 20:59:26 +05:00
Eric Fischer
dbbc64ff88 CohortMembership Race Condition Test 
By using the before_after library, we can force a race condition to reliably
occur in the CohortMembership.save() method. This unit test will do just that,
and ensure that our race-condition-handling code functions as it should.
 2015-10-30 11:07:25 -04:00
Eric Fischer
08ed3b547f CohortMemberships Unit Test Updates 
Updating previously-existing unit tests to function with the new
CohortMembership model.
 2015-10-30 11:07:25 -04:00
Eric Fischer
83163e58f8 CohortMemberships Code Changes 
The code changes needed to get CohortMembership functioning properly.

The key of this change is twofold: first, CohortMemberships are unique
per-user, per-course. This is enforced at the database level. Secondly,
the updates are done using a select_for_update, which ensures atomicity.
 2015-10-30 11:07:25 -04:00
Eric Fischer
56d49e7390 CohortMemberships Migrations 
These are the migrations needed for CohortMembership to function.
0005 establishes the table, 0006 will be used to move existing data
into the table as needed.

Per product guidance, we can just arbitrarily reassign problem users.
Implementing that decision, as well as the remainder of the data migration.

Also including a short script to re-run the 0006 migration after code changes
are live, to prevent a potential issue where the database become out-of-sync.
 2015-10-30 11:07:25 -04:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams 
Timed Exams
 2015-10-30 11:03:59 -04:00
Bill DeRusha
1f77810fad Add configurable refund window 
Add configuration model for enrollment refunds.

Use order info from otto in refund window calculation

Delete dupe tests. Extend tests to include window tests

Move ecom client from lib to djangoapps in openedx
 2015-10-30 09:01:53 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -04:00
zubair-arbi
7f96474d01 basic programs api setup and dashboard integration 
ECOM-2578
 2015-10-29 20:07:51 +05:00
muzaffaryousaf
cc88cfaf64 Fixing "wrong-assert-type" pep8 warning. 
TNL-3650
 2015-10-29 15:01:49 +05:00
Peter Fogg
5ffa06bed1 Responding to review comments. 2015-10-28 16:44:36 -04:00
Jim Abramson
edf09d84e9 Merge pull request #10350 from edx/jsa/ecom-2657 
Programs: added platform support package and configuration model.
 2015-10-27 09:10:23 -04:00
jsa
1bb29289f2 Programs: added platform support package and configuration model. 
ECOM-2657
 2015-10-25 21:30:26 -04:00
Clinton Blackburn
98a39b922e Updated CreditCourse update endpoint 
The update (PUT) endpoint now supports creating new CreditCourse objects in addition to updating existing ones. This functionality greatly simplifies the logic needed by consumers (e.g. the Course Administration Tool) to create or update CreditCourse objects.

ECOM-2524
 2015-10-24 20:13:54 -04:00
Ben Patterson
1032d37271 Revert "Public Course Import/Export API (continued)" 2015-10-23 20:02:34 -04:00
Peter Pinch
e7708e5a04 Merge pull request #8942 from mitocw/bdero/import-export-reprise 
Public Course Import/Export API (continued)
 2015-10-23 15:03:38 -04:00
Andy Armstrong
054aa95b26 Allow non-public XBlock assets in debug mode 2015-10-22 11:09:02 -04:00
tasawernawaz
450e625d97 Merge pull request #10280 from edx/tasawer/story/ecom-2538-fix-for-multiple-providers 
Fix parameter name issue for multiple providers
 2015-10-22 09:48:22 +05:00
AlasdairSwan
c622f03a6a Merge pull request #10288 from edx/release 
Release 2015-10-21
 2015-10-21 13:16:35 -04:00
Tasawer
65c93d7ad5 Fix for multiple provider ids 
ECOM-2538
 2015-10-21 13:54:59 +00: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
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
wajeeha-khalid
017477a8d7 MA-1281 User Account: added account_privacy field in GET and PATCH 2015-10-21 11:33:38 +05:00
Sarina Canelake
15d1aa3ad4 Merge pull request #10257 from edx/sarina/update-profile-wording 
Create distinct terms for gender, education sign up terms
 2015-10-20 20:06:14 -04:00
Sarina Canelake
105d611cc9 Create distinct terms for gender, education sign up terms 2015-10-20 18:55:51 -04:00
David Ormsbee
4ac9725793 Remove foreign key constraint on CourseOverviewTab -> CourseOverview 
This will allow v1 code of CourseOverview to delete entries. While
this is not a good thing in general (and future versions will ignore
entries with higher versions than they support), this is necessary
to prevent errors with the existing code in a rollback situation.
Otherwise, old code trying to delete CourseOverview entries will
fail with a foreign key constraint violation.
 2015-10-20 15:30:31 -04:00