Commit Graph

12145 Commits

Author SHA1 Message Date
cahrens
9aecd10ab3 Move comments within the script block. 2015-10-30 11:44:30 -04:00
Zubair Afzal
fed0964c51 Merge pull request #10304 from edx/zub/story/ecom-2578-basic-programs-api-client-setup
basic programs api setup and dashboard integration
2015-10-29 22:21:12 +05:00
Christina Roberts
3382a955c9 Merge pull request #10378 from edx/christina/fix-mathjax-preview
Disable Fast Preview for version 2.5.
2015-10-29 12:41:30 -04:00
cahrens
deb4e35f92 Disable Fast Preview for version 2.5.
Except for the Discussion Tab.
TNL-3693, TNL-3365
2015-10-29 11:56:08 -04:00
David Ormsbee
87ded08d49 Merge pull request #10389 from edx/mobile/handler-url
Changes to handler URL generation
2015-10-29 11:39:35 -04:00
Sarina Canelake
2206b8a056 Merge pull request #10324 from stvstnfrd/debt/circuit
Remove circuit djangoapp from LMS
2015-10-29 11:15:15 -04:00
zubair-arbi
7f96474d01 basic programs api setup and dashboard integration
ECOM-2578
2015-10-29 20:07:51 +05:00
muzaffaryousaf
35884195cc Fixing pep8/pylint violations.
TNL-3650
2015-10-29 15:37:52 +05:00
muzaffaryousaf
cc88cfaf64 Fixing "wrong-assert-type" pep8 warning.
TNL-3650
2015-10-29 15:01:49 +05:00
Peter Fogg
d9751a855a Merge pull request #10404 from edx/feature/self-paced
Enable self-paced courses.
2015-10-28 20:46:35 -04:00
Peter Fogg
505b2aa4d9 Disable setting course pacing during course run.
Also adds improved styling for course pacing settings, and unit tests
around query counts for self-paced courses.

ECOM-2650
2015-10-28 16:44:36 -04:00
Peter Fogg
5ffa06bed1 Responding to review comments. 2015-10-28 16:44:36 -04:00
cahrens
c8f1987a84 Delete swfobject.js and analytics.js. 2015-10-28 14:52:43 -04:00
Peter Fogg
7f673604fb Allow setting self-paced on schedule & details page.
Currently unstyled.

ECOM-2462
2015-10-28 14:33:11 -04:00
Peter Fogg
15d77fda3f Hide due/release dates on course outline in Studio.
ECOM-2443
2015-10-28 14:33:11 -04:00
Peter Fogg
dc7f09fc0e Add self_paced field to course module. 2015-10-28 14:33:11 -04:00
Peter Fogg
eaf6be2a54 Fix up quality errors in config model API. 2015-10-28 14:33:11 -04:00
Peter Fogg
96b49759de Add fixture for setting config models from Bok Choy. 2015-10-28 14:33:11 -04:00
Calen Pennington
a6917e34f0 Teach auto_auth to create superusers 2015-10-28 14:33:11 -04:00
Calen Pennington
bf493fffa3 Add a django-rest-framework APIView that supports reading/writing the current value of a configuration model 2015-10-28 14:33:11 -04:00
David Ormsbee
9b88bdb072 Changes to handler URL generation
* The LMS now also monkey-patches
  xmodule.x_module.descriptor_global_handler_url and
  xmodule.x_module.descriptor_global_local_resource_url so that we can
  get LMS XBlock URLs from the DescriptorSystem. That functionality is
  needed in the block transforms collect() phase for certain XModules
  like Video. For instance, say we want to generate the transcripts
  URLs. The collect phase is run asynchronously, without a user context.

* The URL handler monkey-patching is now done in the startup.py files
  for LMS and Studio. Studio used to do this in the import of
  cms/djangoapps/contentstore/views/item.py. This was mostly just
  because it seemed like a sane and consistent place to put it.

* LmsHandlerUrls was removed, its handler_url and local_resource_url
  methods were moved to be top level functions. The only reason that
  class existed seems to be to give a place to store course_id state,
  and that can now be derived from the block location.

* To avoid the Module -> Descriptor ProxyAttribute magic that we do
  (which explodes with an UndefinedContext error because there is no
  user involved), when examining the block's handler method in
  handler_url, I made a few changes:

** Check the .__class__ to see if the handler was defined, instead of the
   block itself.

** The above required me to relax the check for _is_xblock_handler on the
   function, since that will no longer be defined.

90% of this goes away when we kill XModules and do the refactoring we've
wanted to do for a while.
2015-10-28 09:42:59 -04:00
Nimisha Asthagiri
6fb8335b63 Add make_course_usage_key method to modulestore
Different modulestores create different usage_keys
for the root course block.  This commit introduces
a new method on the modulestore so each store type
can implement its own.

This is required by the new Course Blocks API since
it wants to derive a usage key from a client-supplied
course key.
2015-10-27 22:27:44 -04:00
Pan Luo
f69304373c Implement user mapping API
This mapping API enables the mapping between the edX user ID and the ID
provided by identity provider (IdP). For details, please see
https://github.com/edx/edx-platform/pull/9842
2015-10-27 15:19:42 -07:00
Michael Frey
bb53cad0fa Merge pull request #10377 from edx/release
Release
2015-10-27 13:10:49 -04:00
stv
a8d30c5de2 Remove circuit-schematic integration from wiki 2015-10-26 15:51:12 -07:00
Sarina Canelake
6bbc37de9a Merge pull request #10287 from open-craft/validate-utils-gettext-extraction
Extract translatable strings from edx.utils.validate.js.
2015-10-26 17:45:21 -04:00
Nimisha Asthagiri
e726d01d46 Merge pull request #10360 from edx/mobile/start_date_reuse
Reuse DEFAULT_START_DATE
2015-10-26 12:28:21 -04:00
cahrens
87f0df3501 Revert to version 2.4 of MathJax.
TNL-3693
2015-10-26 11:28:40 -04:00
Nimisha Asthagiri
cdab4266a1 Reuse DEFAULT_START_DATE definition. 2015-10-26 11:15:48 -04:00
Matt Drayer
a2fa59cd4b Merge pull request #10308 from edx/ziafazal/SOL-1332
SOL-1332: use a generic function to check if entrance_exam feature is enabled or not
2015-10-26 09:46:22 -04:00
Matt Drayer
487a894fd7 Merge pull request #10264 from edx/ziafazal/log-exception-in-custom-500-handling
log exception in the logs to debug issue on production or sandbox environments
2015-10-26 09:41:53 -04:00
Bill DeRusha
60fc3f5705 Conditionally show unenroll action based on certificat status 2015-10-23 14:59:17 -04:00
cahrens
bdd30162ed Mark as flaky.
TNL-3679
2015-10-22 17:08:06 -04:00
Christina Roberts
9cfbbb23e7 Merge pull request #10298 from edx/christina/tnl-2419
Use waits because MathJax rendering is asynchronous.
2015-10-22 11:49:25 -04:00
Sarina Canelake
cb252c3123 Merge pull request #10275 from edx/frances/capa-problem-status-fix
Fix for problem status feedback spacing and partial credit hint
2015-10-22 11:38:38 -04:00
cahrens
f7e2830a2a Move waits into the page objects. 2015-10-22 10:56:45 -04:00
cahrens
9968622c58 Use waits because MathJax rendering is asynchronous.
TNL-2419
2015-10-22 09:09:46 -04:00
Zia Fazal
9bb6f6e88d use a generic function check if entrance_exam is enabled or not 2015-10-22 16:45:19 +05:00
Matjaz Gregoric
27238654fd Extract translatable strings from edx.utils.validate.js.
The JS validation utility functions from edx.utils.validate.js file
that are used on the combined login registration page include some
translatable strings that weren't getting extracted by the i18n tools
because they were defined inside underscore template strings.

This commit pulls the translatable strings out of the templates
to make sure gettext detects the strings at extraction time.
2015-10-22 10:40:24 +02:00
cahrens
05cae8c684 Deprecate end_of_course_survey_url until it can be removed. 2015-10-21 10:36:13 -04:00
Christina Roberts
125930cf59 Merge pull request #10223 from edx/christina/upgrade-mathjax
Upgrade to MathJax 2.5.
2015-10-21 09:44:44 -04:00
Ned Batchelder
a0c25f88c3 Merge pull request #10279 from edx/ned/cleaner-django-meta
No need for docstrings on "class Meta"
2015-10-21 09:35:40 -04:00
Jesse Zoldak
2e6880f69e Merge pull request #10228 from edx/zoldak/fix-acceptance-select-helpers
Fix the helpers for Select objects by wrapping them in promises
2015-10-21 09:14:46 -04:00
Arbab Nazar
034ac1c808 Merge pull request #10271 from edx/arbab/enrollment-user-list
take the list of users for enrolment change
2015-10-21 08:24:48 -04:00
Ned Batchelder
322ca34b20 Remove pylint pragmas from "class Meta"
Also remove useless docstrings where they were added to keep pylint
quiet.
2015-10-21 07:37:00 -04:00
Sarina Canelake
105d611cc9 Create distinct terms for gender, education sign up terms 2015-10-20 18:55:51 -04:00
arbabnazar
85e67bea4a help updated 2015-10-20 15:37:09 -04:00
arbabnazar
b3e37e54ba remove the append action 2015-10-20 15:30:06 -04:00
arbabnazar
361035c098 change the help text 2015-10-20 14:51:18 -04:00
arbabnazar
c4dc624c7f take the list of users for enrolment change 2015-10-20 14:00:59 -04:00