Commit Graph

7433 Commits

Author SHA1 Message Date
Waheed Ahmed
18411cd480 Fixed discussion module get_course.
TNL-3237
2015-09-12 00:27:18 +05:00
Jolyon Bloomfield
7f14a151b9 Modifying template for formulaequationinput and fixing CSS 2015-09-10 21:43:24 -04:00
jpaille
ef2a855e93 Fix dropdown problem (optioninput) template.
The correct answer is now correctly displayed after `show answer` is pressed.
2015-09-09 09:11:33 +00:00
Afeef Janjua
3ac27a5d6b Merge pull request #9625 from edx/afeef/bugfix/tnl-3094-unit-ribbon-courseware-z-index-fix
pushed the unit ribbon in lms courseware to back which brought the us…
2015-09-07 16:04:10 +05:00
Afeef Janjua
d5389736f4 pushed the unit ribbon in lms courseware to back which brought the user drop down to front
TNL-3094
2015-09-04 18:44:20 +05:00
Calen Pennington
821cc59415 Merge master into release-2015-09-02, leaving conflicts 2015-09-03 16:36:56 -04:00
Waheed Ahmed
8f12fdf6eb Fixed duration not display on youtube player.
TNL-3056
2015-09-03 12:14:55 +05:00
Kevin Falcone
ff8e473787 Merge pull request #9588 from edx/release
Merge two hotfixes to release
2015-09-02 14:11:29 -04:00
Adam Palay
76fc180cd9 Merge remote-tracking branch 'origin/release' into merge-release-into-master
Conflicts:
	common/lib/xmodule/xmodule/css/capa/display.scss
2015-09-01 16:01:04 -04:00
Adam Palay
f099a7e911 fix issue where video player renders twice (TNL-3064) 2015-09-01 15:11:31 -04:00
Syed Hassan Raza
f82662356f Revert "OSPR-535 Partial Credit"
This reverts commit 7624c63362.
2015-09-01 14:04:42 -04:00
Marco Morales
f2631faab1 Merge pull request #9529 from edx/marco/UX-2753/partial-credit-icon-status
Updated partially correct capa icon
2015-09-01 11:30:18 -04:00
Kevin Falcone
e3c66f55e0 Optimize memory and CPU usage.
The print_out_all_courses() routine consumes a ton of memory (2G and
causes noticable mongo usage spikes).  This actually causes other
processes on production boxes to be memory starved and killed
(such as worker children on edge when this was run recently).

The behavior of this script on production is
* Print several hundred courses
* Ask if you want to delete the one you specified
* print several hundred courses minus one
On a sandbox with 5 courses, you could tell by eye that 1 is gone, but
not in production (or even in stage).

The original PLAT-619 ticket for this suggested printing a course
listing on error, but instead it always printed the course listing.
Even in the error case, hundreds of course ids is confusing and obscures
the error message saying that your course_id is invalid.

You should be getting the course id from the UI or from ./manage.py lms
dump_course_ids, not by searching a list.

Adjusted the test accordingly

Remove get_courses_keys
2015-08-31 11:28:26 -04:00
marcotuts
dc5c4660c7 updated partially correct capa icon, accounting for lack of status label or message on these problems. New icon used is an asterisk with the same green color. 2015-08-28 15:57:25 -04:00
Ned Batchelder
741f06864a Merge pull request #9502 from edx/ned/import-path-differently
Change imports from path to use the stablest name.
2015-08-28 11:12:10 -04:00
Syed Hasan raza
0448925f6b Merge pull request #9354 from edx/shr/bug/MA-824-fix-transcript-for-html5
fetch transcript for html5 if 404
2015-08-28 00:58:55 -07:00
Sarina Canelake
406c9bc556 Merge pull request #9464 from mirjamsk/mirjamsk/TNL-3096
Adresses TNL-3096
2015-08-27 19:36:43 -04:00
Peter Fogg
5d26938158 Merge pull request #9366 from edx/peter-fogg/team-signals
Add signals for user's discussion activity.
2015-08-27 14:07:29 -04:00
Ned Batchelder
2a0259095d Change imports from path to use the stablest name.
The old line:

    from path import path

produced pylint errors because of the baroque way that path.py defined
"path".  We tried to get them to change how they defined it, but they
deleted the name instead: https://github.com/jaraco/path.py/issues/102

(Jason then changed his mind, but this is a better way to use path.py,
it avoids the pylint error at least.)
2015-08-27 12:59:25 -04:00
mirjamsk
336982e42b Adresses TNL-3096
Add acceptance test for TNL-3096

Adress comments on pull request

Fix test failing and img issue

Modify tests
2015-08-27 15:50:33 +00:00
Syed Hassan Raza
a2bca09c86 fetch transcript for html5 with youtubeId if 404 2015-08-27 08:04:57 -07:00
Waheed Ahmed
7646433995 Added course in exception message for InvalidTabsException. 2015-08-27 13:07:43 +05:00
Peter Fogg
38fb6eaede Add signals for user's discussion activity.
These signals are caught by the Teams app and used to update
`last_activity_at` on both teams and individual users.

TNL-2497
2015-08-26 12:07:54 -04:00
David Ormsbee
08343b9636 Merge pull request #9438 from edx/ormsbee/instructor_dash_tests_speedup
Speed up Instructor Dash tests + add manual reset for SharedModuleStoreTestCase
2015-08-25 08:52:19 -04:00
David Ormsbee
2ecf7aec46 Update Instructor Dashboard tests to use SharedModuleStoreTestCase.
Also added reset_test_case() and @modifies_courseware to SharedModuleStoreTestCase.

Revert "More verbose test builds in Jenkins, for debugging."

This reverts commit 58cade4cc4288335026649470a48b7bbca969ee8.
2015-08-25 01:28:55 -04:00
Ned Batchelder
3eb2e31c52 Adjust the i18n extraction rules to get all the strings we should get.
There's a move afoot to put assets inside individual Django apps,
instead of in upper-level "templates" directories.  These i18n
configuration files have to take this into account.

.underscore files are easy to find by their unique file extension, so
the rule can be simple.  Mako files are .html, so we have to be more
nuanced about it.  We don't want to get pure HTML files, and we don't
want to get .html files for tests, even if they are Mako templates.
2015-08-24 16:27:36 -04:00
Marko Jevtić
45832b986a Merge pull request #9283 from edx/mjevtic/SOL-1040
(SOL-1040) Indexing capa problems
2015-08-24 14:40:29 +02:00
Sarina Canelake
2ce3ae7078 Merge pull request #9404 from edx/sarina/unrevert-partial-credit
OSPR-535 Partial Credit
2015-08-20 12:40:18 -04:00
zubair-arbi
ec28a75f14 In-course reverification access control
* Automatically create user partitions on course publish for each ICRV checkpoint.
* Disable partitions for ICRV checkpoints that have been deleted.
* Skip partitions that have been disabled when checking access.
* Add verification access control UI to visibility settings.
* Add verification access control UI to sequential and vertical settings.
* Add partition scheme for verification partition groups.
* Cache information used by verification partition scheme and invalidate the cache on update.
* Add location parameter to UserPartition so the partition scheme can find the associated checkpoint.
* Refactor GroupConfiguration to allow multiple user partitions.
* Add special messaging to ICRV for students in the honor track.

Authors: Zubair Arbi, Awais Qureshi, Aamir Khan, Will Daly
2015-08-20 08:43:55 -07:00
Colin-Fredericks
7624c63362 OSPR-535 Partial Credit
Squashed commit of the following:

commit 0f7c2af5f7b8caed575dd253a45299293b2729d7
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 12:04:43 2015 -0400

    Forgot icon

commit b48970392741130f774709c54eb6e5ab0089812c
Author: Colin-Fredericks <colin.fredericks@gmail.com>
Date:   Tue Jun 30 11:49:57 2015 -0400

    OSPR-535 Partial Credit

    Squashed commit of the following:

    commit 6dd34f58f994e32d0d54bf1d67bffd04e0f8ef08
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:44:01 2015 -0400

        Fixing accidental overwrite.

    commit 1ff8fc4b0e83b90356e8e8dce1022f49bfd162cf
    Author: Colin-Fredericks <cof945@dhcp-140-247-184-176.fas.harvard.edu>
    Date:   Tue Jun 30 11:18:36 2015 -0400

        OSPR-535 Partial Credit

        Revised after first pull discussion.

Fixing scss typos

Fixing check/x display problem

Empty set is not []

Shuffling empty answer code to grade properly.

I don't think I ever wrote this in the first place...

Adding tests for MC and Checkbox

including proper partial-credit marking and scoring

Numerical and OptionResponse tests

Also a few improvements to NumericalResponse problem type and
exception-raising.

CustomResponse tests and more numerical tests

Increasing coverage and fixing typos

Exception added for pylint false positive

Hopefully fixing coverage issue

Retabulating line continuation

Bok Choy test for partial credit

Copypasta fix

Adding tooltip for partial credit

Improving and expanding comments

Minor fixes
2015-08-20 11:18:13 -04:00
Renzo Lucioni
63a49d6d1b Merge pull request #9398 from edx/release
Merge release into master
2015-08-20 10:08:52 -04:00
Will Daly
cea22a12ff Allow user partition version >= current version.
If code is deployed that updates the user partition version,
then the code is rolled back, we may see user partition versions
greater than the currently deployed version.

The previous behavior was to raise a TypeError when this occurred;
the new behavior assumes that the newer version is backwards
compatible and tries to load the partition.
2015-08-19 16:59:03 -04:00
Sarina Canelake
25a117613d Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit"
This reverts commit cea274dc52, reversing
changes made to 02cf9caca6.
2015-08-19 11:07:14 -04:00
Marko Jevtic
8faff973df Quality improvements 2015-08-18 08:26:44 +00:00
Brian Beggs
c71d61e533 Adding django command to create mongodb indexes 2015-08-17 17:05:27 -04:00
Renzo Lucioni
8b704cc2ec Merge pull request #9351 from edx/release
Release
2015-08-17 13:17:55 -04:00
Kevin Falcone
58bc8e4973 Merge pull request #9349 from edx/jibsheet/escape-studio-courses-to-rc
HTML-escape uses of course display name.
2015-08-17 12:27:06 -04:00
Peter Fogg
c13f296103 HTML-escape uses of course display name. 2015-08-17 12:22:10 -04:00
Peter Fogg
2c6a9c5ebd HTML-escape uses of course display name. 2015-08-17 12:15:15 -04:00
Sarina Canelake
2861cbbf35 Revert "Merge pull request #8724 from Colin-Fredericks/ColinF-partial-credit"
This reverts commit cea274dc52, reversing
changes made to 02cf9caca6.
2015-08-17 11:31:51 -04:00
Marko Jevtic
63edfc6eb4 Applied suggestion from the 1st review 2015-08-17 14:14:17 +00:00
Adam
460b3311b2 Merge pull request #9273 from edx/adam/add-lti-logging
add more lti logging around oauth (TNL-2980)
2015-08-14 08:53:21 -04:00
chrisndodge
460a4b5f99 Merge pull request #9069 from edx/cdodge/proctoring-lms-integration
Integration of Proctoring into the LMS
2015-08-14 07:18:14 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Andy Armstrong
01065b6ae5 Merge pull request #9217 from edx/andya/land-teams
Enable teams and deprecate the advanced setting
2015-08-13 17:47:15 -04:00
Marko Jevtic
35e7a7338c Addresses design review feedback 2015-08-13 12:46:48 +00:00
Peter Fogg
eafb07552a Merge pull request #9287 from edx/release
Release
2015-08-12 13:06:39 -04:00
Adam Palay
c486eadd87 add more lti logging around oauth (TNL-2980) 2015-08-12 10:10:29 -04:00
Marko Jevtic
abd46e4522 Fixing tests 2015-08-12 12:08:03 +00:00
Marko Jevtic
d942891b6f (SOL-1040) Indexing capa problems 2015-08-12 11:49:56 +02:00