Commit Graph

134 Commits

Author SHA1 Message Date
chrisndodge
c928252b5a Revert "Revert "add an additional tag so we can route zendesk tickets better for..." 2014-09-24 13:19:51 -04:00
chrisndodge
21933bfbd7 Revert "add an additional tag so we can route zendesk tickets better for white l..." 2014-09-24 12:46:05 -04:00
chrisndodge
7b88863b4d Merge pull request #5359 from edx/cdodge/add-microsite-tag-to-zendesk
add an additional tag so we can route zendesk tickets better for white l...
2014-09-24 08:52:43 -04:00
Chris Dodge
e08040aa75 add an additional tag so we can route zendesk tickets better for white label sites
add tests

fix

use org
2014-09-23 15:39:21 -04:00
David Ormsbee
4f5d8b30de Basic Mobile API (v0.5) and Video Abstraction Layer integration.
Note that the features in this release are opt-in, and course and video
behavior will remain the same unless a course explicitly opts in.

Major pieces of functionality with this commit:

Allows the listing of a user's enrollments, course videos, and updates. In
order to make a course available for mobile use, course staff must explicitly
set the Course Advanced Setting "Mobile Course Available" to true. Course staff
will always see their own courses through the Mobile API regardless of this
setting, but students will only be allowed to see a course through the Mobile
API if this setting is set to "true". By default, a Course will *not* be
available for mobile use.

This is a Django app for video resource management. It is completely optional,
and is intended to allow video and operations teams to create new encodings of
videos (e.g. low res for mobile) and change CDNs without having to edit course
data directly. Course teams can now use a "EdX Video ID" setting for Videos,
which will leverage VAL. Video units that do not fill in an "EdX Video ID" will
behave exactly as they always have.

* The Mobile API is enabled with the ENABLE_MOBILE_REST_API feature flag.
* VAL is enabled with the ENABLE_VIDEO_ABSTRACTION_LAYER_API feature flag.
* VAL and the Mobile API both require ENABLE_OAUTH2_PROVIDER).
* The Mobile API is a read-only API, but VAL requires database migrations.
* Applications that make use of either the Mobile API or VAL must be registered
  with the OAuth2 provider app in Django Admin.
2014-09-23 12:31:46 -04:00
Carlos Andrés Rocha
8857509b2d Add edX OAuth2 provider with OpenID Connect support 2014-09-17 11:36:06 -04:00
Chris Dodge
50cdd2b087 only redirect to dashboard if user has course enrollments, otherwise remain on the course catalog page (aka homepage or root)
update lettuce test to match new expected behavior

add Jason's feedback

only apply new redirect logic for microsites

switch to use a feature flag to determine whether to support redirect behavior
2014-09-15 20:52:44 -04:00
Will Daly
1ad8d4f2d4 Add verification for CyberSource2 implementation.
Clean up shopping cart processor API.
Fix UUID JSON serialization bug in CyberSource2 implementation.
Update test suite to use new CyberSource2 implementation.
Fix i18n messages in CyberSource2
Enable CyberSource2 implementation by default.
2014-08-20 10:39:48 -04:00
Jesse Zoldak
4d5b948928 Merge pull request #4748 from Stanford-Online/jbau/parallel-unit-tests
make unit tests respect mongo port/host settings (with default)
2014-08-15 10:56:52 -04:00
Will Daly
a827df27fe Remove update assets from unit test suite
Update settings so unit tests pass
2014-08-12 15:08:39 -04:00
Jason Bau
b55362b925 make unit tests respect mongo port/host settings (with default)
settings are read in from environment variable
2014-08-11 14:17:29 -07:00
Sarina Canelake
cfb7f99c8e Add filter to ignore deprecation warnings by default
Add filter to only show first occurance of DepWarning
2014-07-11 15:40:09 -04:00
Nimisha Asthagiri
8855b12b76 Update tests to allow LMS tests to use published branch setting.
Conflicts:
	cms/djangoapps/contentstore/views/tests/test_container_page.py
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/student/tests/test_login.py
	common/lib/xmodule/xmodule/modulestore/tests/django_utils.py
	common/lib/xmodule/xmodule/modulestore/tests/factories.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/branding/tests.py
	lms/djangoapps/courseware/tests/test_submitting_problems.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/instructor_task/tests/test_base.py
	lms/djangoapps/instructor_task/tests/test_integration.py
2014-07-09 21:10:12 -04:00
Nimisha Asthagiri
8dca8053f6 Fix branch settings. 2014-06-27 21:47:53 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540
Refactor get_parent_locations STUD-1663
2014-06-26 18:00:11 -04:00
James Tauber
99cfea153c dummy theme templates for testing 2014-06-26 10:37:58 -04:00
Oleg Marshev
715fde27c4 Redirect Chinese students to a Chinese CDN for video. 2014-06-24 18:39:52 +03:00
Julia Hansbrough
0d854bd51e Moved hardcoded defaults into settings 2014-05-28 20:44:26 +00:00
Sarina Canelake
ced09a6b04 Switch default instructor dashboard to new dash
LMS-1296
2014-05-12 10:18:27 -04:00
Adam
5cef9f7a37 Merge pull request #3202 from edx/talbs/lms-dashboard-trackstatus
LMS: Show Enrollment Type on Dashboard
2014-05-05 13:19:49 -04:00
Waqas
a07da78a0f Add the "VERIFIED_CERTIFICATES" toggle on dashboard 2014-05-05 20:10:26 +05:00
Waqas
0d7f34b5d3 Update the software secure result call back by correcting the typo
LMS-2516
2014-05-05 16:44:33 +05:00
John Cox
ce0b640712 Add third-party auth implementation and tests 2014-04-25 12:11:20 -07:00
Jay Zoldak
3fc19a35b0 Serve video HTML5 sources locally for acceptance tests 2014-04-15 10:40:53 -04:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
2014-03-21 13:58:01 -04:00
chrisndodge
c4401fdc7f Merge pull request #2553 from edx/cdodge/microsite-cleanup
Address Microsite PR feedback - separate out middleware from microsite logic, shor...
2014-02-28 17:38:19 -05:00
Kristin Stephens
3881ffdc0d New tab (Metrics) in instructor dashboard
Metrics tab shows student data:
  -Count of students opened a subsection
  -Grade distribution per problem

for each section/subsection of the course.

Implemented for both the old and beta dashboard
Controlled by a feature flag 'CLASS_DASHBOARD'
Data is aggregated across all students
Aggregate data computed from courseware_studentmodule
2014-02-28 14:01:44 -08:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Jay Zoldak
1fe453a3a7 Update schema for bok-choy database
Finalize tests for embargo middleware app
2014-02-27 10:27:29 -05:00
Ned Batchelder
6990b5ba41 Tests should explicitly ask for English. 2014-02-10 15:23:13 -05:00
Jason Bau
fc8efc3017 fix tests that were breaking on dev envs due to TIME_ZONE='UTC' 2014-02-06 23:07:26 -08:00
Jason Bau
b525f40377 Start datetime localization in LMS
Currently just coerces the time displayed for due dates
(accordion.html and progess.html) to settings.TIME_ZONE
2014-02-06 07:57:56 -08:00
Calen Pennington
818ad15967 Merge pull request #2304 from cpennington/less-initialization
Don't force modulestore initialization when running lms manage.py, only when running via the wsgi file
2014-02-04 13:27:01 -08:00
Calen Pennington
13c894eb31 Remove extraneous configuration 2014-02-04 15:35:26 -05:00
Dave St.Germain
6d50ff7b61 Set the html language to the browser's specified language 2014-01-28 16:43:29 -05:00
Jay Zoldak
538ecf4852 Enable microsite tests
Move microsite test assets to common/test

Rename helper method to not have test in the name
Rename test css file
2014-01-23 10:42:51 -05:00
David Ormsbee
db7308adc1 Remove unused parts of LinkedIn API
Fix whitelist logic to handle empty lists.
2014-01-16 17:03:15 -05:00
David Ormsbee
a18bce81f2 Basic cleanup of code to determine whether a user has a LinkedIn account. 2014-01-16 17:03:15 -05:00
Chris Rossi
c5c9554dbc Test LinkedinAPI 2014-01-16 17:03:14 -05:00
Chris Rossi
fd1d98f7de Fix tests, one bug. Adopt a more Django-ish testing style. 2014-01-16 17:03:14 -05:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
2014-01-14 14:36:01 -05:00
Will Daly
1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor
Stub Server Port Conflicts and Refactor
2013-12-19 06:55:24 -08:00
Will Daly
0fd03cfb02 Moved stub servers to terrain
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
2013-12-19 09:12:41 -05:00
Don Mitchell
3cf75198c5 Merge pull request #1954 from edx/dhm/loc_mapper_memoize
loc mapper memoize
2013-12-16 10:34:12 -08:00
Don Mitchell
f6de4f2186 Location map uses a separate cache and defaults to general 2013-12-16 12:31:19 -05:00
Carson Gee
ccc87337d6 Add sysadmin dashboard
For seeing overview of system status, for deleting and loading
courses, for seeing log of git imports of courseware.  Includes command
for importing course XML from git repositories.

Added a lot of tests for additional coverage with some minor fixes
those tests discovered
2013-12-15 19:06:05 -05:00
David Baumgold
fb13bed947 Updating comments and docs for MITx -> edX transition 2013-12-10 13:21:18 -05:00
Sarina Canelake
b406ba0f83 Acceptance tests for grades download
Refactor instructor dash acceptance tests.
Add additional acceptance tests for buttons on 'Data Download' tab.

LMS-58
2013-12-09 18:28:41 -05:00
David Baumgold
03c8c0e1e7 Merge pull request #1880 from edx/db/mitx-edx-locmem
update LocMemCache location to use edx instead of mitx
2013-12-06 08:30:07 -08:00
David Baumgold
1134b88415 update LocMemCache location to use edx instead of mitx 2013-12-06 11:22:26 -05:00