Commit Graph

29014 Commits

Author SHA1 Message Date
Matjaz Gregoric
bc92c504b4 Add myself to AUTHORS. 2015-03-11 18:53:42 +08:00
Martyn James
b4ba5cbae9 Merge pull request #7242 from edx/mjames/SOL-290
Addresses SOL-290.
2015-03-10 17:45:38 -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
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
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
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
Dino Cikatic
bfa625ea78 SOL-258 Removing preview and content type from search list for sequence type 2015-03-09 16:28:04 +01:00
Ali Mohammad
c7ebda8ff8 Merge pull request #7223 from edx/cgoldberg/video-cdn-experiment
china video cdn experiment
2015-03-06 18:36:43 -05:00
Corey Goldberg
1fc9c83726 Added listener and beacon for video cdn eval. 2015-03-06 16:46:41 -05:00
Will Daly
3604e2dd97 Merge pull request #7195 from edx/will/certs-instructor-dash
ECOM-1140: Instructor dashboard example certificates
2015-03-06 14:30:08 -05:00
Sarina Canelake
9e8a0b86af Merge pull request #7255 from edx/sarina/studio-default-logo
Match Studio logo logic to LMS
2015-03-06 14:13:29 -05:00
Christina Roberts
3aaf52d2ee Merge pull request #7249 from edx/chrisitna/flaky-test
Add flaky decorator.
2015-03-06 13:57:17 -05:00
Will Daly
940f892290 ECOM-1140: Instructor dashboard example certificates
Allow global staff to generate example certificates
on the instructor dashboard.

Allow global staff to enable/disable self-generated
certificates for a course.
2015-03-06 13:20:48 -05:00
Ned Batchelder
1e52687fc3 Merge pull request #7253 from edx/ned/md-to-rst
Change .md file to .rst.
2015-03-06 13:18:33 -05:00
Ned Batchelder
697b487e81 Leave a redirection testing.md file behind 2015-03-06 13:18:05 -05:00
Ned Batchelder
4f6881c871 Change .md file to .rst. 2015-03-06 13:18:04 -05:00
Sarina Canelake
1dc75ffdc3 Abstract out platform name in default Wiki string 2015-03-06 13:05:04 -05:00
Sarina Canelake
e1dc0f5cdc Remove unused common image 2015-03-06 13:05:03 -05:00
Sarina Canelake
4133740a2f Add default logo to Studio 2015-03-06 13:05:03 -05:00
cahrens
3e7488f52c Add flaky decorator.
Related to TNL-1642.
2015-03-06 13:04:42 -05:00
cahrens
758d2f4e3b Add flaky decorator.
Related to TNL-1619.
2015-03-06 13:04:42 -05:00
Daniel Friedman
1cc7178ba3 Merge pull request #7252 from edx/dan-f/fix-failing-forums-test-after-revert
Fix failing forums unit test.
2015-03-06 12:56:27 -05:00
Ned Batchelder
4f5b319f17 Merge pull request #7254 from edx/ned/finish-pr-7232
Ned/finish pr 7232
2015-03-06 12:04:57 -05:00
Will Daly
749269a311 Merge pull request #7218 from edx/will/student-cert-xqueue-error
Certificate status when XQueue is unavailable.
2015-03-06 11:36:48 -05:00
Ned Batchelder
b3dbc7babd Fix another contributor agreement link. 2015-03-06 11:32:11 -05:00
Daniel Friedman
a79bf683b0 Fix failing forums unit test. 2015-03-06 11:09:12 -05:00
Ned Batchelder
0e171be261 Merge pull request #7246 from cguardia/patch-1
Add empty introspection rule for BlockTypeKeyField.
2015-03-06 10:21:10 -05:00
Ned Batchelder
f8c9fdf6c8 Merge pull request #7196 from edx/ned/tweaked-pylintrc
Use 'edx_lint write' to create our pylintrc from pylintrc_tweaks
2015-03-06 09:50:59 -05:00
David Baumgold
dca05a6095 Merge branch 'release' 2015-03-06 08:54:22 -05:00
David Baumgold
849388398c Merge pull request #7244 from edx/jsa/hotfix-forums
Revert "Merge pull request #6771 from edx/dan-f/forums-filter-discussion...
2015-03-06 08:51:03 -05:00
Awais Qureshi
d1af8f354d Merge pull request #7247 from edx/awais786/ECOM-1158-upgrade-page
Awais786/ecom 1158 upgrade page
2015-03-06 18:50:28 +05:00
Awais
c8ae32e628 ECOM-1158 fixing astrophysique in html. 2015-03-06 15:12:41 +05:00
Xavier Antoviaque
7338cc1286 Merge pull request #7148 from open-craft/library-selector
Show a select box when editing a library content block (SOL-123)
2015-03-06 09:16:02 +01:00
zubair-arbi
41f08055a4 Merge pull request #7018 from edx/zub/bugfix/tnl-1331-unique_users_in_cohort_group
use 'commit_on_success' transaction decorator to avoid registering users...
2015-03-06 12:23:25 +05:00
Carlos de la Guardia
c04e76e62a Update AUTHORS 2015-03-06 00:45:00 -06: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
jsa
13ba2c4a57 Revert "Merge pull request #6771 from edx/dan-f/forums-filter-discussion-modules"
This reverts commit 086a2ba783, reversing
changes made to a44132ec18.  Some minor
code quality issues were addressed as part of this change.

Conflicts:
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/utils.py
2015-03-05 16:57:46 -05:00
cahrens
c8a20df210 Combine account and profile into same API. 2015-03-05 16:13:49 -05:00
cahrens
5802e17cf3 Disable new user APIs in production. 2015-03-05 16:09:28 -05:00
John Eskew
4cb4557176 Merge pull request #7151 from open-craft/ekolpakov/settings-service
SettingsService for accessing django settings from XBlock
2015-03-05 15:56:11 -05:00