Commit Graph

2074 Commits

Author SHA1 Message Date
Eric Fischer
a647169a90 Merge pull request #11167 from edx/christina/ora-data-download
WIP: Asynchronous download button for ORA2 data
2016-03-10 11:09:36 -05:00
dylanrhodes
2b1a7eece2 Asynchronous download button for ORA2 data
Conflicts:
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/utils.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/api_urls.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor_task/api.py
	lms/djangoapps/instructor_task/tasks.py
	lms/djangoapps/instructor_task/tasks_helper.py
	lms/djangoapps/instructor_task/tests/test_api.py
	lms/djangoapps/instructor_task/tests/test_tasks.py
	lms/djangoapps/instructor_task/tests/test_tasks_helper.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/coffee/src/instructor_dashboard/data_download.coffee
	lms/templates/instructor/instructor_dashboard_2/data_download.html
2016-03-10 09:58:55 -05:00
Muzaffar yousaf
770a45b720 Merge pull request #11363 from edx/notes-pagination
Notes pagination
2016-03-10 17:26:54 +05:00
erm0l0v
4142438372 add CourseTalk widget
Move tests to one test class
2016-03-09 13:32:07 +03:00
Toby Lawrence
5a20f0b589 Merge branch 'master' into PERF-272 2016-03-08 08:53:36 -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
Toby Lawrence
4ca2692f5d Rename 'clean_headers' to 'header_control'.
This is part of adding the ability to forcefully set headers through the
middleware in addition to removing specific headers.
2016-03-03 14:00:12 -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
Kevin Falcone
a561367515 This should not be needed, we specify ATOMIC_REQUESTS on each DB
There is one DB where we do not want it specified since transactions
on the CSMHE table when we aren't atomic across databases isn't a win.
2016-03-01 14:00:13 -05:00
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
muhammad-ammar
13b14e0a60 Paginate edxnotes frontend
TNL-3908
2016-02-24 11:03:14 +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