Commit Graph

11747 Commits

Author SHA1 Message Date
Sarina Canelake
406c9bc556 Merge pull request #9464 from mirjamsk/mirjamsk/TNL-3096
Adresses TNL-3096
2015-08-27 19:36:43 -04:00
Braden MacDonald
586c237543 Fix for Twitter compatibility 2015-08-27 11:19:39 -07: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
Christina Roberts
df76994ea5 Merge pull request #9415 from edx/christina/insensitive-check
Do a case insensitive check for conflicts to improve performance.
2015-08-27 12:57:29 -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
cahrens
41ac90fa7a Use team name prefix and UUID for team_id.
TNL-3107
2015-08-27 11:22:35 -04:00
Waheed Ahmed
6b81f72d0e Merge pull request #9462 from edx/waheed/plat808-added-course-id-in-exception
Added course in exception message for InvalidTabsException.
2015-08-27 17:52:04 +05:00
raeeschachar
03520e663d Merge pull request #9417 from edx/raees-chrome-bok-choy-tests
Fixed test_new_textbook_uplaod test that was failing on Chrome
2015-08-27 17:33:50 +05:00
raeeschachar
646bd9397f Merge pull request #9444 from edx/raees-chrome-bok-choy-test-cohort-enable-disable
Fixed Chrome test cohort enabled disabled in Cohort Configuration Test
2015-08-27 17:32:46 +05:00
Muhammad Ammar
d38da773ea Merge pull request #9265 from edx/ammar/use-studio-confirmation-dialog-in-lms
Confirm when leaving team
2015-08-27 17:26:07 +05:00
Waheed Ahmed
7646433995 Added course in exception message for InvalidTabsException. 2015-08-27 13:07:43 +05:00
raeeschachar
7cf3895cc4 Fixed Chrome test cohort enabled disabled in Cohort Configuration Test 2015-08-27 12:06:03 +05:00
Tasawer
07148c6350 Removing experimental logistration endpoints
ECOM-1017
2015-08-27 06:21:47 +00:00
David Ormsbee
ff62a8eaaa Merge branch 'release' into release-2015-08-26-conflict 2015-08-26 14:28:35 -04: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
muhammad-ammar
d8b419c64f Review changes 2015-08-26 20:26:35 +05:00
muhammad-ammar
6134e8b5ed Move studio dialog code into common 2015-08-26 20:26:27 +05:00
Usman Khalid
6a1be48e1e Merge pull request #9418 from edx/usman/tnl2883-video-tests
Fix video bumper tests.
2015-08-26 16:59:42 +05:00
Usman Khalid
0dbb969be3 Fixed video bumper tests.
TNL-2883
2015-08-26 14:50:56 +05:00
Peter Fogg
4aec2abf10 Merge pull request #9450 from edx/peter-fogg/sort-topic-page
Add sorting controls on topics page.
2015-08-25 20:26:32 -04:00
Peter Fogg
382909b7c3 Add sorting controls on Teams topics page.
TNL-1936
2015-08-25 16:59:52 -04:00
Braden MacDonald
79a075328f Allow configuring sensitive third_party_auth settings via lms.auth.json 2015-08-25 16:35:35 -04:00
raeeschachar
222fdec58f Fixed test_new_textbook_uplaod test that was failing on Chrome 2015-08-25 18:41:01 +05:00
David Ormsbee
83c91e244c Convert Shib external auth test to use SharedModuleStoreTestCase. 2015-08-25 08:56:16 -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
Bill DeRusha
973314de7b Add basic elasticsearch search for teams
TNL-3014

Add tests for search

Add text_search to TeamsListView

Add reindex command line tool for course teams

Add Search Pagination and update comments

Move paginate_search_results to common library
2015-08-24 09:22:06 -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
Usman Khalid
e3bd509a39 Re-enable skipped video player tests.
This reverts commit f58764875c.
2015-08-21 02:55:04 +05: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
Eric Fischer
c170ff44e3 Fixing flaky bokchoy TeamPageTests
The flaky test problems we've been seeing here are coming from not
waiting long enough after performing actions. By forcing
is_browser_on_page checks to wait until the page is fully loaded
instead of just looking for the presence of a single element, we
ensure that there will not be issues interacting with non-loaded
elements.

TNL-3069
2015-08-19 16:51:30 -04:00
Ahsan Ulhaq
a495847b45 Merge pull request #9373 from edx/ahsan/ECOM-2114-Add-USD-to-prices-on-track-selection-pages
Add USD labels to prices on track selection pages
2015-08-20 00:37:27 +05:00
Ned Batchelder
0fed2f5987 Merge pull request #9364 from edx/ned/django-1-4-22
Upgrade Django to 1.4.22
2015-08-19 15:06:16 -04:00
Ahsan Ulhaq
3d62580fc2 Add USD labels to prices on track selection pages
ECOM-2114
2015-08-19 23:59:15 +05: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
Ned Batchelder
9f92054ca7 Fix tests to work with Django 1.4.22
The 1.4.22 security fix makes it so that empty sessions are not written.
To keep the tests working, we now log in the user, so that some data is
saved to the session.
2015-08-19 11:05:41 -04:00
Brian Beggs
9e31193100 Merge pull request #9295 from edx/bbeggs/ensure-indexes-PLAT-785
Adding django admin command to create mongodb indexes
2015-08-19 10:17:42 -04:00
Tasawer
cefe0daa74 Updating validation error message on signup page.
ECOM-1956
2015-08-19 12:50:12 +05:00
Clinton Blackburn
8e35fc677e Merge pull request #9328 from edx/clintonb/compressed-text-field-fix
Resolved decompression errors during tests
2015-08-18 13:58:07 -04:00
Clinton Blackburn
207ce4eda5 Resolved decompression errors during tests
Note that this change will require deleting all CourseStructure data. This data should be regenerated using the generate_course_structure management command.

XCOM-513
2015-08-18 10:25:09 -04:00
Eric Fischer
ab3b2ebd9a Fixing problematic bok_choy test
By moving the team_page.first_member_username access to occur before
click_first_profile_image() is called, we avoid a potential issue
where the wrapper() method defined in page_object.py, which
decorates the property, calls into _verify_page() and raises a
WrongPageError.
2015-08-18 09:16:26 -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