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

32518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Braden MacDonald
2438b27b9c Merge pull request #9330 from open-craft/fix-offline-gradecalc 
Fix Offline Grade Calculation
 2015-09-01 19:41:22 -07:00
Peter Fogg
06014bfae0 Merge pull request #9559 from edx/peter-fogg/remove-bind-all 
Remove unnecessary bindAll calls.
 2015-09-01 17:36:14 -04:00
Jesse Zoldak
804e110295 Merge pull request #9565 from edx/zoldak/TNL-3183 
Decorate flaky test TNL-3183
 2015-09-01 16:18:30 -04:00
chrisndodge
f8e44f7832 Merge pull request #9536 from edx/muhhshoaib/PHX-122-remove-the-record-in-the-creditRequirementStatus-table 
PHX-122
 2015-09-01 16:05:43 -04:00
Jesse Zoldak
7f0b9bceff Decorate flaky test TNL-3183 2015-09-01 15:34:31 -04:00
Muhammad Shoaib
4d0efa2893 PHX-122 
Fixed the issue when deleting a proctored exam attempt does not remove the record in the CreditRequirementStatus table
 2015-09-01 15:08:11 -04:00
Peter Fogg
67a6dd08bc Remove unnecessary bindAll calls. 2015-09-01 13:56:20 -04:00
Christine Lytwynec
e807cbd589 Merge pull request #9402 from edx/clytwynec/TNL-2153 
Change component types and template links to buttons
 2015-09-01 12:48:46 -04:00
Muhammad Ammar
15c0d3c2e3 Merge pull request #9532 from edx/ammar/tnl3166 
fix flaky
 2015-09-01 21:04:10 +05: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
Christine Lytwynec
3470e180fc Change component types and template links to buttons 2015-09-01 10:31:35 -04:00
Christina Roberts
9f86f18841 Merge pull request #9503 from edx/christina/composite-index 
Team API Performance Improvements
 2015-09-01 10:30:47 -04:00
Ned Batchelder
af609f103f Merge pull request #9494 from edx/ned/move-recommender-tests 
Move recommender XBlock tests to openedx/tests/external
 2015-09-01 10:20:24 -04:00
Davorin Šego
1d229a3293 Merge pull request #9540 from edx/dsego/SOL-1065 
Use AjaxHelpers instead of Sinon fake server
 2015-09-01 15:53:18 +02:00
Marko Jevtić
6acdfea7aa Merge pull request #9553 from edx/mjevtic/SOL-1160 
(SOL-1160) mark test as flaky
 2015-09-01 15:27:47 +02:00
Davorin Sego
a0a0078d1f Use AjaxHelpers instead of Sinon fake server 2015-09-01 14:59:21 +02:00
Marko Jevtic
1531d8d250 (SOL-1160) mark test as flaky 2015-09-01 12:26:50 +00:00
Muhammad Ammar
f2b3ec5766 Merge pull request #9513 from edx/ammar/tnl3125-i18n-and-rtl-fixes 
i18n and rtl fixes
 2015-09-01 16:50:33 +05:00
Ahsan Ulhaq
089ca195b6 Merge pull request #9542 from edx/ahsan/Update-edx-reverification-block-version 
update Reverification block hash
 2015-09-01 15:49:07 +05:00
Ahsan Ulhaq
65099c4ef7 update Reverification block hash 2015-09-01 14:17:06 +05:00
muhammad-ammar
4840b46716 i18n and rtl fixes 
TNL-3125
 2015-09-01 12:16:41 +05:00
tasawernawaz
c217d986de Merge pull request #9516 from edx/tasawer/dev-story/ecom-1017-removing-experimental-logistration-endpoints-updated 
Removed unused url endpoints
 2015-09-01 11:50:52 +05:00
muhammad-ammar
5e67933175 fix flaky 
TNL-3166
 2015-09-01 10:56:25 +05:00
frances botsford
072a66e196 Merge pull request #9468 from edx/frances/teams-padding-responsive-followup 
updated responsive body class to .is-view-in-course
 2015-08-31 21:52:01 -04:00
Ned Batchelder
a16c951c09 Fix imports and test skips to work properly from openedx 2015-08-31 17:14:47 -04:00
Ned Batchelder
f925a4af9c Move recommender XBlock tests to openedx/tests/xblock_integration 
I want to make clear that these tests rely on XBlocks in other repos,
and that ideally in time we would move these tests into the XBlock repo.
 2015-08-31 17:14:47 -04:00
Andy Armstrong
9ff620dedf Merge pull request #9334 from jolyonb/dragdropfix 
Fixing drag and drop labels
 2015-08-31 17:12:49 -04:00
David Ormsbee
40f833164c Merge pull request #9509 from edx/ormsbee/faster_tests_shoppingcart 
Shift some shoppingcart tests to use SharedModuleStoreTestCase.
 2015-08-31 16:07:58 -04:00
Sarina Canelake
25169ccc4d Merge pull request #9147 from open-craft/OC-791-answer-export 
Move problem responses export from legacy instructor dash to new instructor dash
 2015-08-31 15:12:55 -04:00
Clinton Blackburn
bb1631b2e5 Merge pull request #9545 from edx/clintonb/csrf-test 
Added test for CreditCourse endpoint CSRF validation
 2015-08-31 11:53:21 -07:00
Frances Botsford
44d3cb444f updated responsive body class to .is-view-in-course 2015-08-31 14:41:46 -04:00
Clinton Blackburn
c6c897e218 Added test for CreditCourse endpoint CSRF validation 
This test gives peace-of-mind and ensures that CSRF validation is enforced for session authentication.

XCOM-524
 2015-08-31 13:51:22 -04:00
Matt Drayer
40e38829a6 Merge pull request #9544 from edx/asadiqbal08/SOL-1158 
asadiqbal08/SOL-1158 Add Partner Short Name to Organizations page
 2015-08-31 13:30:53 -04:00
Ben Patterson
db2ac7996d Merge pull request #9515 from edx/benp/add-jshint-diff-quality 
Add jshint to run_quality.
 2015-08-31 12:55:20 -04:00
Kevin Falcone
5ad126d69f Merge pull request #9505 from edx/jibsheet/delete_course-memory-improvement 
Optimize memory and CPU usage.
 2015-08-31 12:38:30 -04:00
asadiqbal
c1162864aa SOL-1158 2015-08-31 21:17:40 +05: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
Ben Patterson
91c1527189 Update circle-ci to run quality after jshint has been added to PATH. 
[Also correct some comments.]
 2015-08-31 11:08:56 -04:00
Feanil Patel
035bf4fbf2 Merge pull request #9537 from edx/feanil/upgrade_uglify 
Upgrade uglify-js to 2.4.24
 2015-08-31 11:01:18 -04:00
Ben Patterson
0683e5ff3f Add jshint diff-quality. 
The platform includes jshint as a development tool, and our
builds are enforcing a limit on total number of jshint violations.
This commit will enforce no new jshint violations on a per-change
basis, much like pylint and pep8 are enforced. So with this change,
we'll be enforcing our linting requirements consistently, regardless
of type of violations.

Also on Jenkins, runs quality task after installing jshint.
 2015-08-31 10:56:09 -04:00
Clinton Blackburn
4bc9cb4ddd Merge pull request #9531 from edx/credit-api-csrf-fix 
Diabled CSRF protection for Credit Course API endpoints
 2015-08-31 07:55:10 -07:00
Feanil Patel
354693a794 Upgrade uglify-js to 2.4.24 
The latest version of uglify-js fixed a vulnerability which allows a specially crafted Javascript file to have altered functionality after minification.

Changelog between the versions we are running can be found in the Readme file from this diff: https://github.com/mishoo/UglifyJS2/compare/v2.4.15...v2.4.24#diff-04c6e90faac2675aa89e2176d2eec7d8

We use the command line without any special arguments so I don't expect any issues.
 2015-08-31 09:19:46 -04:00
Tasawer
cd69ca2b23 Removed unused url endpoints + fixed broken tests 
ECOM-1017
 2015-08-31 12:50:08 +00:00
tasawernawaz
ab2d006329 Merge pull request #9454 from edx/tasawer/bugfix/ecom-1165-fixing-password-reset-test 
Removing flaky decorator from test
 2015-08-31 13:53:23 +05:00
Tasawer
58a2dc2466 Removing flaky decorator from test 
ECOM-1165
 2015-08-31 07:43:17 +00:00
Ned Batchelder
0de0fbb91a Merge pull request #9519 from edx/ned/sass-import-dot 
Add current directory to the sass compilation path.
 2015-08-29 12:35:53 -04:00
Clinton Blackburn
a1ba77d6b3 Diabled CSRF protection for Credit Course API endpoints 
CSRF protection needs to be disabled so that requests made using OAuth and other non-session-based authentication mechanisms can be properly processed. If session authentication is used, DRF will enforce CSRF protection.

XCOM-524
 2015-08-29 03:02:05 -04:00
Ned Batchelder
3c8dbe774f Merge pull request #9530 from edx/ned/tweak-release-email 
Add a sentence to the release email about how to change where the email is sent.
 2015-08-28 17:17:07 -04:00
Peter Fogg
9e7c93d931 Merge pull request #9504 from edx/peter-fogg/sort-team-page 
Allow sorting of teams in a topic
 2015-08-28 16:25:57 -04:00
Ned Batchelder
0219d97c88 Add a sentence to the release email about how to change where the email is sent. 2015-08-28 16:22:07 -04:00