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

39204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
ac2f71df99 Revert "Merge pull request #13547 from edx/beryl/correct_weight" 
This reverts commit 663fbbbaa0, reversing
changes made to 3f7441c80f.
 2016-09-30 10:06:10 -04:00
Eric Fischer
ca287c73c7 Revert "Merge pull request #13461 from edx/cdyer/test-block-types" 
This reverts commit c050ccc318, reversing
changes made to 9ba9772239.
 2016-09-30 10:06:01 -04:00
Eric Fischer
e00fe03d9d Revert "Merge pull request #13539 from edx/sstudent/TNL-5601" 
This reverts commit e3db08f194, reversing
changes made to 51c2444de3.
 2016-09-30 10:05:44 -04:00
Sanford Student
39fb66fccf removing scored/has_score from randomized content block 
for TNL-4171
 2016-09-30 09:59:39 -04:00
sanfordstudent
e3db08f194 Merge pull request #13539 from edx/sstudent/TNL-5601 
fire SCORE_CHANGED on student state reset
 2016-09-30 09:34:59 -04:00
Renzo Lucioni
51c2444de3 Merge pull request #13601 from edx/renzo/exclude-utm 
Leverage the catalog's exclude_utm parameter
 2016-09-30 08:56:31 -04:00
Renzo Lucioni
eb50f4d38b Leverage the catalog's exclude_utm parameter 
We don't need stripping code on this end anymore. This closes out ECOM-5782.
 2016-09-29 18:17:58 -04:00
Eric Fischer
e4c626d362 Merge pull request #13607 from edx/release 
Hotfix 2016-09-29b release to master
 2016-09-29 18:06:21 -04:00
Eric Fischer
510b84ed86 Merge pull request #13606 from edx/hotfix/2016-09-29b 
Drop noisy grades logging to debug level
 2016-09-29 16:02:16 -04:00
Ned Batchelder
91bae6701d Merge pull request #13605 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-09-29 15:30:52 -04:00
Jesse Zoldak
7b68181f8d Merge pull request #13571 from edx/zoldak/TE-1711 
Install pa11ycrawler v1.5.4 from PyPi
 2016-09-29 14:27:59 -04:00
Nimisha Asthagiri
1628c17695 Merge pull request #13603 from edx/beryl/grades_reset_capa 
Update grade when CAPA problem state is reset
 2016-09-29 14:01:21 -04:00
Eric Fischer
ce067618c9 Drop noisy grades logging to debug level 
These need to be dropped down to avoid splunk, as they are currently
flooding our infrastructure.
 2016-09-29 13:58:19 -04:00
Sanford Student
e9f92bd05a fire SCORE_CHANGED on student state reset 2016-09-29 13:42:12 -04:00
Jesse Zoldak
18dcc7abf5 Install pa11ycrawler from pypi 2016-09-29 13:16:24 -04:00
Waheed Ahmed
c67c640902 Merge pull request #13504 from edx/waheed/ecom-5303-4188-fix-focus-on-dialog-boxes 
Fixed keyboard focus remains within modal simulated dialogs.
 2016-09-29 21:22:46 +05:00
Oksana Slusarenro
c45d2ff942 Fix test test_conditional_handles_polls 2016-09-29 18:58:03 +03:00
John Eskew
6ae4f4494c Merge pull request #13604 from edx/release 
Merging Django 1.8.15 upgrade hotfix to master.
 2016-09-29 11:57:02 -04:00
Alison Hodges
61dd7807df Merge pull request #13570 from edx/ahodges/help_theme 
Fixes DOC-3360 to make help context-sensitive
 2016-09-29 11:50:15 -04:00
Ned Batchelder
7dce728108 Update translations (autogenerated message) 2016-09-29 14:59:41 +00:00
Asad Iqbal
202d0cadeb Merge pull request #13577 from edx/asadiqbal08/WL-612 
WL-612 Report buttons are not displayed for White Label courses
 2016-09-29 19:59:41 +05:00
John Eskew
e2619bb211 Merge pull request #13598 from edx/release-candidate 
Upgrade Django to 1.8.15
 2016-09-29 10:44:17 -04:00
Waheed Ahmed
44efb654fd Fixed keyboard focus remains within modal simulated dialogs. 
ECOM-4188
ECOM-5303
 2016-09-29 19:21:03 +05:00
Cliff Dyer
c050ccc318 Merge pull request #13461 from edx/cdyer/test-block-types 
Create test to exercise grading multiple block types
 2016-09-29 10:13:00 -04:00
asadiqbal
03ed0347c4 - WL-612 2016-09-29 18:23:44 +05:00
Nimisha Asthagiri
d3d776388f Update grade when CAPA problem state is reset 
TNL-5686
 2016-09-29 08:44:37 -04:00
J. Cliff Dyer
ddb383c3c2 Test different problem types. 2016-09-28 16:38:38 -04:00
Matthew Piatetsky
9ba9772239 Merge pull request #13596 from edx/matthewpiatetsky/ECOM-5820/rename_order_event 
ECOM-5820 Rename completed order event
 2016-09-28 16:13:37 -04:00
Adam
cd2203ebd2 Merge pull request #13521 from edx/adam/update-dump-neo4j-command 
set neo4j configuration at the command line
 2016-09-28 15:35:13 -04:00
Tobias Macey
675f5e97b1 Updated compute_grades command for Django 1.8 
The interface for custom management commands changed in Django 1.8 which
caused the `compute_grades` command to stop working. In order to fix it
I added an `add_arguments` method for specifying the accepted arguments
and updated the command to allow for passing a list of courses to run
the `offline_grade_calculation` against.
 2016-09-28 15:22:30 -04:00
Christopher Lee
4c56c24238 Merge pull request #13589 from proversity-org/proversity/feature-mobile-org-filter 
mobile api filter enrollments by org
 2016-09-28 13:35:35 -04:00
John Eskew
d9354e2d69 Upgrade Django to 1.8.15 2016-09-28 13:31:14 -04:00
Christina Roberts
1473bd6107 Merge pull request #13592 from edx/christina/merge-release 
Christina/merge release
 2016-09-28 12:47:15 -04:00
Stu Young
0344eff28f Merge pull request #13575 from edx/estute/remove-commit-from-codecov-command 
removed git commit from codecov call
 2016-09-28 11:51:15 -04:00
Brian Jacobel
e42c1f8576 Merge pull request #13541 from edx/bjacobel/url.min.js 
Prevent url.min.js from being loaded outside a bundle
 2016-09-28 11:23:44 -04:00
Matthew Piatetsky
58a4f68a0b Rename completed order event 2016-09-28 14:12:22 +00:00
cahrens
e77b5eb3c3 Merge with release. 2016-09-28 09:58:14 -04:00
Christina Roberts
4c8be2bfd2 Merge pull request #13557 from edx/rc/2016-09-27 
Release Candidate rc/2016-09-27
 2016-09-28 09:25:37 -04:00
Rene Sorel
1b985a5ce0 fix quality issues and broken order of execution 2016-09-28 15:24:39 +02:00
Adam Palay
239867963e set neo4j configuration at the command line 2016-09-28 09:08:04 -04:00
Rene Sorel
66b32318ff recommitting mobile api org filter 2016-09-28 14:34:31 +02:00
stu
67dd0805ab adjust codecov threshold 2016-09-27 17:30:35 -04:00
Jesse Zoldak
20fc5bae87 Merge pull request #13584 from edx/revert-13097-proversity/feature-mobile-org-filter 
Revert "mobile api user course enrollments allow filter by org"
 2016-09-27 15:36:19 -04:00
Jesse Zoldak
9c88404304 Revert "mobile api user course enrollments allow filter by org" 2016-09-27 15:33:09 -04:00
stu
8513072cf2 add codecov.yml for project only 2016-09-27 15:06:54 -04:00
Shauna Gordon-McKeon
d1c69864ba Merge pull request #13097 from proversity-org/proversity/feature-mobile-org-filter 
mobile api user course enrollments allow filter by org
 2016-09-27 14:55:49 -04:00
Deepa
39ec546e12 Lower case the term partner manager in UI strings 2016-09-28 00:18:19 +05:30
Alison Hodges
2f5362f80a Fixes DOC-3360 to make help context-sensitive 2016-09-27 14:01:43 -04:00
Nimisha Asthagiri
663fbbbaa0 Merge pull request #13547 from edx/beryl/correct_weight 
Fix Problem grades that have weight values
 2016-09-27 12:24:12 -04:00
Muhammad Ammar
3f7441c80f Merge pull request #13505 from edx/ammar/tnl-5557 
allow html inside label and descriptions
 2016-09-27 21:00:42 +05:00