Commit Graph

305 Commits

Author SHA1 Message Date
Bill DeRusha
cd751ab5fe Merge pull request #9460 from edx/bderusha/edx-search-for-teams-TNL-3013-patch
Remove pylint: disable invalid-name for paginator error and fix syntax
2015-08-25 11:01:11 -04:00
Bill DeRusha
81ced1c964 Remove disable pylint for paginator error and fix syntax 2015-08-25 10:08:16 -04:00
David Ormsbee
a1a9a2a576 Convert UpdateEmailOptInTestCase to use SharedModuleStoreTestCase 2015-08-25 09:47:59 -04:00
Bill DeRusha
973314de7b Add basic elasticsearch search for teams
TNL-3014

Add tests for search

Add text_search to TeamsListView

Add reindex command line tool for course teams

Add Search Pagination and update comments

Move paginate_search_results to common library
2015-08-24 09:22:06 -04:00
Chris Dodge
ea1e875dfe add ability to return the course name (optionally) when querying about credit requirement fulfillments 2015-08-22 17:24:23 -04:00
Ahsan Ulhaq
e3674e92e3 Credit eligibility email should use the correct staticfiles library
ECOM-2026
2015-08-21 20:17:55 +05:00
chrisndodge
3294b3165d Merge pull request #9386 from edx/cdodge/dont-return-none-for-non-credit-course
Cdodge/dont return none for non credit course
2015-08-20 14:35:13 -04:00
Chris Dodge
9310c82f0f Update credit services to gracefully handle operations on a course which is actually not credit enabled 2015-08-20 11:54:57 -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
Will Daly
e4a1ebd11c Specify course key when retrieving credit requirements.
Fix an exception that could occur if a user had completed
the final grade credit requirement in > 1 course.
2015-08-18 09:15:32 -07:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration
Integration of Proctoring into the LMS
2015-08-14 07:18:14 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Bill DeRusha
716c1f74cf Merge pull request #9237 from edx/bderusha/teams-expand-users-api-fix
Team API include correct info when expanding users
2015-08-12 15:27:48 -04:00
Bill DeRusha
09acca2de8 Team API include correct info when expanding users TNL-2975
Create read-only serializer to handle User/UserProfile data
together.

Refactor GET accounts to use the new read-only joint serializer

Fix tests to check for new expanded user info

Update tests in teams/tests/test_views.py to test for both
public and private profiles on expands user

Update serializer to utilize the request object for creating absolute uris
2015-08-12 14:33:07 -04:00
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release
Release
2015-08-12 13:06:39 -04:00
Waheed Ahmed
aff849281d Revert "Test library failed to export after import"
This reverts commit 4c1c4619f0.
2015-08-12 02:06:09 +05:00
Clinton Blackburn
58865ee0a8 Added API endpoints for CreditCourse
Endpoints support create, read, and list operations.

NOTE: This commit also includes a retrofitted SimpleRouter that supports overriding the lookup regex. This retrofit is simpler to implement than updating edx-ora2 which is pinned to DRF 2.3.x.

XCOM-524
2015-08-11 15:44:37 -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
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
Kyle McCormick
a14667c6f2 MA-1061 Fix IntegrityError caused by race condition in CourseOverview.get_from_id 2015-08-07 08:53:33 -04:00
Peter Fogg
2f7fa6fd8b Enforce discussions permissions in teams UI.
Adds a read-only mode to the discussion module which disables any
controls for updating the discussion (votes, follows, replies,
etc). This mode is enabled for users who are not a member of the team,
and are also not moderators, admins, or community TAs.
2015-08-06 11:15:56 -04:00
Syed Hassan Raza
4c1c4619f0 Test library failed to export after import 2015-08-05 12:47:27 -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
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
Linda Liu
8aa2d67b6d Merge pull request #8946 from edx/lliu/view-course-access
Add access response information into view_course_access
2015-08-01 13:55:25 -04: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
Kyle McCormick
2e53b9e82c Merge pull request #9126 from edx/kyle/course-overviews-versioning
WIP: MA-1063 Add versioning and timestamping to CourseOverview
2015-07-31 11:22:58 -04:00
Kyle McCormick
10aae0d480 MA-1063 Add versioning and timestamping to CourseOverview 2015-07-31 10:28:17 -04:00
tlindaliu
3b483d14bc MA-851: Add access response information into view_course_access 2015-07-31 09:30:40 -04:00
Ben McMorran
4a78271851 Move is_commentable_cohorted to django_comment_client 2015-07-30 20:59:34 +00:00
John Baker
d96648dff1 fixed aws.py 2015-07-28 15:32:28 -04:00
aamir-khan
9f0f081a1f ECOM-1916: updated the dispaly 2015-07-28 14:59:48 +05:00
Awais
1d2bc6fd67 ECOM-1807 Adding provider thumbnail url. 2015-07-27 20:04:05 +05:00
zubair-arbi
a2dd5d91f6 update caching for eligibility email content and edx-logo
ECOM-1525
2015-07-27 11:14:38 +05:00
Braden MacDonald
5aa127a9bf Merge pull request #8995 from open-craft/masquerade-cohorts
Allow previewing cohorted content when masquerading (SOL-1064)
2015-07-26 11:18:23 -07:00
Kyle McCormick
ea89e2d83b Fix conflicting 0004_ migrations on course_overviews
What happened:
* First, I merged `0004_default_lowest_passing_grade_to_None.py`, which adds `null=True` to `lowest_passing_grade`.
* Later, Renzo merged `0004_auto__add_field_courseoverview_enrollment_start__add_field_courseoverv.py`, which adds a bunch of enrollment-related fields
* Neither migrations' `models` variables reflects the changes in the other one.
* release currently has just `0004_default...`
* master and rc/2015-07-22 have `0004_auto...` and `0004_default...`, in that order.

What this commit changes:
* Change `0004_auto...` to `0005_add_enrollment_fields.py`
* Update `models` in `0005_...` to have `null=True` for `lowest_passing_grade`
2015-07-24 11:41:42 -04:00
Will Daly
17f713aa4a ECOM-1911: Fixes to credit requirements in Studio.
* Exclude orphaned XBlocks from requirements because they have been deleted.
* Sort ICRV requirements by start date, then by display name.
2015-07-23 13:07:13 -07:00
chrisndodge
5e195c8eeb Merge pull request #8962 from edx/cdodge/proctoring-studio
Integrate timed and proctored exam authoring into Studio
2015-07-23 15:53:17 -04:00
Chris Dodge
3748119961 Integrate timed and proctored exam authoring into Studio 2015-07-23 14:43:17 -04:00
Braden MacDonald
0defc55b84 Allow previewing cohorted content when masquerading 2015-07-22 00:54:15 -07:00
Ahsan Ulhaq
06b085f8b4 credit eligibility and payment receipt email
ECOM-1796
ECOM-1525
2015-07-22 12:34:38 +05:00
Christina Roberts
e5928bacc2 Merge pull request #8894 from edx/andya/lms-requirejs
Implement RequireJS Optimizer in the LMS
2015-07-21 15:07:49 -04:00
Will Daly
a725e84233 Merge pull request #8983 from edx/will/ecom-1912-and-1913
Credit progress page formatting bugfixes.
2015-07-20 14:14:53 -07:00
Will Daly
d3f58b689f Credit progress page formatting bugfixes.
* Correctly format the student's full name on the progress page.
* Add tests for progress page credit requirements display.
* Display grade percentage for credit requirement on progress page
2015-07-20 13:08:13 -07:00
Andy Armstrong
7b5f9b8009 Implement RequireJS Optimizer in the LMS
TNL-2487
2015-07-20 13:59:54 -04:00
Renzo Lucioni
b50c905865 Remove modulestore dependency from Enrollment API
Sets the Enrollment API free of the modulestore by replacing modulestore queries with calls to the CourseOverview model. Course deletion invalidates the corresponding CourseOverview. XCOM-462.
2015-07-20 13:41:19 -04:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
2015-07-17 17:42:03 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00