Commit Graph

451 Commits

Author SHA1 Message Date
Andy Armstrong
fe6668a550 Merge branch 'release'
Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt
2014-09-23 15:53:10 -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
Waheed Ahmed
3e64faeaa3 Fixed wiki merge url regex.
TNL-413
2014-09-22 15:41:19 +05:00
Carlos Andrés Rocha
8857509b2d Add edX OAuth2 provider with OpenID Connect support 2014-09-17 11:36:06 -04:00
Renzo Lucioni
9239253614 Remove Django Waffle 2014-09-12 16:22:03 -04:00
Andy Armstrong
7683cba2c3 Add support for UX reference templates in LMS 2014-09-11 13:52:48 -04:00
Gabe Mulley
7900e8d346 Add event tracking endpoint to be called by segment.io 2014-09-09 07:25:54 -04:00
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx.
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
2014-08-25 15:33:43 +00:00
Don Mitchell
d1ffecf31f Fix lms wiki url parsing
LMS-11240
2014-08-21 12:11:27 -04:00
Will Daly
714f9bb69f Auto enroll students even if there are multiple course modes
Add session middleware to an external auth test to fix a test failure with the auto-registration AB-test changes
2014-08-15 10:26:27 -04:00
Muhammad Shoaib
33d5b49e81 added course price set/view/edit functionality
added CoursmodeArchive model to save the old prices history

analytics -> instructor_analytics

analytics -> instructor_analytics
2014-08-05 10:00:13 -04:00
Renzo Lucioni
3599e2eec7 Revert "Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul""
This reverts commit 079808ee47.
2014-07-30 17:01:52 -04:00
Julia Hansbrough
079808ee47 Revert "Merge pull request #4545 from edx/renzo/bi-analytics-overhaul"
This reverts commit 252038c376, reversing
changes made to 7caf8c53b1.
2014-07-29 17:41:46 +00:00
Renzo Lucioni
252038c376 Merge pull request #4545 from edx/renzo/bi-analytics-overhaul
Overhaul Segment.io integration
2014-07-28 11:59:58 -04:00
Renzo Lucioni
8bd84b5f3a Overhaul Segment.io integration 2014-07-28 11:08:02 -04:00
Ned Batchelder
533e072677 A debug view for seeing the URL params 2014-07-24 16:11:20 -07:00
Ned Batchelder
d9bb2868e8 Add a view that can show us what URL params we got 2014-07-24 16:10:56 -07:00
asadiqbal08
5734d2a883 asadiqbal08:[EX-6] Set up data models and shopping cart enhancements in the LMS
Added username into Authors file

[Ex-12] Add user to input coupon code in the Shopping Cart

[Ex-13] Discount should be reflected in the Payment confirmation page and email

added E-commerce Tab in Instructor Dashboard

added name/email in authors file

removed the is_active column, change the colors scheme, fixed bugs

wip

wip

test github account

STORE_BILLING_INFO set to True

cybersource api update, reference number updated, merchant_data removed from params

View Course buttons on receipt

link for course added to receipt

receipt.html view course button - func update

receipt.html course link update

move new CyberSource implementation to a separate file so that we can keep the original

remove config changes

remove config changes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

remove array paid_course_ids init in views.py

removed the is_active filter=false, added styling to the inactive coupon codes

remove coupon redemption during clear cart and update test cases

[Ex-11]added test cases(E-commerce Tab Instuctor Dashboard)

update data model max_length to 255

Add column to the list of coupons in the E-Commerce tab

Add ability for microsites to specify custom CyberSource secret configuration, i.e. run under different accounts

make the new CyberSource2 also microsite aware

updating migration for student and shopping cart apps

added user signup functionality that orignated from the Microsites

added non-microsite user signup tests

fix the hard coded callback URL to localhost

add comment

Modify e-commerce instructor tab to show a total amount above the coupon listings for admin finance user

made changes as suggested by diana khuang

add the CourseAccessRoles table to the Django Admin website

shopping cart coupon checkout changes as suggested by Jason Bau

changes are made according to the suggesstions on PR#4172

changes made in the coupons file

changes in the coupons get_coupon_info view

fix merge conflict resolution error

changes in the remove_coupon view json response

changes as suggested by David Baumgold

pep8/pylint fixes

Changes as suggested by jasonBau

don't assume item in shopping cart is a PaidCourseRegistration

fix up some logging

changed the urls of the coupon views and use the post to get the values from the request
2014-07-10 09:35:32 -04:00
Julia Hansbrough
d9dd45662e Enables LMS to handle deprecated URLs
LMS-2651
2014-07-09 21:51:37 +00:00
Usman Khalid
c201d78c43 Fixed urlpatterns regex for support views in dashboard app.
LMS-6634
2014-07-02 16:01:25 +05:00
Sébastien Hinderer
65a07dd52c The LMS should serve favicon.ico also when a theme is enabled. 2014-06-18 14:33:11 +02:00
Bertrand Marron
573eda0d61 Add missing $ at the end of the MKTG URLs 2014-06-17 20:03:31 +02:00
Dave St.Germain
f2fb57e196 Added manual refund page for support.
PR-615
2014-06-17 08:24:02 -04:00
Will Daly
dc34d753c0 Serve ORA2 JavaScript i18n strings 2014-06-09 11:35:09 -04:00
Sarina Canelake
1cd94cf5e5 Remove gradebook code from legacy.py (moved to instructor/views/api.py) 2014-05-27 10:59:16 -04:00
Sarina Canelake
1a4fcb055b Make SPOC gradebook an API implementation
rather than just hacked in to the instructor_dashboard base file.
Also move the tests from the legacy implementation to the new dash API implementation.
2014-05-27 10:59:16 -04:00
Calen Pennington
cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
2014-05-22 10:52:00 -04:00
David Baumgold
6e0e13003f Merge pull request #3744 from lduarte1991/lduarte-harvardx
Reconnecting Token Generator for Annotation Tool [Fix]
2014-05-20 15:34:34 -04:00
Don Mitchell
3ab925a178 Merge pull request #3787 from edx/dhm/bug_mktg_url
marketing url too many slashes
2014-05-20 13:56:16 -04:00
Don Mitchell
591fc2b547 Fixes Carlos's bug 2014-05-20 11:15:10 -04:00
Don Mitchell
e2332d1922 Fix old dashboard list cohorts 2014-05-20 10:37:03 -04:00
lduarte1991
e911d57911 Revert "Revert pull request #3466"
This reverts commit 59e3cae4c9.
2014-05-15 15:23:28 -04:00
David Adams
9bc7a518ee Fixes issue with metrics tab click handlers
Click handlers were not getting attached to DOM elements in some cases on slow running machines.
  Added logic to attach handlers when elements are ready.

Added 2 buttons on metrics tab:
  Download Subsection Data for downloading to csv.
  Download Problem Data for downloading to csv.
2014-05-15 11:45:59 -07:00
David Baumgold
59e3cae4c9 Revert pull request #3466 2014-05-14 13:55:26 -04:00
Sarina Canelake
b7a0de7f3b Change URL patterns for instructor dashboard
Fix acceptance and unit tests

LMS-1296
2014-05-12 10:18:28 -04:00
Sarina Canelake
09442ef4ac Port spoc gradebook to new instructor dash
LMS-1296
2014-05-12 10:18:28 -04:00
Sarina Canelake
ced09a6b04 Switch default instructor dashboard to new dash
LMS-1296
2014-05-12 10:18:27 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx
Reconnecting Token Generator for Annotation Tool
2014-05-09 16:14:42 -04:00
Giulio Gratta
ba6b0cf4e7 Changes for Help Modal to work on Stanford Site
- moved zendesk endpoint to new condition
- some help modal styling
2014-05-06 12:06:04 -07:00
Joe Blaylock
ae8847cd6e Certificates: URL endpoint for cert gen
* API endpoint for certificate generation, an authenticated  post with course
  id requests that grading be carried out and a cert generated for
  request.user in that course, using the usual grading and certificate
  machinery (ie, it does not imply whitelisting, though whitelists and
  blacklists will be respected)
  - Logs each request as it comes in
  - Calls xq.add_cert() and consequently, does grading synchronously on
    this app host and then queues request for certificate agent.
  - example usage:
    ```
    curl --data "student_id=9999&course_id=Stanford/2013/Some_Class" http://127.0.0.1:8000/request_certificate
    ```

* Studio advanced setting added, "certificates_show_before_end", which
  determines whether a course should permit certificates to be downloadable
  by students before the coures's end date has passed.
  - Modifications to dashboard view and templates to allow display of
    certificate download links before course has ended.
    (XXX: may declare failing students as failing before the course has ended.)
  - To test, turn the setting on in a course which hasn't ended yet, and
    force certificate generation for a student, then check their
    dashboard.
2014-05-02 14:34:21 -07:00
Jason Bau
f8c062b6ce lti 2.0 result service rest endpoint 2014-04-29 12:01:12 -07:00
lduarte1991
5ae1ca9685 Reconnecting Token Generator for Annotation Tool 2014-04-24 16:14:05 -04:00
David Adams
0f37ee6924 This makes the metrics tab "bars" clickable.
Clicking on any of the bars displays a list of students for that
  particular action (either opened the subsection or attempted the
  problem).
  Students are listed for the sub-sections.
  Students, grade and percent are listed for the problems.
  The on-screen list displays only the first 250 students with
  an overflow message if there are more students than that.
  The csv download lists all students.
2014-04-11 13:56:49 -07:00
Dave St.Germain
660244201f Refactored course_nav middleware to isolate the django-wiki hack,
remove unnecessary code, and clarify what it's doing.
2014-04-08 15:24:48 -04:00
David Baumgold
f5f7b77d4e Display error page templates, for testing purposes
This commit allows us to test the server error template by visiting `/500`. This
way, we can catch errors in our error templates, instead of having infinitely
recursing errors.
2014-03-25 14:55:14 -04:00
Jay Zoldak
1de5e565c3 Kill the perfstats module, which is unused 2014-03-18 15:47:36 -04:00
John Cox
8ecfa8679a Add common/djangoapps/third_party_auth; update pylintrc to allow test_* names.
third_party_auth contains a working settings mechanism, the start of the provider interface + 3 implementations (Google, Mozilla Persona, LinkedIn), and a stub for the auth pipeline. Modified existing lms settings files to use but deactivate the module.
2014-03-06 17:20:58 -08: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
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release'
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
2014-02-27 17:33:40 -05:00
Julia Hansbrough
a7ae152d9b Embargo Middleware feature
Adds configurable middleware in common/djangoapps/embargo that
allows specific courses to comply with US Export regulations by
embargoing students from specific countries, whilst simultaneously
allowing other courses to be freely open to all.
2014-02-27 08:37:58 -05:00