Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

14096 Commits

Author SHA1 Message Date
Michael Frey
8502093f50 Redirect to otto checkout for prof ed courses if enabled 2016-03-07 14:16:49 -05:00
Hassan
48a5b954d5 Use CourseOverview for dump_course_ids 2016-03-07 19:44:38 +05:00
Christina Roberts
dbc2b4161e Merge pull request #11752 from edx/christina/remove-hinter 
Delete hinter manager.
 2016-03-07 09:35:56 -05:00
cahrens
ba06c899de Delete crowdsource_hinter prototype xmodule. 
TNL-4195
 2016-03-04 15:34:48 -05:00
Douglas Hall
56ecc6646d Merge pull request #11607 from CredoReference/invalid-display-courseware-through-lti-iframe 
Invalid display courseware through the LTI iframe in IE 10+
 2016-03-04 15:29:42 -05:00
Kevin Falcone
304fb68076 Despite db_index=True, Django didn't generate an index 
student_module_id is the primary way into this table, not having an
index is disastrous with real data.
 2016-03-03 15:27:21 -05:00
Ned Batchelder
fd4164de1d Merge pull request #11737 from edx/release 
Release ⇒ master
 2016-03-03 14:51:29 -05:00
Dmitry Viskov
ca82f143b0 When using in-frame LTI navigation in IE 10 & 11, problems are not rendering properly. 
The problems render properly in IE 10 & 11 when using edX directly, or when opening LTI in a new tab.
This is reproducible in Canvas and D2L
 2016-03-03 12:27:21 +03:00
Awais Jibran
d46ea873d0 Merge pull request #11656 from attiyaIshaque/ai/tnl3848-list-index-out-of-range 
Fix list index out of range in Textbook's chapters.
 2016-03-03 11:41:49 +05:00
David Ormsbee
19d9920b9f Revert "Merge pull request #11523 from edx/perf/speed-up-slow-user-role-ops" 
This reverts commit acf6c1d609, reversing
changes made to c59db6e5fc.
 2016-03-02 13:15:17 -05:00
cahrens
3a06534241 Remove unused profile name. 
The profile name requires escaping when displayed. Proactively removing since it is not being used.
 2016-03-02 11:49:33 -05:00
Brian Beggs
bfdd1883f2 Merge pull request #11546 from mitocw/feature/aq/allow_staff_view_coach_dashboard_mitocw#125 
Allowed staff/admin of course to view ccx coach dashboard
 2016-03-02 09:01:36 -05:00
Attiya Ishaque
99e717fb11 Fix list index out of range in Textbook's chapters. TNL-3848 2016-03-02 10:30:44 +05:00
John Eskew
2ab54f315a Merge pull request #11669 from edx/jeskew/fix_django19_warnings 
Add app_label to models to prevent Django1.9 warnings.
 2016-03-01 17:19:55 -05:00
Renzo Lucioni
d481768571 Merge pull request #11691 from edx/jeskew/shared_modulestore_test_case_conversion 
WIP: Lots of Python unittest speedups
 2016-03-01 16:50:27 -05:00
Ayub khan
be7be407cb Merge pull request #11478 from Ayub-Khan/ayubkhan/ECOM-3603 
Fixed progress exception for credit courses
 2016-03-02 01:10:17 +05:00
Renzo Lucioni
b02d1c1205 Merge pull request #11721 from edx/renzo/comment-client-test-speedup 
Speed up comment client tests
 2016-03-01 14:51:02 -05:00
Renzo Lucioni
1f0e61baa9 Speed up comment client tests 
Also accelerates forums UnicodeTestCases
 2016-03-01 14:41:52 -05:00
John Eskew
7bde238b3f Merge pull request #11711 from edx/jeskew/more_unittest_speedup 
Use SharedModuleStoreTestCase in the courseware navigation tests for speedup.
 2016-03-01 12:50:53 -05:00
Renzo Lucioni
cd84a9e77e Merge pull request #11714 from edx/renzo/sysadmin-xml 
Whittling away at XML modulestore code
 2016-03-01 12:47:00 -05:00
Bill DeRusha
95007a83b1 Merge pull request #11713 from edx/bderusha/git-add-speedup 
Add SharedModuleTestCase to git_import tests
 2016-03-01 12:13:51 -05:00
John Eskew
72ce55c8a2 Convert to SharedModuleStoreTestCase 2016-03-01 11:09:18 -05:00
Renzo Lucioni
32a29f4f26 Convert SysadminBaseTestCase to SharedModuleStoreTestCase 2016-03-01 11:02:01 -05:00
John Eskew
f6cdcdf52c Remove sysadmin feature to import course from git into XML modulestore. 2016-03-01 11:00:25 -05:00
Bill DeRusha
d8404ba477 Add SharedModuleTestCase to git_import tests 2016-03-01 10:54:54 -05:00
clrux
650c95f9c3 Merge pull request #11501 from edx/clrux/ac-328-uxpl 
AC-328 adding UXPL classnames to headings
 2016-03-01 07:23:07 -05:00
lenacom
016c8200ae fixed comments 2016-03-01 09:39:24 +03:00
John Eskew
b777530dac Add SharedModuleStoreTestCase.setUpClassAndTestData() context manager 
for use when a test class has a setUpTestData() method which uses
variables set up in the setUpClass() method.
Change base teams API test class to use the context manager.
 2016-02-29 18:02:57 -05:00
John Eskew
65e26e3ec2 Move user/admin model creation to class level. 
Wrap whole test with several publish/unpublish in same bulk_op.
 2016-02-29 17:20:08 -05:00
Chris Rodriguez
c619e1ec6b Adding UXPL classnames to headings 2016-02-29 15:43:17 -05:00
John Eskew
14ad8cd78f SharedModuleStoreTestCase conversion for speedup. 2016-02-29 14:41:17 -05:00
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