Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3531 Commits

Author SHA1 Message Date
Renzo Lucioni
257e8cf857 Merge pull request #5551 from edx/renzo/track-selection-test-cleanup 
Clean up after track selection experiment
 2014-10-14 15:06:19 -04:00
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00
stephensanchez
c15d97ea9b Removing the feature flags for new header and footer. 
Fix acceptance tests

Updating lettuce tests.

Revert the deletion of the original edx header and footer.

Renaming old header and footers to legacy files.

Add IS_EDX_DOMAIN flag for header.

Updating tests and django main template.

renaming the header files for microsite backwards compat.
 2014-10-14 17:47:46 +00:00
Will Daly
ad11c1b6f4 Update django-countries to 2.1.2, override country name for Taiwan 2014-10-14 13:12:36 -04:00
Don Mitchell
a63d58cff5 Remove unused credentials from mongo init 
was breaking pymongo 2.7
 2014-10-09 11:55:14 -04:00
David Baumgold
fc5148438d Merge pull request #4730 from edx-solutions/secure-cookies 
secure-cookies: Allow to use secure HTTPS cookies (Django setting)
 2014-10-09 10:24:34 -04:00
Will Daly
900122b907 Use UglifyJS to minify JavaScript in the LMS 2014-10-08 09:16:04 -04:00
Will Daly
c4eee8ebc3 Merge pull request #5502 from edx/will/per-course-donation-button 
Add donation button to the enrollment success message
 2014-10-08 06:05:37 -04:00
Will Daly
f8365a2d3b Add donation end-point 
Make donations configurable

Added donation button to dashboard

Generalize merchant defined data for payment processor
 2014-10-07 14:22:55 -04:00
Greg Price
183d688129 Add events for cohort modifications 
This includes cohort creation/deletion and membership changes.
 2014-10-03 11:32:43 -04:00
Andy Armstrong
6219ecacfe Support adding cohorts from the instructor dashboard 
TNL-162
 2014-10-01 09:22:32 -04:00
Andy Armstrong
8627fdef32 Support adding students to a cohort via the instructor dashboard. 
TNL-163
 2014-10-01 09:22:31 -04:00
Renzo Lucioni
e895e10185 Merge pull request #5427 from edx/renzo/profile-page-preferred-language 
Allow changing of language preference from profile page
 2014-09-30 23:34:52 -04:00
Renzo Lucioni
254a0ce6c8 Allow changing of language preference from profile page 2014-09-30 21:11:02 -04:00
Greg Price
887bcb5578 Add a new user API for the notifier 
This new endpoint is designed specifically to fill the needs of the
notifier and should not be used by other clients.
 2014-09-29 17:04:23 -04:00
Martyn James
1faa732823 Changes to default settings for LMS as recommended by Matasano 2014-09-29 10:34:14 -04:00
Ned Batchelder
4d56f62d99 Merge pull request #5199 from edx/ned/remove-jsdraw 
Remove JSDraw
 2014-09-25 23:03:50 -04:00
Andy Armstrong
0ed3a95d3a Merge branch 'release' 
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
 2014-09-25 16:25:45 -04:00
Will Daly
7f8c6bb058 Add Django apps for student account and profile. 
Add Python APIs for account/profile information to user_api
Updating profile page to have social linking

Authors: Renzo Lucioni, Alasdair Swan, Stephen Sanchez, Will Daly
 2014-09-25 08:36:22 -04:00
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
ddb0ab9027 Merge pull request #5361 from edx/cdodge/change-invoice-email-and-attachments 
change registration code email and attachments, per product requirements
 2014-09-24 10:56:41 -04:00
Clinton Blackburn
7fa7b52732 Properly Setting ANALYTICS_DASHBOARD_NAME for AWS 2014-09-24 10:24:09 -04:00
Ned Batchelder
364989b9ee Remove JSDraw 2014-09-24 09:56:05 -04:00
Chris Dodge
0c72e37374 change registration code email and attachments, per product requirements 
remove extra lines

conditionalize address line 2
 2014-09-24 09:13:37 -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
Clinton Blackburn
3e9a5ecfd5 Properly Setting ANALYTICS_DASHBOARD_NAME for AWS 2014-09-23 16:21:31 -04:00
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
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
37d604a90f Allow SSL enforcement for OAuth2 provider to be configurable 2014-09-22 10:47:20 -04:00
Waheed Ahmed
3e64faeaa3 Fixed wiki merge url regex. 
TNL-413
 2014-09-22 15:41:19 +05:00
Adam Palay
7f4da14185 Add middleware optionally to catch unenrolled students who fail has_access (TNL-286) 2014-09-18 11:35:17 -04:00
Carlos Andrés Rocha
35fdcf43b7 Merge pull request #5263 from rocha/rc-oauth2-provider 
Add edX OAuth2 provider with OpenID Connect support
 2014-09-17 13:25:47 -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
8e1d0f7f23 For microsites, since we don't have a footer override yet for django templates, remove the footer all together 2014-09-17 10:52:04 -04:00
chrisndodge
23531e8966 Merge pull request #5220 from edx/cdodge/dont-redirect-to-dashboard-when-having-and-empty-dashboard 
only redirect to dashboard if user has course enrollments, otherwise rem...
 2014-09-15 22:06:13 -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
Piotr Mitros
78ed5c2c54 Merge pull request #5194 from edx/pmitros/pyfs-convention-cleanup 
Clean up conventions for underscores vs. dashes in config setting.
 2014-09-15 12:08:20 -04:00
Renzo Lucioni
9239253614 Remove Django Waffle 2014-09-12 16:22:03 -04:00
Piotr Mitros
af12acc904 Clean up conventions for underscores vs. dashes in config setting. 2014-09-12 11:52:11 -04:00
Nimisha Asthagiri
4d36276573 LMS-11297 BokChoy and Acceptance tests configure default_store with update_module_store_settings. 2014-09-11 10:48:08 -04:00
Will Daly
b3762ae1b3 Enable third party auth in LMS acceptance tests 
Update db cache
 2014-09-10 16:23:09 -04:00
Clinton Blackburn
9f8e2cf5aa Merge pull request #5132 from edx/insights-message-update 
Updated Analytics Dashboard Message
 2014-09-10 15:11:59 -04:00
Sarina Canelake
f0c8139ad8 Transifex config: add Swedish and Swahili language codes 2014-09-10 11:48:45 -04:00
Gabe Mulley
7900e8d346 Add event tracking endpoint to be called by segment.io 2014-09-09 07:25:54 -04:00
Clinton Blackburn
ee036ecaa6 Updated Analytics Dashboard Message 
Message to dashboard now includes the name of the application.
 2014-09-08 15:37:34 -04:00
Piotr Mitros
31176aeb37 AWS settings for XBlocks to have filesystem-like storage 
Upgrades to latest pyfs to support auth not through environment variables
 2014-09-08 10:46:18 -04:00
Ben Patterson
fe85223f73 Revert "AWS settings for XBlocks to have filesystem-like storage" 2014-09-02 11:29:59 -04:00
Piotr Mitros
e5286a14cc Merge pull request #5039 from edx/pmitros/aws-djpyfs 
AWS settings for XBlocks to have filesystem-like storage
 2014-09-02 10:58:58 -04:00