Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,515 Commits 1 Branch 0 Tags
209ddc700dfce5bb0aa151c19dafbac8ae7de2d2
Commit Graph

611 Commits

Author SHA1 Message Date
Dmitry Viskov
209ddc700d Difficulty selectbox in Studio (based on new XBlockAside functionality). Include: 
- adaptation asides to be imported from the XML
- updating SplitMongo to handle XBlockAsides (CRUD operations)
- updating Studio to handle XBlockAsides handler calls
- updating xblock/core.js to properly init XBlockAsides JavaScript
 2016-03-02 03:37:13 +03: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
Renzo Lucioni
e0407893ff Merge pull request #11603 from edx/usman/migrations-setup 
Update migrations setup during Python unit tests
 2016-02-29 13:54:30 -05:00
Ben Patterson
9e4f14f1be Revert "Registration: don't require terms of service if checkbox is hidden" 2016-02-29 12:08:09 -05:00
Usman Khalid
2586f09d7a Add option to disable migrations when running tests 
By default, migrations are applied as they always have been. Exporting DISABLE_MIGRATIONS=1 or passing --disable-migrations to Paver commands will create tables directly from apps' models.
 2016-02-29 11:47:32 -05:00
Omar Khan
23a0a6d41a Merge pull request #11644 from open-craft/omar/hide-tos 
Registration: don't require terms of service if checkbox is hidden
 2016-02-29 23:15:56 +07:00
Nimisha Asthagiri
33e47d317b Course Overview migrations fix: Readd the Facebook URL field. 2016-02-26 10:20:36 -05:00
Douglas Hall
b4a172961b Merge pull request #11600 from edx/ibrahimahmed443/SOL-1611 
add student email in credit service
 2016-02-24 14:30:15 -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
Omar Khan
e461374973 Registration: don't require terms of service if checkbox is hidden 2016-02-24 16:18:32 +07: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
Omar Khan
a1301ded69 Merge pull request #11544 from open-craft/omar/remove-newrelic-handler 
Remove newrelic logging handler
 2016-02-22 23:56:16 +07:00
Nimisha Asthagiri
70469c16b2 Block Structure API: Replace has_block with __contains__ 2016-02-22 11:25:46 -05:00
Ibrahim
c503c236a9 add student email in credit service 2016-02-22 14:45:25 +05:00
Zubair Afzal
040578b315 Merge pull request #11599 from edx/zub/feature-flag-jwt-auth 
enable jwt auth with feature flag
 2016-02-20 03:54:18 +05:00
zubair-arbi
182826261d enable jwt auth with feature flag 2016-02-20 02:31:51 +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
Usman Khalid
4be5aeb194 Merge pull request #11550 from edx/muzaffar/tnl4013 
Using display_name_with_default  instead of display_name.
 2016-02-19 17:51:27 +05:00
muzaffaryousaf
509522414a Using display_name_with_default instead of display_name. 
TNL-4103
 2016-02-19 16:50:23 +05:00
Nimisha Asthagiri
fa8ca11d8c Remove unused Mobile Social Facebook endpoint 2016-02-18 12:12:04 -05:00
Nimisha Asthagiri
d969f48646 Course Blocks API: Support accessing a substructure MA-1604 2016-02-18 10:03:58 -05:00
M. Rehan
af9e26f5cb Merge pull request #11479 from edx/mrehan/plat-998-warnings-on-logout 
Fix - Bypass unnecessary logs on logging out.
 2016-02-17 17:46:05 +05:00
Qubad786
faf3a64e36 Bypass unnecessary logs on loging out 2016-02-17 13:42:01 +05:00
Simon Chen
4b8a737168 Merge pull request #11553 from edx/schen/ECOM-3640 
ECOM-3640 add a new info log message on program certificate task to mark successful task completion
 2016-02-16 10:58:38 -05:00
Toby Lawrence
9654449302 Merge pull request #11465 from edx/perf/speed-up-courseware-tests 
Switch to SharedModuleStoreTestCase in the 'courseware' app where possible.
 2016-02-16 10:06:53 -05:00
Simon Chen
2f595c111f ECOM-3640 add a new info log message on program certificate task to mark successful task completion 2016-02-16 14:48:55 +00:00
Toby Lawrence
49d3a7d35d More quality fixes. 2016-02-16 07:58:33 -05:00
Saleem Latif
cd101d5dec Merge pull request #11494 from edx/saleem-latif/WL-307 
WL-307: correct FAVICON_PATH setting for comprehensive theming
 2016-02-16 14:39:13 +05:00
Toby Lawrence
ead2f0477b Quality fixes. 2016-02-15 21:18:53 -05:00
Saleem Latif
75f17ecc8e correct FAVICON_PATH setting for comprehensive theming 2016-02-15 17:13:19 +05:00
Omar Khan
510dd90c07 Remove newrelic logging handler 
It was introduced back in 2012, and is not used in the default
configuration.
 2016-02-15 11:04:55 +07:00
Jim Abramson
f71e7cac93 adjust comment about program certification retry 2016-02-12 14:59:25 -05:00
Jim Abramson
fb3a09e68e Merge pull request #11520 from edx/jsa/ecom-3638 
Specify high priority queue for credentials generation task.
 2016-02-12 14:29:49 -05:00
jsa
46ad8a3399 specify routing / queue for program credentials task. 
ECOM-3638
 2016-02-12 13:25:52 -05:00
jsa
8a620640c2 Disable credentials-related settings/tests under cms. 2016-02-12 13:25:44 -05:00
Ned Batchelder
d8b9dec51e Update this command for Django 1.8 2016-02-11 15:39:35 -05:00
Ned Batchelder
432a40f035 Update post_cohort_management_fix to Django 1.8 2016-02-11 15:39:35 -05:00
Calen Pennington
1f9e90ef4b Merge pull request #11468 from cpennington/program-cert-retries 
Program cert retries
 2016-02-11 11:28:10 -05:00
Hasnain
d06edc680b Added two fields in credit API 2016-02-11 10:13:37 +00:00
Renzo Lucioni
3809422798 Address ProgramsApiConfig deprecation warning 2016-02-10 15:58:15 -05:00
Clinton Blackburn
85591696d8 Merge pull request #11497 from openfun/openfun/fix_generate_course_structure 
Fix generate_course_structure command.
 2016-02-10 13:29:00 -05:00
Calen Pennington
1e74cd0c88 Split up package imports from single name imports 2016-02-10 12:43:51 -05:00
Calen Pennington
5c79e25047 Retry the task to grant Programs credentials (which is idempotent) if any constituent program fails 2016-02-10 12:43:05 -05:00
Calen Pennington
22e91bccde Retry Programs tasks when connection to the API is disabled 2016-02-10 12:36:33 -05:00
Calen Pennington
36b0c593cc Retry failed Programs tasks using exponential backoff and a configurable retry limit 2016-02-10 12:36:30 -05:00
Calen Pennington
3940b1ba44 Add configuration for retries to ProgramsApiConfig 2016-02-10 12:36:29 -05:00
Renzo Lucioni
2717f228f8 Merge pull request #11483 from edx/renzo/programs-task-fixes 
Fixes for program certificate generation
 2016-02-10 10:41:01 -05:00
Julien Paillé
ea2633d485 Fix generate_course_structure command. 2016-02-10 10:23:20 +01:00
David Ormsbee
1a5b9172d8 Allow course images to be served from the CDN. 
Previously, course images on the student dashboard were always
served from the localhost, even if the CDN was enabled.
 2016-02-09 16:45:18 -05:00
Renzo Lucioni
67f8b49056 Fixes for program certificate generation 
ECOM-3528
 2016-02-09 16:27:16 -05:00