Commit Graph

29050 Commits

Author SHA1 Message Date
Mark Sadecki
c2ec7cc6e7 fixes invalid aria-role dialogalert which should be alertdialog 2015-03-12 11:00:35 -04:00
Shrhawk
4289ecd341 Merge pull request #7104 from edx/shr/bug/AN-4618-Browser-events-are-being-dropped
Add metatag <path_prefix> for pdf_viewer.html
2015-03-12 19:17:01 +05:00
David Baumgold
78d8b00ab7 Merge pull request #7286 from edx/avoid-needless-mako
For video module, don't use Mako unnecessarily
2015-03-12 09:22:56 -04:00
Aamir
48446b7612 Merge pull request #7285 from edx/aamir/ECOM-1177-price-display-bug
ECOM-1177: Removed the session variable on pay_and_verify view
2015-03-12 17:57:58 +05:00
Awais Qureshi
2e84c49660 Merge pull request #7248 from edx/awais786/ECOM-1155-datetime-issue
ECOM-1155 fix the date diff issue.
2015-03-12 17:53:20 +05:00
Syed Hassan Raza
64515f1d62 Add metatag <path_prefix> for pdf_viewer.html 2015-03-12 17:19:38 +05:00
aamir-khan
1512c0609e ECOM-1177: Removed the session variable on pay_and_verify view 2015-03-12 16:40:02 +05:00
Awais
281c8dce2b ECOM-1155 fix the date diff issue. 2015-03-12 16:24:51 +05:00
David Baumgold
9c59ebd688 For video module, don't use Mako unnecessarily 2015-03-11 15:37:21 -04:00
Ben Patterson
f473c474bd Merge pull request #7287 from edx/benp/more-scripts-hints
Adding hints for otherwise quiet quality shard steps.
2015-03-11 15:29:06 -04:00
Greg Price
f0322b9662 Merge branch 'release' 2015-03-11 11:14:48 -04:00
Sarina Canelake
9d9dccdb97 Merge pull request #7299 from edx/sarina/indagation/TNL-1461
Add pointer-events: none for fa-lock and fa-eye
2015-03-11 11:04:26 -04:00
Kelketek
b4c6211e4a Merge pull request #7235 from open-craft/enable-content-libraries
Enable content libraries by default
2015-03-11 09:42:47 -05:00
Kelketek
91642dce33 Merge pull request #7245 from open-craft/studio-home-test
Exfoliate flaky studio home test. (SOL-430)
2015-03-11 09:33:21 -05:00
Kelketek
1bd3652af3 Merge pull request #6846 from open-craft/content_libraries/import-export
Content Libraries Import/Export
2015-03-11 09:27:45 -05:00
Sarina Canelake
932bb1951d Add Kyle Boots to AUTHORS 2015-03-11 10:20:42 -04:00
Sarina Canelake
d1543b6156 Add pointer-events: none for fa-lock and fa-eye [TNL-1461] 2015-03-11 10:20:26 -04:00
Mark Hoeber
86930b9d27 Merge pull request #7135 from edx/markhoeber-studio-template-updates
Studio template updates
2015-03-11 09:16:40 -04:00
Matjaz Gregoric
bc92c504b4 Add myself to AUTHORS. 2015-03-11 18:53:42 +08:00
Mark Hoeber
12e3cc9d62 Update IFrame, Zooming Image, and Full Screen Image Templates 2015-03-10 20:58:01 -04:00
Martyn James
b4ba5cbae9 Merge pull request #7242 from edx/mjames/SOL-290
Addresses SOL-290.
2015-03-10 17:45:38 -04:00
Jonathan Piacenti
8ad4d081fb Added library import and export via .tar.gz'd XML files. 2015-03-10 21:29:29 +00:00
Ben Patterson
177035b1d2 Adding hints for otherwise quiet quality shard steps. 2015-03-10 16:33:10 -04: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
Martyn James
15965c1351 Addresses SOL-290. When display name is not present, we shall display '(Unnamed)' in its stead 2015-03-10 13:57:02 -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
Greg Price
c65c19d21a Merge pull request #7281 from edx/clintonb/task-fix
Reorganized course_structures app
2015-03-10 12:07:33 -04:00
Martyn James
af14d222fc Merge pull request #7085 from edx/dcikatic/SOL-258
SOL-258 Removing preview and content type from search list for sequence ...
2015-03-10 11:55:33 -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
Matt Drayer
918b184ea2 Merge pull request #6997 from edx/asadiqbal08/merge_SOL-199_and_SOL-221
Combine the changes of SOL-199 and SOL-221
2015-03-10 10:11:49 -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
zubair-arbi
57c38649ba Merge pull request #7270 from edx/zub/bugfix/plat-456-content-server-error
return proper 404 for assets of some invalid course from split modulesto...
2015-03-10 18:10:48 +05:00
zubair-arbi
61890e7a5e return proper 404 for assets of some invalid course from split modulestore
PLAT-456
2015-03-10 15:00:14 +05:00
Sarina Canelake
72a1d754bc Merge pull request #6921 from Stanford-Online/giulio/upgrade-pdfjs
Upgrade PDF.js library from v0.8.1243 -> v1.0.907
2015-03-09 21:53:36 -04:00
Giulio Gratta
0840467201 Making edX changes to pdf viewer/analytics html 2015-03-09 16:12:27 -07:00
Giulio Gratta
4726da6cf9 Upgrade PDF.js library from v0.8.1243 -> v1.0.907 2015-03-09 16:12:27 -07:00
Greg Price
e7f9b929a5 Merge pull request #7266 from edx/dan-f/forums-filter-discussion-modules-3
Filter inline discussion topics and threads in the forums by access
2015-03-09 15:53:23 -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
Daniel Friedman
934abf3c19 Check access for discussion modules in forums
TNL-650

Conflicts:
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/djangoapps/django_comment_client/tests/utils.py
	lms/djangoapps/django_comment_client/utils.py
2015-03-09 15:02:48 -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
Christina Roberts
1bbc07dbd0 Merge pull request #7257 from edx/christina/accounts-cleanup-tasks
Switch to api directory.
2015-03-09 12:52:32 -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
Jonathan Piacenti
5aba2f0e6c Exfoliate flaky studio home test. 2015-03-09 16:27:00 +00:00
Greg Price
30c3005c40 Merge pull request #7273 from edx/ecom-1178
ECOM-1178: Embargo rules for continent codes.
2015-03-09 12:21:35 -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
Greg Price
b649b27329 Merge pull request #7261 from edx/cgoldberg/video-cdn-experiment
Added listener and beacon for video cdn eval.
2015-03-09 11:39:06 -04:00
Dino Cikatic
bfa625ea78 SOL-258 Removing preview and content type from search list for sequence type 2015-03-09 16:28:04 +01:00