Commit Graph

7505 Commits

Author SHA1 Message Date
Matt Drayer
b900221ca4 Merge pull request #10394 from edx/asadiqbal08/SOL-1292
asadiqbal08/SOL-1292 Entrance Exam is not imported with an imported course
2015-11-02 10:14:47 -05:00
asadiqbal
bf0affc25d SOL-1292 2015-11-02 14:33:12 +05:00
Nimisha Asthagiri
6ab20b71c0 Merge pull request #10388 from edx/nimisha/course-factory
Add SampleCourseFactory and ToyCourseFactory
2015-10-30 13:23:05 -04:00
chrisndodge
7868067879 Merge pull request #9744 from edx/cdodge/timed-exams
Timed Exams
2015-10-30 11:03:59 -04:00
Nimisha Asthagiri
ce466619e4 Add SampleCourseFactory and ToyCourseFactory 2015-10-30 08:52:29 -04:00
Muhammad Shoaib
9476898df0 Add Timed Exams as a feature to edx-platform 2015-10-30 08:44:33 -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
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
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
dc7f09fc0e Add self_paced field to course module. 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
stv
a8d30c5de2 Remove circuit-schematic integration from wiki 2015-10-26 15:51:12 -07:00
Nimisha Asthagiri
cdab4266a1 Reuse DEFAULT_START_DATE definition. 2015-10-26 11:15:48 -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
05cae8c684 Deprecate end_of_course_survey_url until it can be removed. 2015-10-21 10:36:13 -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
Matt Drayer
1eab25f292 mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations
* Fix paver violations to stablize edx-lint update
* Parens, Line2Long
* Fix missing docstrings
* Fix PEP8 issues
* Address PR feedback (thanks @nedbat!)
2015-10-19 10:11:59 -04:00
stv
ca99606f9f Remove unused specs
These have been commented-out for more than 2 and a half years;
I can't think of a legitimate reason for keeping them around at this
point.

These were originally commented out here in
4740965413
2015-10-18 04:39:25 -04:00
Frances Botsford
c5a197eb99 possible fix for problem status feedback spacing and partial credit hint 2015-10-15 12:50:22 -04:00
Awais Jibran
2813b1269e Published orphans in split breaks preview button in Studio 2015-10-12 15:00:49 +05:00
cahrens
5c12890da5 Delete old, unused version of MathJax.
This version was from 2012.
2015-10-09 15:24:15 -04:00
Calen Pennington
624bc9a734 Merge pull request #9911 from cpennington/fix-plat-858
Delete DIRECT_ONLY_CATEGORIES from both draft and published branches by default
2015-10-07 14:41:40 -04:00
Waheed Ahmed
2dd26a8d60 Fixed split get_courses.
PLAT-747
2015-10-07 16:39:53 +05:00
Calen Pennington
f8f9b91c16 Make unpublish raise the same errors in split and old-mongo when asked to unpublish a DIRECT_ONLY_CATEGORY 2015-10-06 16:54:34 -04:00
Calen Pennington
e65730b9d2 Rationalize all cases around direct-only categories (both as blocks and parents) and delete 2015-10-06 16:54:34 -04:00
Calen Pennington
ac507c3d22 Upgrade AboutItemSemantics test to verify for all direct-only categories 2015-10-02 12:51:50 -04:00
Calen Pennington
a7c7ceb975 Use super(...) to call delete_item from split_draft.py 2015-10-02 12:51:50 -04:00
Calen Pennington
f19605af1a Use a clearer error message when split is unable to delete an XBlock 2015-10-02 12:51:50 -04:00
Calen Pennington
6da7bff185 Allow test_mixed_modulestore to be run without django setup 2015-10-02 12:51:49 -04:00
Calen Pennington
92eadf1afb Delete DIRECT_ONLY_CATEGORIES from published and draft branches.
This fixes https://openedx.atlassian.net/browse/PLAT-858.
2015-10-02 12:51:49 -04:00
Calen Pennington
1f7082ebfe Add a test of the semantics of About items
These are XBlocks that are detached (not part of the course content hierarchy),
and are also DIRECT_ONLY_CATEGORIES (meaning they are always autopublished).

https://openedx.atlassian.net/browse/PLAT-858 identifies a bug
where an About item isn't correctly deleted in SplitDraft, and this test
reproduces that case.
2015-10-02 12:51:40 -04:00
Dustin Gadal
dfc0a35799 Fix import error
See also:
https://github.com/edx/edx-platform/pull/9969

I'm not at a linux box to do a rebase from the command line, so I'm creating a new PR.
2015-10-01 22:33:39 -04:00
Calen Pennington
8267a762c0 Move *ModuleStoreBuilders into xmodule.modulestore.tests.utils 2015-10-01 16:52:39 -04:00
David Baumgold
69bc10235e Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts 2015-10-01 15:28:55 -04:00
Mushtaq Ali
11741f118f 'force_publish' command for publishing a course forcefully by making the published branch point to the same structure as the draft branch. add force_publish functionality to split courses. 2015-10-01 15:46:37 +05:00
Syed Hassan Raza
42662426c3 Revert "prevent delete public oprhans"
This reverts commit 3849a8fa81.
2015-09-30 13:40:22 -07:00
Adam
e8b1608f16 Revert "Fix Mathjax rendering bug" 2015-09-29 09:26:59 -04:00
Syed Hasan raza
d570866c69 Merge pull request #9432 from edx/shr/bug/PLAT-799-prevent-published-orphan-creation
Prevent publish orphans
2015-09-28 02:16:25 -07:00
Jesse Zoldak
1aa181c90a Update sinon to version 1.17.0 2015-09-24 10:55:48 -04:00
Ned Batchelder
45176c7254 Merge pull request #9868 from louyihua/i18n_fix
i18n fix
2015-09-24 10:23:58 -04:00
Matt Drayer
e51c4f23d3 Merge pull request #9822 from edx/saleem-latif/SOL-565
saleem-latif/SOL-565
2015-09-24 10:19:43 -04:00
louyihua
66678c103f i18n fix
1. Add missing '_()' in capa_base.py & video_xfields.py
2. Fix a bug in instructor_dashboard.py that causes crash when ANALYTICS_DASHBOARD_NAME contains non-ascii characters.
3. Workaround for mis-extractions inside .underscore files when using gettext along with interpolate.
2015-09-24 13:02:12 +08:00
Syed Hassan Raza
3849a8fa81 prevent delete public oprhans 2015-09-23 05:53:42 -07:00
Saleem Latif
05a72486f3 date format "Monday at 3pm UTC" added for courses starting with-in 5 days 2015-09-23 12:17:08 +05:00
Colin-Fredericks
350387c0a9 TNL-3197 Partial Credit (not Dropdown)
Updated templates

Updating responsetype tests.

Updating other tests for PC

Putting OptionInput back the way it was.

Acceptance tests for partial credit

Testing tools

pep8

scss name fix

Missing }

icon fix

icon fix
2015-09-22 13:20:39 -04:00
Mike Bifulco
13c6550aea fix label for check/final check
This label hadn't been updated to change its message depending on whether students were on their "final" submission attempt.
2015-09-21 12:12:49 -04:00
David Baumgold
03aeae4bd7 Merge pull request #8271 from edx/sass-theming
Comprehensive Theming
2015-09-21 10:55:18 -04:00