Commit Graph

2320 Commits

Author SHA1 Message Date
Ned Batchelder
a64d926845 Merge pull request #7399 from edx/ned/plat-462
Make sure slashes in JSON content don't end script tags. PLAT-462
2015-03-18 22:47:50 -04:00
Ned Batchelder
6928035cd1 Make sure slashes in JSON content don't end script tags. PLAT-462
The string "</script>" in JSON data would end the script element we're
embedding the data in.  To make sure the data doesn't disrupt the
script, we escape the slash as \/ .
2015-03-18 21:55:36 -04:00
Brian Wilson
243e2660b0 Merge release to master for 20150317 release. 2015-03-18 18:48:56 -04:00
Stephen Sanchez
4acfbbdf21 Reverting the change to add a 201_CREATED status to the enrollment API. 2015-03-18 20:31:58 +00:00
Nimisha Asthagiri
eca523e01e Mobile API MA-7: Support A/B test and cohorted content 2015-03-18 14:55:15 -04:00
Stephen Sanchez
af4d288f95 Merge pull request #7377 from edx/sanchez/enrollment_api_course_modes
XCOM-45 Enrollment API supports creating modes other than honor.
2015-03-18 14:30:55 -04:00
Will Daly
f0b4492065 Merge pull request #7381 from edx/will/ecom-601
Copy changes to the activation email
2015-03-18 14:30:32 -04:00
Will Daly
4d2969b0a8 Merge pull request #7312 from edx/will/quiet-cors-middleware-logging
Downgrade CORS middleware warning to info
2015-03-18 14:30:05 -04:00
Will Daly
c37dc913a0 Copy changes to the activation email 2015-03-18 13:45:15 -04:00
Stephen Sanchez
8c9f6370b8 Allow Enrollment API supports creating and upgrade course modes other than honor.
Fixing tests, cleaning up POST handler to be easier to read.

Wording fixed for unit test comments.
2015-03-18 17:12:02 +00:00
Clinton Blackburn
ae5cbf8b70 Merge pull request #7347 from edx/clintonb/commerce-events
Validating event emission by the commerce app
2015-03-18 12:47:26 -04:00
Clinton Blackburn
a76fd944cd Merge pull request #7410 from edx/clintonb/course-mode-admin
Added SKU column to CourseMode table in Django admin
2015-03-18 12:00:18 -04:00
Stephen Sanchez
321544efe6 Merge pull request #7407 from edx/sanchez/server-to-server-throttling
Allow services to ignore user throttling. Set a more realistic throttle for users.
2015-03-18 11:24:07 -04:00
Clinton Blackburn
9436eacb35 Added SKU column to CourseMode table in Django admin 2015-03-18 11:10:37 -04:00
Ned Batchelder
649e45b40a Merge pull request #7388 from edx/ned/remove-more-test-data-mock-modulestore
Remove useless override_settings of MODULESTORE
2015-03-18 11:08:25 -04:00
Stephen Sanchez
d901b1d3e3 Allow services to ignore user throttling. 2015-03-18 13:48:32 +00:00
Ned Batchelder
425b766965 Remove TEST_DATA_MOCK_MODULESTORE 2015-03-17 17:21:52 -04:00
Awais
3a996155f5 ECOM-1162 2015-03-18 01:24:27 +05:00
Ned Batchelder
7d799e34f3 Remove unused imports 2015-03-17 07:10:31 -04:00
Andy Armstrong
37dd0ec840 Merge pull request #7327 from edx/andya/preferences-api
Implement full preferences API
2015-03-17 00:57:01 -04:00
Andy Armstrong
6976a33a85 Add the preferences endpoint to the User API
TNL-1493

See https://openedx.atlassian.net/wiki/display/TNL/User+API for details
2015-03-16 23:34:35 -04:00
Waqas Khalid
a8457c4fb4 Merge pull request #6871 from edx/waqas/studio-mathjax-unit-problem
Unit page doesn't load when mathjax is down
2015-03-16 18:47:06 +05:00
Waqas Khalid
729dd24c82 Unit page doesn't load when mathjax is down
When mathjax is down studio page doesn't work as
it wait for mathjax to load. I replaced the hard
dependency with soft dependency now unit page can
load with mathjax.
2015-03-16 15:12:01 +05:00
Clinton Blackburn
eb72ab58f9 Validating event emission by the commerce app
Added tests to ensure manual enrollments emit enrollment events.
2015-03-13 14:09:31 -04:00
Awais
4bab316bb9 ECOM-911 no-id-professional mode registration flow 2015-03-13 10:03:05 +00:00
Matt Drayer
cd05391335 Cleaned up milestones API references 2015-03-12 15:58:21 -04:00
alawibaba
5107d463c7 Merge branch 'master' into release
Conflicts:
	lms/envs/common.py (RESOLVED)
2015-03-12 13:20:45 -04:00
Awais
281c8dce2b ECOM-1155 fix the date diff issue. 2015-03-12 16:24:51 +05:00
Will Daly
d9d26796e8 Downgrade CORS middleware warning to info 2015-03-11 15:43:01 -04:00
Adam Palay
882eab4bc9 cache site status message for 5 minutes (TNL-1614) 2015-03-11 14:28:19 -04:00
Will Daly
a5a303ae57 Cross-domain CSRF cookies
When configured, set an additional cookie with the CSRF
token for use by subdomains.

The cookie can have a different name than the default
CSRF cookie, preventing conflicts between cookies
from different domains (e.g. ".edx.org", "courses.edx.org",
and "edge.edx.org").

The new cookie is included only on the enrollment API
views so that the scope of this change is limited
to the end-points that require cross-domain POST requests.
2015-03-11 14:28:19 -04:00
Greg Price
f0322b9662 Merge branch 'release' 2015-03-11 11:14:48 -04:00
Jonathan Piacenti
8ad4d081fb Added library import and export via .tar.gz'd XML files. 2015-03-10 21:29:29 +00:00
Will Daly
3359d6e333 Merge pull request #7243 from edx/will/csrf-enrollment-api
Cross-domain CSRF cookies
2015-03-10 15:39:59 -04:00
Christina Roberts
00313e0e51 Merge pull request #7226 from edx/christina/update-accounts-api
Updates to account and profile APIs based on arch council feedback
2015-03-10 12:47:15 -04:00
Clinton Blackburn
6a2b9f4521 Reorganized course_structures app
Celery requires all tasks to be in a tasks module. Also, the task has been updated to use default values if the the course structure generator encounters a block without the graded or format fields.
2015-03-10 11:12:51 -04:00
asadiqbal
5a7ac441e5 Entrance Exam authoring and messaging updates
Multi-commit history:
- hide drag functionality for entrance exam section.
- hide entrance exam subsection elements e.g. delete, drag, name etc.
- show unit/verticals expanded in case of entrance exam
- modify code in order to allow user to update entrance exam score from UI.
- write down unit tests.
- write down Jasmine tests.
- add bok-choy test
- updated bok-choy test
- internationalize string
- repositioned sequential block creatori
- SOL-221 (entrance exam message)
- SOL-199 LMS Part (show entrance exam content) and hide the course navigation bar.
- redirect the view in case of entrance exam.
- update code structure as per suggestions
- write down unit tests
- fix pep8
- instead of hiding the exam requirement message, now also showing the exam the completion message (success state).
- write down unit test to show exam completion message.
- Update code as per review suggestions
- update doc string
- addressed review suggestions
- change sequential message text
- css adjustments
- added new css class for entrance exam score in studio
- added Jasmine test for remaning coverage
- sequential message should appear under the context of entrance exam subsection.
- updated text in CMS and LMS as per suggestions.
- added unit text to insure sequential message should not be present in other chapters rather then entrance exam.
- skip setter if empty prerequisite course list
- exclude logic from xblock_info.js that is specifically related to entrance exam.
- added js tests and updated code as per suggestions
- added tests
- addressed several PR issues
- Several small fixes (style, refactoring)
- Fixed score update issue
- added some more unit tests.
- code suggested changes.
- addressed PR feedback
2015-03-10 09:24:43 -04:00
Greg Price
7e7b13b488 Merge pull request #7275 from edx/clee/MA-272_video_analytics
MA-272 Updated analytics shim for mobile video events
2015-03-09 15:43:19 -04:00
Greg Price
d5b870e7b2 Merge pull request #7276 from edx/gprice/oauth-exchange
Add an endpoint to exchange OAuth access tokens
2015-03-09 15:30:19 -04:00
christopher lee
bb5fbda873 MA-272 Updated analytics shim for mobile video events
Shim has been updated to handle currents builds of the android and iOS
apps which are not returning the correct semantics/events. Shim now
includes the seek event.
2015-03-09 15:01:30 -04:00
Greg Price
e85eb91e06 Add an endpoint to exchange OAuth access tokens
This allows the holder of a third-party access token (e.g. from Google
or Facebook) to get a first-party access token for the edX account
linked to the given access token.
2015-03-09 14:12:18 -04:00
cahrens
e30ea5c08b Switch to api directory and improve error handling. 2015-03-09 12:51:43 -04:00
Will Daly
cbdc269b47 Cross-domain CSRF cookies
When configured, set an additional cookie with the CSRF
token for use by subdomains.

The cookie can have a different name than the default
CSRF cookie, preventing conflicts between cookies
from different domains (e.g. ".edx.org", "courses.edx.org",
and "edge.edx.org").

The new cookie is included only on the enrollment API
views so that the scope of this change is limited
to the end-points that require cross-domain POST requests.
2015-03-09 12:32:49 -04:00
Will Daly
feed7eaada ECOM-1178: Embargo rules for continent codes.
This commit fixes a bug that could occur when GeoIP
returns a continent code ("EU" or "AN") instead of a
country code.  The previous implementation would
block users in this case since the country code
was not on the whitelist (consisting of all known
country codes).  The new implementation allows user
access by default if we don't recognize the country code.
2015-03-09 12:17:02 -04:00
Carlos de la Guardia
baa1b05eb7 Add empty introspection rule fro BlockTypeKeyField.
From 0.7 on, South requires explicit introspection rules. Previously, it used the parser module to introspect.
2015-03-05 22:34:29 -06:00
cahrens
c8a20df210 Combine account and profile into same API. 2015-03-05 16:13:49 -05:00
Matt Drayer
df937f1feb Renamed conflicting migration file 2015-03-05 10:21:03 -05:00
Matt Drayer
be77f8bf8c Revert "Renamed conflicting migration file"
This reverts commit 04429e77f0.
2015-03-05 10:16:43 -05:00
Matt Drayer
04429e77f0 Renamed conflicting migration file 2015-03-05 10:09:36 -05:00
Zia Fazal
e21ff20375 backend changes based on feedback
Conflicts:
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/instructor_task/api.py

refined entrance exam student attempts reset

Quality improvements 1/16

added rescore, delete state and task history functionality

added unit tests for entrance exam reset attempts

added unit tests for re scoring of entrance exam and task history

improved test coverage

Got rid of pep violation

feedback changes and added jasmine test

added more jasmine tests for Javascript changes

added bok-choy tests for UI changes

replaced input containing <p> tags with <label>

Removed ee element assertions to avoid js error

Added call to super.setUp()

changes based on feedback on 2/18

Writing tests in JS instead of coffee script

commit related to skip entrance exam 2/13

fixed bad-continuation quality error

fixed broken bok-choy test

changes based on feedback on 2/18

added js tests and removed coffee script tests

fixed broken bok-choy and unit tests

changes left while rebasing

rephrase test titles

do not need these libs

changes based on feedback on 2/24

changes text which was left

Changes based on feedback on 3/3
2015-03-04 15:32:56 +05:00