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

14265 Commits

Author SHA1 Message Date
John Eskew
bd4cc57bad Convert to SharedModuleStoreTestCase 2016-02-29 14:04:24 -05:00
Kevin Falcone
b4ac588ce1 Update reset-test-db.sh for bok-choy 
This now correctly migrates and dumps files for both databases.

Run lettuce migrations for both databases
 2016-02-29 13:59:29 -05:00
Kevin Falcone
6f9a3911e5 Implement a BaseStudentModuleHistory 
This abstract class contains most of the fields (aside from the id and
foreign key to StudentModule that the subclasses need to manage).  It
also provides a get_history method that abstracts searching across
multiple backends.

Move router code to openedx/core
We need to use it from cms and lms.
Ensure aws_migrate can be used for migrating both the lms and cms.

Handle queries directed to student_module_history vs default and the
extra queries generated by Django 1.8 (SAVEPOINTS, etc).

Additionally, flag testing classes as multi_db so that Django will
flush the non-default database between unit tests.

Further decouple the foreignkey relation between csm and csmhe

When calling StudentModule().delete() Django will try to delete CSMHE
objects, but naively does so in the database, not by consulting the
database router.

Instead, we disable django cascading deletes and listen for post_delete
signals and clean up CSMHE by hand.

Add feature flags for CSMHE
One to turn it on/off so we can control the deploy.
The other will control whether or not we read from two database tables
or one when searching.

Update tests to explicitly use this get_history method rather than
looking directly into StudentModuleHistory or
StudentModuleHistoryExtended.

Inform lettuce to avoid the coursewarehistoryextended app

Otherwise it fails when it can't find features/ in that app.

Add Pg support, this is not tested automatically.
 2016-02-29 13:59:27 -05:00
Calen Pennington
dd90c55602 Create a new CSMHExtended table to hold our new data 
This is a clone (copy) of CSMH's declaration and methods with an added
id of UnsignedBigInAutoField

We should be able to delete the save_history code, but needs testing.

Add error logging when capa failures happen

Put StudentModuleHistory into its own database

Bump out the primary key on CSMHE

This gives us a gap to backfill as needed.
Since the new table's pk is an unsigned bigint, even for people who don't
consolidate CSMH into CSMHE, the lost rows are unlikely to matter.

Remove StudentModuleHistory cleaner
 2016-02-29 13:58:39 -05:00
lenacom
236cf4e30d removed check for 'root' 2016-02-29 19:12:44 +03:00
lenacom
f048a28fa0 added ending comma 2016-02-29 16:23:15 +03:00
lenacom
ae439310e1 New optional parameters for course blocks API: lti_url, block_types 2016-02-29 15:58:05 +03:00
Ayub-khan
4b81f0bb3c Fix progress exception for credit courses and add unit test. 2016-02-29 15:42:20 +05:00
Awais Jibran
03585a4842 Merge pull request #11657 from edx/aj/ECOM3688-add-log-in-cert-gen 
Improve logging in certification generation
 2016-02-29 14:47:34 +05:00
John Eskew
e87bb74c22 Add app_label to models to prevent Django1.9 warnings. 2016-02-25 17:34:31 -05:00
Peter Pinch
3be2737f5b Merge pull request #11356 from mitocw/gdm_ccx_course_modules_#170 
Added extra field to CCX model for Course Models
 2016-02-25 13:45:15 -05:00
sanfordstudent
c518543cbd Merge pull request #11602 from edx/sstudent/MA-1919 
MA-1919 making mobile handout links accommodate jump to id's and cour…
 2016-02-25 11:07:58 -05:00
Giovanni Di Milia
0c637cdca9 Added extra field to CCX model for Course Models 
REST APIs modified
 2016-02-25 10:27:39 -05:00
Sanford Student
75a26b62b5 MA-1919 making mobile handout links accommodate jump to id's and course links 2016-02-25 10:20:13 -05:00
Amir Qayyum Khan
8be8ac8fbf Refactored ccx coach tab plugin 2016-02-25 19:19:21 +05:00
John Eskew
e3ddb02cc7 Merge pull request #11586 from edx/jeskew/remove_all_request_dot_request 
Remove all request.REQUEST usages.
 2016-02-25 08:23:12 -05:00
Amir Qayyum Khan
e1035c7bd7 Allowed staff/admin of course to view ccx coach dashboard 2016-02-25 16:07:27 +05:00
Awais Jibran
d18f3f6c98 Improve logging in cert gen. 
ECOM-3688
 2016-02-25 14:57:31 +05:00
M. Rehan
db5fe13070 Merge pull request #11624 from edx/mrehan/topic-not-found-tnl-4136 
TNL-4136 fix topic detail endpoint's url to support alphanumeric and period characters in topic ID
 2016-02-25 13:13:26 +05:00
Brian Beggs
0251e8e15a Merge pull request #11545 from mitocw/feature/aq/support_mutiple_instances_ccx_mitocw#175 
Allow multiple instances of ccx
 2016-02-24 21:22:29 -05:00
sanfordstudent
a7d6b13b7e Merge pull request #11637 from edx/sstudent/MA-1038-permanent-fix 
MA-1038
 2016-02-24 14:01:03 -05:00
Michael Katz
fd065c9e8c Merge pull request #11643 from edx/release 
Release 2016-02-24
 2016-02-24 11:16:16 -05:00
Giovanni Di Milia
7683eadcaf Modified permission classes for CCX REST APIs 
Modified how the per object permissions are enforced in the CCX REST APIs
 2016-02-24 08:40:07 -05:00
muhammad-ammar
d226b55b04 don't catch exception to raise http500 
TNL-4043
 2016-02-24 11:03:17 +05:00
muzaffaryousaf
ee637c58ea Set notes page size to 25 
TNL-4108
 2016-02-24 11:03:17 +05:00
muhammad-ammar
ea89d2eea4 hide notes tab if feature flag is disabled or harvard notes enabled 
TNL-2816
 2016-02-24 11:03:16 +05:00
muhammad-ammar
ce57700d68 hide paging footer when only one page 2016-02-24 11:03:15 +05:00
muzaffaryousaf
bfa2ea5bd8 Remove sanitization from python & adding it to the templates. 
TNL-4012
 2016-02-24 11:03:15 +05:00
muhammad-ammar
13b14e0a60 Paginate edxnotes frontend 
TNL-3908
 2016-02-24 11:03:14 +05:00
muhammad-ammar
e2333214b1 paginate edxnotes views 
TNL-3840
 2016-02-24 11:03:14 +05:00
Bill DeRusha
85df4eee4c Merge pull request #11630 from edx/bderusha/soft-sec-id 
Do not send initial verification photo_id if new photo_id provided
 2016-02-23 14:47:29 -05:00
Sanford Student
3313b755fa MA-1038 2016-02-23 14:20:51 -05:00
Bill DeRusha
beacf3c93a Only return unexpired initial verifications. 2016-02-23 13:38:48 -05:00
Bill DeRusha
a1a58db9be Do not send initial verification photo_id if new photo_id provided 
ECOM-2888
 2016-02-23 13:29:53 -05:00
Michael Frey
90146d9ae0 Only allow ecommerce checkout if user is also activated 2016-02-23 10:11:14 -05:00
Toby Lawrence
acf6c1d609 Merge pull request #11523 from edx/perf/speed-up-slow-user-role-ops 
Don't blow away the role cache when updating.
 2016-02-23 06:55:00 -05:00
Eric Fischer
73fa3190cd Revert "Inform openassessment to clear submission" 
This reverts commit 920cc3d222.
 2016-02-22 17:32:44 -05:00
Qubad786
b669765cee TNL-4136 fix topic detail endpoint's url to support alphanumeric and period characters 2016-02-23 02:39:22 +05:00
Michael Katz
bf5d2034a1 Revert "Added staff role on ccx to staff of master course and added a data migration for existing ccx courses." 
This reverts commit 91bf48fc8c.
 2016-02-22 15:33:01 -05:00
Nimisha Asthagiri
03487073aa Merge pull request #11579 from edx/course_blocks_api/support_substructure 
Course Blocks API: Support accessing a substructure MA-1604
 2016-02-22 13:38:01 -05:00
Nimisha Asthagiri
70469c16b2 Block Structure API: Replace has_block with __contains__ 2016-02-22 11:25:46 -05:00
John Eskew
df261cd5d6 Remove all request.REQUEST usages - replace with request.GET and/or 
request.POST to eliminate Django deprecation messages.
 2016-02-22 09:54:26 -05:00
Amir Qayyum Khan
2ee9105017 Fixes bug where coach with multiple CCXs can't view coach dashboard 2016-02-22 18:59:07 +05:00
Nimisha Asthagiri
4bbe9a2021 Merge pull request #11326 from edx/mobile/remove-dead-code 
Mobile API: remove unused endpoints
 2016-02-19 15:14:13 -05:00
Eric Fischer
920cc3d222 Inform openassessment to clear submission 
The openassessment xblock stores some information that assumes
a given student module is never cleared, it needs to be informed of
this operation.
 2016-02-18 15:41:13 -05:00
Nimisha Asthagiri
c088df0835 Remove unused Mobile latest_updates field 2016-02-18 12:12:05 -05:00
Nimisha Asthagiri
deb9148f64 Remove unused Mobile CourseBlocksAndNavigation endpoint. 2016-02-18 12:12:05 -05:00
Nimisha Asthagiri
fa8ca11d8c Remove unused Mobile Social Facebook endpoint 2016-02-18 12:12:04 -05:00
Peter Pinch
dcb04cb092 Merge pull request #10877 from mitocw/enhancement/aq/add_master_course_staff_in_ccx 
Added staff and instructor roles on ccx to all the staff and instructors of the master course plus fixed view as student masquerade and display name of ccx on coach dashboard
 2016-02-18 11:09:37 -05:00
Nimisha Asthagiri
d969f48646 Course Blocks API: Support accessing a substructure MA-1604 2016-02-18 10:03:58 -05:00