Commit Graph

2062 Commits

Author SHA1 Message Date
Kevin Falcone
72b4cf377b Don't hardcode student_module_history
aws_migrate may be used on boxes where that DB does not yet exist.
2016-03-01 11:56:11 -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
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
Ned Batchelder
a9ab395d43 Use yaml.safe_load, since we have no need for the greater power of .load 2016-02-24 15:36:04 -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
Matjaz Gregoric
f4e462c728 Merge pull request #11316 from open-craft/remove-django-template-loaders
Remove default django template loaders.
2016-02-18 20:38:47 +01: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
Justin Abrahms
885785d7f1 Added a UI for confirming OAuth Access.
This will allow users to delegate permissions to a 3rd party service.
2016-02-17 14:04:04 -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
Andy Armstrong
2ec7c17a45 Fix bug with loading AFontGarde
The code isn't ready to start using AFontGarde from
the Pattern Library yet, so I've reverted the code back
to loading the copies from the vendor library.
2016-02-11 13:52:50 -05:00
Peter Fogg
5d0ed333a5 Merge pull request #11502 from edx/peter-fogg/audit-cert-cutoff-date
Explicitly cut off cert eligibility.
2016-02-10 15:41:16 -05:00
Peter Fogg
2d028f8246 Add an explicit cutoff date for audit cert granting.
The previous logic was a convoluted way of doing the same thing, and
has already led to one bug. Instead of hoping that the bugs are ironed
out now and that future devs maintain this logic properly, let's just
set a real cutoff date.
2016-02-10 12:16:37 -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
Jesse Zoldak
7ccca469fc Merge pull request #11481 from edx/zoldak/remove-lettuce-homepage-test
Convert homepage acceptance test to bok-choy
2016-02-10 08:45:06 -05:00
Asad Iqbal
64291d3c01 Merge pull request #11391 from edx/asadiqbal08/WL-272
asadiqbal08/WL-272 - Studio Language Selection
2016-02-10 18:30:29 +05:00
Jesse Zoldak
f0c54c15ee Convert homepage acceptance test to bok-choy 2016-02-10 06:32:38 -05:00
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05:00
Renzo Lucioni
67f8b49056 Fixes for program certificate generation
ECOM-3528
2016-02-09 16:27:16 -05:00
Andy Armstrong
caf4cfbd3a Merge pull request #11268 from edx/andya/add-pattern-library
Add edX Pattern Library to edx-platform
2016-02-09 12:07:03 -05:00
Ben Patterson
f12c415ed6 Merge pull request #11470 from edx/benp/remove-ruby-deps
[S&B] Remove ruby dependencies.
2016-02-09 10:56:21 -05:00
Ben Patterson
ffa089a9c6 Remove ruby reference in pipeline arguments. 2016-02-08 18:18:37 -05:00
Ehtesham
b9c8b3308d [TNL-3962] moving DEPRECATED_ADVANCED_COMPONENT_TYPES to dJango admin 2016-02-08 17:26:49 +05:00
Andy Armstrong
d731b07bd4 Add UXPL to edx-platform
UITK-39
2016-02-05 13:33:55 -05:00
jsa
92aa346fdf Implement celery task to award program certs.
ECOM-3354
2016-02-05 12:21:20 -05:00
Ned Batchelder
21218ef989 Merge pull request #11372 from open-craft/omar/remove-multiple-enrollment-feature
Remove unused MULTIPLE_ENROLLMENT_ROLES feature setting
2016-02-04 13:42:48 -05:00
Muhammad Ammar
886d54dce9 Merge pull request #11320 from edx/ammar/boomark-button-requirejs-caching
bookmark button js caching
2016-02-04 21:07:45 +05:00
muhammad-ammar
3127ac9180 bookmark button js caching
TNL-3954
2016-02-04 17:59:47 +05:00
Nimisha Asthagiri
599173c6b6 Merge pull request #11198 from edx/block-cache/collect-phase
Refactor Block Cache to separate Collect and Transform phases
2016-02-03 20:18:09 -05:00
Robert Raposa
f555ffd585 Refactor and improve js_utils helpers
- Rename escape_json_dumps to dump_js_escaped_json
- Rename escape_js_string to js_escaped_string
- Update js_escaped_string to output empty string for None
- Introduce dump_html_escaped_json
- Move dump_js_escaped_json after the pipe as new best practice
- Introduce additional uses of helpers
- Introduce new djangolib directory and move js_utils
2016-02-03 17:13:21 -05:00
Nimisha Asthagiri
66397c35b9 Refactor Block Cache to separate Collect and Transform phases 2016-02-03 16:54:29 -05:00
Omar Khan
5b84043428 Remove unused MULTIPLE_ENROLLMENT_ROLES feature setting
This feature check was commented out in 8ee9a967 more than 2 years ago,
we might as well remove the setting.
2016-02-03 21:20:23 +07:00
Matjaz Gregoric
bb0c2901c7 Merge pull request #11319 from open-craft/remove-comprehensive-theme-finders
Remove ThemingAware storage mixins and ComprehensiveThemeFinder
2016-02-02 17:57:36 +01:00
Diana Huang
cd0bb4c7e0 Add ability to generate static i18n files. 2016-02-01 15:54:10 -05:00
Douglas Hall
dce3d9ca81 Merge pull request #11014 from edx/douglashall/PHX-219/subsection_gating
PHX-219 Subsection Gating
2016-01-29 11:05:39 -05:00
Zia Fazal
6e861f266b Merge pull request #11352 from edx/ziafazal/WL-209
ziafazal/WL-209:Cert Social Sharing customization
2016-01-29 16:50:17 +05:00
Matjaz Gregoric
266f593d2d Remove ThemingAware storage mixins and ComprehensiveThemeFinder.
Collectstatic failed in production when comprehensive theme contained custom css files.
This patch fixes that problem by removing ComprehensiveThemeFinder from STATICFILES_FINDERS
and ComprehensiveThemingAware mixin from STATICFILES_STORAGE.

Comprehensive theme static dirs are added to the top of the STATICFILES_DIRS entry,
which means that the default django FilesystemFinder will find theme static files,
and since the theme folder is at the top of STATICFILES_DIRS, theme files will take
precedence over default LMS/CMS static files.

This change means that theme static file URLs are no longer prefixed with themes/<theme-name>/,
but since we currently only support one comprehensive theme at a time, that shouldn't be a problem.
If/when we want to make the choice of a theme dynamic per-request (microsites?), we will have to
bring custom theme finders and storage mixins back, but for now, we don't need them.
2016-01-29 08:28:18 +01:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
asadiqbal
99b883b7be WL-243 LMS Language Selection 2016-01-28 20:07:26 +05:00
Zia Fazal
463e8c82cf Cert Social Sharing customization
changes after feedback from matte
2016-01-28 14:26:48 +05:00
Ahsan Ulhaq
9220420925 Add jwt auth in LMS
ECOM-3419
2016-01-28 14:00:58 +05:00
Matjaz Gregoric
434f196550 Remove default django template loaders.
Mako filesystem/app_directories loaders already wrap default django template loaders.

Mako loaders delegate the `load_template_source` method to the base loader that
they wrap, so there's no reason to explicitly include the two django loaders in the settings.
2016-01-28 09:33:09 +01:00
Ahsan Ulhaq
b11e312d2c Create placeholder django apps for credentials
ECOM-3057
2016-01-28 13:05:49 +05:00
Nimisha Asthagiri
08a2bc9620 Merge pull request #11358 from edx/release
Hotfix for MA-1981 and safe sessions
2016-01-27 15:53:20 -05:00
Toby Lawrence
531347b463 Merge pull request #11277 from edx/PERF-251
Add the basis of configuring a cache TTL for course assets.
2016-01-27 08:38:16 -05:00
Toby Lawrence
01a9ad2369 Add support to enhance the cacheability of course assets.
This introduces a mechanism to control the time-to-live for an unlocked
course asset, which will allow browsers and intermediate proxies/caches
to cache these course assets, determinstically.

Locked assets, with their nature of requiring authorization, are not
eligible for caching.
2016-01-26 21:09:18 -05:00