Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
32,310 Commits 1 Branch 0 Tags
d64c2b299f5f847272483ddd5ffb845d66d3b2bf
Commit Graph

32310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
d64c2b299f Fix for flaky TeamDiscussionView js tests 
After being able to reproduce the errors exactly by making certain
elements unfindable, I concluded that the issues we've been seeing
on headless jenkins runs are due to execution happening too quickly
and elements not loading in time to be interacted with.

The fix is to make liberal use of Jasmine 1.3 `runs` and `waitsFor`
functionality, to ensure that execution happens in the order that
we want, with rendering being checked before proceeding.

Once again, I can't be 100% sure that this fixes the Jenkins errors,
as those are very hard to reliably reproduce, but this is an
educated guess at fixing the problem with no drawbacks, as I've
been able to successfully run all tests locally.
 2015-08-24 10:06:52 -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
zubair-arbi
7b346f7d11 Merge pull request #9441 from edx/zub/bugfix/ecom-2066-fix-error-display-on-getting-course-name 
display course id instead of name in course name placeholder, if ajax…
 2015-08-24 16:21:10 +05:00
zubair-arbi
8ca590d4f3 display course id instead of name in course name placeholder, if ajax call to get course data fails 2015-08-24 14:03:57 +05:00
Muhammad Shoaib
c11049ee80 Merge pull request #9439 from edx/cdodge/add-course-name 
add ability to return the course name (optionally) when querying abou…
 2015-08-24 13:51:08 +05:00
Chris Dodge
ea1e875dfe add ability to return the course name (optionally) when querying about credit requirement fulfillments 2015-08-22 17:24:23 -04:00
Peter Fogg
1f6d28e215 Merge pull request #9435 from edx/peter-fogg/remove-team-newrelic-trace 
Remove unnecessary New Relic trace.
 2015-08-21 17:21:06 -04:00
David Ormsbee
56706d073c Merge pull request #9429 from edx/ormsbee/test_recommender_speedup 
Switch TestRecommender to use SharedModuleStoreTestCase
 2015-08-21 17:15:31 -04:00
Ahsan Ulhaq
3acd3bdaad Merge pull request #9394 from edx/ahsan/ECOM-2026-Credit-email-should-use-correct-staticfiles-library 
Credit eligibility email should use the correct staticfiles library
 2015-08-22 01:18:40 +05:00
Peter Fogg
839fb70869 Remove unnecessary New Relic trace. 2015-08-21 15:07:46 -04:00
Mark Hoeber
68414a1345 Merge pull request #9352 from edx/markhoeber-doc2219 
Updated Certificate's config page help
 2015-08-21 14:40:38 -04:00
Will Daly
a7e9789021 Merge pull request #9424 from edx/will/remove-unused-dependencies 
Remove django-followit and django-keyedcache
 2015-08-21 10:58:24 -07:00
Eric Fischer
9a7605497b Merge pull request #9430 from edx/revert-9405-efischer/js-flakes 
Revert "JS Flakiness in TeamDiscussionView"
 2015-08-21 13:57:42 -04:00
Eric Fischer
f07c303628 Revert "JS Flakiness in TeamDiscussionView" 2015-08-21 13:56:44 -04:00
David Ormsbee
3d1ce45187 Switch TestRecommender to use SharedModuleStoreTestCase (for performance) 2015-08-21 13:41:09 -04:00
Will Daly
689efedeee Merge pull request #9427 from edx/will/update-django-extensions 
Upgrade django-extensions to 1.5.5
 2015-08-21 10:32:25 -07:00
Will Daly
5d53c4a12a Remove django-followit and django-keyedcache 2015-08-21 10:09:11 -07:00
Will Daly
9382db5a76 Merge pull request #9426 from edx/will/upgrade-django-ipware 
Upgrade django-ipware to 1.1.0
 2015-08-21 10:05:42 -07:00
Will Daly
0f590adde2 Upgrade django-extensions to 1.5.5 2015-08-21 09:16:56 -07:00
Sarina Canelake
1822d66120 Merge pull request #9425 from edx/sarina/20150821-translations-update 
Update translations (autogenerated message)
 2015-08-21 12:11:05 -04:00
Will Daly
3901c03d30 Upgrade django-ipware to 1.1.0 2015-08-21 09:00:42 -07:00
Ahsan Ulhaq
e3674e92e3 Credit eligibility email should use the correct staticfiles library 
ECOM-2026
 2015-08-21 20:17:55 +05:00
Sarina Canelake
8f3310c04b Update translations (autogenerated message) 2015-08-21 10:49:56 -04:00
chrisndodge
e9638039de Merge pull request #9420 from edx/cdodge/upgrade-edx-proctoring 
Update edx-proctoring version to 0.7.1
 2015-08-21 10:33:57 -04:00
Usman Khalid
9330ce6669 Merge pull request #9384 from edx/usman/update-ora 
Update edx-ora2 to release-2015-08-19T17.17.
 2015-08-21 19:30:10 +05:00
Eric Fischer
a1a9f3bdcb Merge pull request #9405 from edx/efischer/js-flakes 
JS Flakiness in TeamDiscussionView
 2015-08-21 10:29:21 -04:00
Mushtaq Ali
d1e31afa4b Merge pull request #9397 from edx/mushtaq/tnl-3095-fix-course-sidebar-padding 
Fix course info sidebar padding
 2015-08-21 19:20:31 +05:00
Mushtaq Ali
7c61e08dcd Fix course info sidebar #3095 2015-08-21 18:39:38 +05:00
Eric Fischer
90b94a46bc Potential fix for flaky TeamDiscussionView js tests 
Adding waitsFor check in the beforeEach method. The condition I'm
waiting for here is shamelessly borrowed from bok-choy's
wait_for_ajax._is_ajax_finished() method:
https://github.com/edx/bok-choy/blob/master/bok_choy/page_object.py#L431

This seems to fix the errors I was able to generate with the
set_timeout, which themselves looked ver similar to the failing
master tests, so I *think* this will fix our woes, but since I was
never able to get the tests to fail exactly the same way I can't be sure.

Since there don't seem to be any drawbacks, this is going into mainline
as-is and we'll monitor for the sporadic failures over the next few
weeks.
 2015-08-21 09:38:46 -04:00
Chris Dodge
02d47d62f4 Update edx-proctoring version to 0.7.1 2015-08-21 09:27:38 -04:00
chrisndodge
045a67aa30 Merge pull request #9416 from edx/cdodge/remove-external-id-from-report 
alter columns in proctoring exam report
 2015-08-21 07:29:00 -04:00
tasawernawaz
68da716d3d Merge pull request #9399 from edx/tasawer/bugfix/ecom-1932-Upgrade-page-not-displaying-in-French 
Fixing issue for french language
 2015-08-21 11:24:09 +05:00
Will Daly
b0e12b5f3d Merge pull request #9411 from edx/will/upgrade-django-babel-underscore 
Upgrade django-babel-underscore to 0.3.0
 2015-08-20 20:03:12 -07:00
Chris Dodge
110dbc048c alter columns in proctoring exam report 2015-08-20 20:21:54 -04:00
Alison Hodges
1e374f4d4e Merge pull request #9382 from edx/ahodges/comments_on_roles 
Adds a comment to reduce confusion over remaining role name differences
 2015-08-20 20:18:04 -04:00
Will Daly
a730cbf1f9 Merge pull request #9412 from edx/will/upgrade-django-cors-headers 
Upgrade django-cors-headers to 1.1.0
 2015-08-20 14:07:47 -07:00
Peter Fogg
16503d9853 Merge pull request #9410 from edx/peter-fogg/fix-tnl-3101-quality 
Peter fogg/fix tnl 3101 quality
 2015-08-20 16:16:08 -04:00
Alison Hodges
3547821b1a Adds a comment to reduce confusion over remaining role name differences 2015-08-20 16:09:35 -04:00
Will Daly
f4b0d55a2d Upgrade django-cors-headers to 1.1.0 2015-08-20 12:43:50 -07:00
Will Daly
cf259b42e7 Upgrade django-babel-underscore to 0.3.0 2015-08-20 12:37:53 -07:00
Ned Batchelder
1d23c55727 Merge pull request #9407 from edx/ned/getattr-lint-checker 
Use latest edx-lint. Adds getattr/setattr string literal checking.
 2015-08-20 15:32:03 -04:00
Peter Fogg
5c855bdc7b Fix quality violation. 2015-08-20 15:15:14 -04:00
Adam
b0247f1735 Merge pull request #9408 from edx/hotfix/2015-08-20 
Fix Forum Update Issue #TNL-3101
 2015-08-20 14:59:08 -04:00
chrisndodge
3294b3165d Merge pull request #9386 from edx/cdodge/dont-return-none-for-non-credit-course 
Cdodge/dont return none for non credit course
 2015-08-20 14:35:13 -04:00
Mushtaq Ali
c80906596b Fix Forum Update Issue #TNL-3101 2015-08-20 13:08:41 -04: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
Will Daly
d4f521b43d Merge pull request #9332 from edx/will/final-icrv-access-control 
In-Course Reverification Access Control
 2015-08-20 09:24:05 -07:00
Chris Dodge
9310c82f0f Update credit services to gracefully handle operations on a course which is actually not credit enabled 2015-08-20 11:54:57 -04:00
Ned Batchelder
36a7d1223e Use latest edx-lint. Adds getattr/setattr string literal checking. 
There are 80 of these new violations in the tree, so up the lint
threshold also.
 2015-08-20 11:45:44 -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