Commit Graph

253 Commits

Author SHA1 Message Date
Adam Palay
feb042d474 Revert "Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46"
This reverts commit 27646b7e6f.
2016-08-01 10:13:10 -04:00
wajeeha-khalid
986dcff626 MA-2536: get 'course_about' url in enrollment 2016-07-29 14:58:54 +05:00
Kevin Kim
a39d6c2e94 Add gated content banner for staff in lms 2016-07-27 14:03:08 +00:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
2016-07-27 13:55:14 +05:00
Sanford Student
d996c2a3cd per cliff's review 2016-07-26 11:39:19 -04:00
Sanford Student
d9e0ba45cc first round of self review and code review 2016-07-26 10:50:02 -04:00
Sanford Student
7d690dde8a adding request cache for milestones 2016-07-25 16:55:06 -04:00
sanfordstudent
ba54ad197e Merge pull request #13075 from edx/sstudent/TNL-4925
generalizing proctored exam transformer to handle all milestones
2016-07-25 10:10:42 -04:00
Mushtaq Ali
d4ff39a391 Merge pull request #12237 from edx/mushtaq/maintenance
Maintenance app and force publish course view
2016-07-23 01:23:58 +05:00
Mushtaq Ali
27646b7e6f Basic architecture of Maintenance App - SUST-19, SUST-42. Implement Force Publish Course view. SUST-46 2016-07-22 18:29:12 +00:00
Sanford Student
87a9ebce9a generalizing proctored exam transformer to handle all milestones 2016-07-22 12:57:23 -04:00
Eric Fischer
cae03d0349 Revert "moving milestones check to access.py" (#13060) (#13061)
This reverts commit 5db58c0038.
2016-07-21 13:58:35 -04:00
Adam Palay
95c0b50ebe authenticate user after their reset confirmation goes through
make password validation code more DRY

grammar nit: "less" -> "fewer"
2016-07-20 11:06:58 -04:00
sanfordstudent
d13e456959 Merge pull request #12939 from edx/sstudent/TNL-4924
moving milestones/gating check to access.py
2016-07-11 16:21:53 -04:00
Douglas Hall
c38f2373c7 Add recipient key to Zendesk ticket creation API request payload 2016-07-11 14:56:44 -04:00
Sanford Student
5db58c0038 moving milestones check to access.py 2016-07-11 14:32:52 -04:00
Kevin Kim
0bf8fc4b44 Converts the dates on the dashboard, sidebar navigation, and important course dates to user specified time zone. 2016-07-05 17:45:13 +00:00
Kevin Kim
059985b9ec Added time zone field to user account settings, currently hidden behind a feature flag. 2016-06-28 14:33:56 +00:00
Usman Khalid
781623205e Added a named outer_atomic option.
A named outer is suitable when dealing with IntegrityErrors. It only
checks that it is not nested under an atomic only if it is nested
under enable_outer_atomic(name=<name>). This way only the view which
is causing IntegrityErrors needs to have its automatic transaction
management disabled and other callers are not effected.
2016-06-16 14:18:21 +05:00
PaulWattenberger
f5b42c8955 Initial lms changes for Sailthru (#12706)
* Initial lms changes for Sailthru

* Fix identified code quality issues

* Fix migration failure

* Fix code quality identified issue
2016-06-09 16:21:11 -04:00
PaulWattenberger
9781685719 Revert "Pwattenberger/sailthru" (#12701) 2016-06-08 23:03:22 -04:00
PaulWattenberger
ca02235e64 Pwattenberger/sailthru (#12646)
* Initial commit of Sailthru lms changes

* Field mapping changes for Sailthru integration

* Merge fix

* Add users to Sailthru list on registration

* FIx minor code format issues

* Several updates based on code review feedback

* Updates based on recomendations from Sailthru

* Clean up unit tests

* Fix last login

* Updates based on code review feedback

* Updates based on code review feedback

* Fix comment

* Cleanup
2016-06-08 19:38:29 -04:00
Calen Pennington
e93d112c04 Make UrlResetMixin.reset_urls a public method (so that it can be used inside test methods) 2016-06-06 13:27:38 -04:00
Nimisha Asthagiri
4a56fa5fb1 Adding infrastructure to support context-sensitive help links in the LMS. 2016-05-27 11:35:05 -04:00
Eric Fischer
a9a3fabfe8 Bulk Email Multiselect (#12301)
TNL-4356

Allows multiple bulk email targets to be specified at once.

-The previous "All" option has been split into "Staff" and "Learners"
-The backend changes made here lay the groundwork for cohort emailing
-The data migration, 0005, is somewhat large and requires deploy attention
-Tests have been updated
-Numerous safe-commit-linter fixes are included
2016-05-26 14:22:04 -04:00
Calen Pennington
18e1610043 Remove the create_user argument to setUp.
Instead, use a class attribute to define test behavior. This allows for
easier addition of new mixins over time.
2016-05-04 11:35:55 -04:00
Calen Pennington
39ff841d1f Don't pass arguments to setUp (for UrlResetMixin)
The TestCase API doesn't accept arguments, so passing arguments for some
TestCase subclasses makes adding new inheritance/mixins tricky. Instead,
prefer configuration via class attributes for TestCases.
2016-05-04 11:34:51 -04:00
Ayub khan
d45c4d8caf Revert "Implement 'from_string_or_404' in utils" 2016-05-02 14:23:39 +05:00
Ayub khan
986209669d Revert "SUST-35 Implementation of course_key_from_string_or_404 to return course_key or raise a 404" 2016-04-28 15:50:17 +05:00
Ayub-khan
e687f1e754 -Adressed all comments 2016-04-18 11:57:31 +05:00
Ayub-khan
ef70d017c8 -fixed failing tests
-Adressed all comments
2016-04-15 15:40:21 +05:00
Ayub-khan
d8464dbfb0 -changed method name from "from_string_or_404" to "course_key_from_string_or_404".
-Updated method "course_key_from_string_or_404" to raise message too.
-Wrote tests for "course_key_from_string_or_404" when exception message is given.
-Modified existing methods to use "ddt.data".
-Used Splunk logs to find exectly where we were getting "Invalid Key Error"
-Updated Views where we were getting "Invalid Key Error" in splunk logs.
-Wrote tests for those View End points where we were getting "Invalid Key Error"
2016-04-14 15:57:39 +05:00
muzaffaryousaf
e2d9ecc010 Make migrations in-sync with models 2016-04-07 12:26:18 +05:00
muzaffaryousaf
90c670c0ac Unit test to check the migrations are in sync. 2016-04-07 12:26:17 +05:00
Muhammad Rehan
771a7d06ca Implement 'from_string_or_404' util and its example usage. 2016-03-23 20:10:32 +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
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
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
Sanford Student
45f8e526c0 making check more generic 2016-02-17 09:22:27 -05:00
Sanford Student
52d8cb009f MA-1882 adding tests and reworking regex to exclude blocks routes 2016-02-12 09:35:29 -05:00
Sanford Student
b92c12cbe5 MA-1882 adding course api to regex 2016-02-11 16:03:52 -05:00
David Ormsbee
be25bb8aba Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase
Cached values were leaking across tests, causing difficult to debug errors,
particularly when using Config Models. As part of this work, certain tests
that had query counts that relied on those values being cached needed to
be adjusted up.
2016-02-06 00:01:15 -05:00
Robert Raposa
29fe2c7b0c Move markup helpers to djangolib 2016-02-05 02:42:43 -05:00
Kevin Falcone
2d9708da03 Remove uses of using() from migrations
This hardcoded the db_alias fetched from schema_editor and forces django
to try and migrate any second database you use, rather than routing to
the default database.  In testing a build from scratch, these do not
appear needed.

Using using() prevents us from using multiple databases behind edxapp.

Additionally - add back a removed backwards migration from certificates
0003.  I have no idea why this was dropped in the 1.8 upgrade.
2016-02-01 16:57:26 -05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
Nimisha Asthagiri
f3cb692472 Safe Session Cookies Middleware 2016-01-26 17:23:03 -05:00
Felipe Montoya
4742e661f4 Creating a settings object that is aware of the microsite settings.
Adding the declaration of the settings object to openedx.conf to be able to import it from a nicer location

Resolving quality violations

Merging dicts with the settings definition when they exist in the microsite configuration

Using a cache to improve the perfomance of quering any dictionary in the microsite definition

Ignoring the invalid-name pylint warning since the names must be kept thsi way to stay the same as the ones in django.
Removing the default dict argument as per https://docs.python.org/2/tutorial/controlflow.html#default-argument-values

Extracting the implementation of the microsite to a selectable backend.

Leaving the function startup.enable_microsites for backwards compatibilityy

Adding a database backend

Using a cache to improve the perfomance of quering any dictionary in the microsite definition.
Changed the database backend so that it extends the settings file backend and removed all the unnecessary methods.

Using the backend provider for the get_dict function

some tweeks and some initial unit tests

Using getattr as a function insteal of calling the underlying __getattr__ directly

Adding an ModelAdmin object for the microsite model in the django-admin panel

refactor enable_microsites()

consolidate/refactor some shared code

add config to aws.py and add migration files

fix tests

Changes to get the backends to run after the refactor

add archiving capabilities to microsites. Also make a few notes about performance improvements to make

fix tests

Making the query to find if microsites exist in the database faster

add ORG to microsite mapping tables and some performance improvements

allow for Mako templates to be pulled from the database

fix tests

For the database template backend the uri of the template does not use the filesystem relative path

Fixing pylint violations

Added caching of the templates stored in the database

Fixing pylint errors

fix pylint

Clearing the cache on model save

Fixing pylint errors

rebased and added test coverage

rebased cdodge/microsite-improvements branch with master and added test
coverage

added missing migration

fix quality violations

add more test coverage

mattdrayer: Add microsite_configuration to cms.INSTALLED_APPS

added microsite settings to cms/envs/test.py

run session cookie tests only in LMS

fixed broken tests

putting middleware changes back

Preventing the template_backend to be called on requests which have no microsite

changes to address feedback from mjfrey

changed BaseMicrositeBackend to AbstractBaseMicrositeBackend

changes after feedback from mattdrayer

fixed broken tests and quality violations

Allowing the backend to handle the enable_pre_startup routine

Typos and docstrings

Adressing feedback

Fixing python tests

add comment to explain why we need enable_microsites_pre_startup()
2016-01-15 14:52:36 +05:00
Zia Fazal
2f275f31b4 fixed scenario when tests run using cached sql schema 2015-12-31 20:03:28 +05:00
Diana Huang
fab7a071e3 Add new helper methods. 2015-12-15 16:21:14 -05:00
Zia Fazal
2cb2233dde initial change set. add org autocomplete
added unit tests and fixed JS tests

added bok choy tests

fixed broken botchoy tests

fixed course discovery broken test

removed monkey patch at class level

changes after feedback from matte
2015-12-11 18:39:55 +05:00