Commit Graph

5589 Commits

Author SHA1 Message Date
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
Will Daly
7bad603978 Merge pull request #7076 from edx/will/deprecate-embargo
Deprecate old embargo implementation.
2015-03-03 15:54:41 -05:00
Diana Huang
95387be93b Merge pull request #7193 from edx/diana/enrollment-api-permissions
Allow the enrollment API to be accessed via API keys.
2015-03-03 09:19:53 -05:00
Andy Armstrong
dfe0057b79 Implement profile API
TNL-1491

See the API design here:

https://openedx.atlassian.net/wiki/display/TNL/User+API
2015-03-02 16:28:52 -05:00
Diana Huang
1e4f1b5889 Allow the enrollment API to be accessed via API keys.
XCOM-107
2015-03-02 16:07:27 -05:00
Andy Armstrong
d42adcf46b Merge pull request #7123 from edx/christina/account-api
Add name and email change requests to accounts API.
2015-02-27 17:21:17 -05:00
cahrens
3ed31c2b1b Add name change and email change support to accounts API.
Name change is immediate, email change is multi-step.
2015-02-27 16:35:05 -05:00
Sarina Canelake
a11f287769 Merge pull request #6998 from stvstnfrd/quality/pep8
Extend PEP8 coverage
2015-02-27 15:53:45 -05:00
Christina Roberts
99e85556ea Merge pull request #7140 from edx/christina/delete-enable-new-dashboard
Delete ENABLE_NEW_DASHBOARD code.
2015-02-27 15:37:41 -05:00
Calen Pennington
820b0118f4 Merge pull request #7155 from edx/django-upgrade/unicode-csrf-tokens
Teach edx-mako to force csrf_tokens to unicode (from smart_strings)
2015-02-27 15:33:43 -05:00
stv
4131898180 Remove "nopep" pragma 2015-02-27 11:49:51 -08:00
Calen Pennington
cbcb0ee8ab Teach edx-mako to force csrf_tokens to unicode (from smart_strings) 2015-02-27 13:38:16 -05:00
cahrens
61a108d377 Delete unused code for changing email. 2015-02-27 13:20:57 -05:00
Diana Huang
eb5e7d89ef Merge pull request #7094 from edx/diana/add-sku-to-coursemode
Add SKU to Course Modes
2015-02-27 10:54:44 -05:00
Diana Huang
3b0bb11218 Add SKU to Course Modes
XCOM-94
2015-02-27 10:04:36 -05:00
cahrens
7dc0598b25 Delete ENABLE_NEW_DASHBOARD code. 2015-02-26 16:41:40 -05:00
Calen Pennington
bbab3a393c Merge pull request #7127 from edx/django-upgrade/reload-user-session-in-test
Reload the user to get the cached profile attribute
2015-02-26 13:55:05 -05:00
Nimisha Asthagiri
052dd52ae4 minor fixes found from the django-upgrade work. 2015-02-26 12:26:13 -05:00
Calen Pennington
3d8e1d092c Reload the user to get the cached profile attribute 2015-02-26 12:23:31 -05:00
Jonathan Piacenti
be02613aac Do event tracking for major forum events. 2015-02-25 23:30:30 +00:00
Awais
1e53a79705 ECOM-985 fixing the 'NoneType' object has no attribute 'profile'. 2015-02-25 10:10:16 +00:00
Nimisha Asthagiri
b280e44fe1 Merge pull request #7025 from edx/mobile/oauth2-allow-inactive-user
MA-291 Allow API access without email activation.
2015-02-24 09:12:30 -05:00
Nimisha Asthagiri
83a3adb97b MA-291 Allow API access without email activation 2015-02-24 06:05:18 -05:00
Will Daly
ae8ddc8aee Deprecate old embargo implementation.
The new "country access" implementation replaces the old
implementation.  Middleware and tests have been updated
accordingly, but deprecated models are preserved
for backwards compatibility.
2015-02-23 15:48:04 -05:00
Will Daly
f854726efc Add tracking code to LinkedIn URL.
Add client-side analytics event for LinkedIn Add to Profile button click.

Add management command for generating certs for testing.

Update styling of the certificate messages.
2015-02-23 11:52:47 -05:00
Will Daly
368554754b Make the linked in configuration migration backwards compatible 2015-02-23 11:40:41 -05:00
Akiva Leffert
906f3474bb Merge pull request #7057 from edx/aleffert/existing-enrollment-success
Convert enrollment already exists errors to success.
2015-02-23 11:08:33 -05:00
Akiva Leffert
003a9453ac Convert enrollment already exists errors to success.
JIRA: https://openedx.atlassian.net/browse/MA-290
2015-02-20 19:31:21 -05:00
Greg Price
84f9d03fc4 Merge pull request #6953 from edx/gprice/registration-endpoint-refactor
Refactor registration endpoint and return field-specific detail in errors
2015-02-20 16:19:10 -05:00
Will Daly
0f68d00d4c Merge pull request #7055 from edx/will/fix-embargo-caching
Stop hitting the database when no courses are blocked.
2015-02-20 15:02:16 -05:00
Will Daly
1624720f48 Stop hitting the database when no courses are blocked. 2015-02-20 14:17:14 -05:00
Greg Price
0646b5f53d Refactor registration views to avoid shim
This also changes the registration API contract to use the course_id
parameter for analytics instead of an extra analytics parameter.
2015-02-20 11:31:55 -05:00