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

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Raposa
dcadf73a5e Update safe template thresholds. 2016-09-26 10:13:12 -04:00
Jesse Shapiro
bea2d8faf2 Re-updating DnDv2 to 2.0.10 2016-09-26 09:46:17 -04:00
Awais Jibran
10f6bd1703 Celery need to serialize the arguments for a task. Here, user is not serializable,replace it with ID. ECOM-5784 2016-09-26 18:15:25 +05:00
Muddasser
f1f4f2e226 Merge pull request #13145 from edx/muddasser/edx/automate_help 
automate help links
 2016-09-26 18:10:20 +05:00
Saleem Latif
f556035b22 Create a management command to add commerce configuration in lms 2016-09-26 17:08:10 +05:00
Matjaz Gregoric
b228f9e49c Merge pull request #13514 from open-craft/mtyaka/update-xblock-poll 
Update xblock-poll dependency to v1.2.1.
 2016-09-26 12:29:31 +02:00
Jesse Zoldak
3de366dcf9 Fix pylint errors 2016-09-24 06:53:26 -04:00
Nimisha Asthagiri
318121411a Fix Gating to use grades API, instead of its own calculations 
TNL-5062
 2016-09-24 00:46:28 -04:00
Nimisha Asthagiri
47e3c6d4a1 Merge pull request #13562 from edx/efischer/rm_dash_rf 
Remove offline grade calc
 2016-09-23 21:31:40 -04:00
Cliff Dyer
8930376bfb Merge pull request #13540 from edx/cdyer/visible-block-version 
Add version to VisibleBlocks model.
 2016-09-23 16:58:39 -04:00
Eric Fischer
8857b35b15 Remove offline grade calc 
This management command has been broken since before the django 1.8
upgrade, so I'm deleting it and all its tests, and updating a few
other files that used these methods but are easily refactored away.
 2016-09-23 16:43:10 -04:00
Douglas Hall
1d1952c8d3 Added SiteMixin for tests that need to test Site specific functionality 2016-09-23 15:57:08 -04:00
stu
5e59e4162e add codecov to jenkins-report 2016-09-23 15:19:06 -04:00
J. Cliff Dyer
37fc450b8b Add version to VisibleBlocks model. 
TNL-5600
 2016-09-23 13:52:30 -04:00
Matjaz Gregoric
fb10ab0742 Merge pull request #13430 from open-craft/mtyaka/unicode-saml-contact 
Don't fail if platform name contains non-ascii characters.
 2016-09-23 19:49:16 +02:00
Brandon DeRosier
cdf413bda2 Disambiguate queryset extensions for ConfigurationModels 
This change disambiguates the use of `id` in the
ConfigurationModelManager queryset extensions. This is required
when specifying KEY_FIELDS where there is more than one key and
at least one of them is a ForeignKey. The table must be specified
in this case because the query extension may be appended to the
WHERE clause of queries selecting `id` fields from multiple tables
via an INNER JOIN clause.
 2016-09-23 13:47:06 -04:00
Jesse Zoldak
24ae284f34 Move helper methods from the capa tests module __init__ file 2016-09-23 13:21:49 -04:00
Jesse Zoldak
7242fe138b Declare additional requirements for installing the capa module 2016-09-23 13:07:00 -04:00
Ben Patterson
07af5211ed Merge pull request #13556 from edx/revert-13555-haikuginger/update-dnd-2.0.10 
Revert "[SOL-2077] Update DnDv2 version to 2.0.10"
 2016-09-23 12:42:45 -04:00
Ben Patterson
9fac9fb11a Revert "[SOL-2077] Update DnDv2 version to 2.0.10" 2016-09-23 12:39:27 -04:00
Jesse Shapiro
8c3d122002 Merge pull request #13555 from open-craft/haikuginger/update-dnd-2.0.10 
[SOL-2077] Update DnDv2 version to 2.0.10
 2016-09-23 11:43:57 -04:00
Alison Hodges
11892dcbe4 Merge pull request #13452 from shailysangwan/master 
replaced static with dynamically generated copyright year
 2016-09-23 11:19:03 -04:00
Matjaz Gregoric
344c72b3e2 Use non-ascii PLATFORM_NAME in tests. 
It should help catch unicode encoding problems earlier.

This also updates python-saml dependency to a version that includes a
patch for unicode strings.
 2016-09-23 15:38:23 +02:00
Matjaz Gregoric
977e664afe Don't fail if platform name contains non-ascii characters. 2016-09-23 15:38:23 +02:00
Jesse Shapiro
b3feb7f3ff Update DnDv2 version to 2.0.10 2016-09-23 09:29:11 -04:00
Shaily Sangwan
fc639afa11 replaced static with dynamically generated copyright year 2016-09-23 18:01:46 +05:30
Attiya Ishaque
c3580e207b Merge pull request #13392 from edx/atiya/add-retries-in-registration 
ECOM-5281 Add retires for email sending while registering.
 2016-09-23 16:06:26 +05:00
Renevatium
9e0a84887f Merge branch 'master' into proversity/feature-mobile-org-filter 2016-09-23 09:39:35 +02:00
attiyaishaque
fe136122db Adding celery task for sending activation email. 2016-09-23 11:43:26 +05:00
attiyaishaque
4bbeaf32ae ECOM-5281 Add retires for email sending while registering. 2016-09-23 11:43:26 +05:00
Awais Jibran
45e243da5c Merge pull request #13480 from edx/aj/fix-password-rest-confirm 
Show error on password reset form
 2016-09-23 09:56:25 +05:00
alisan617
fb35ffb07d Merge pull request #13449 from edx/alisan/discussion-sidebar-topics-menu-TNL-5169 
Add aria attributes to discussion topics sidebar
 2016-09-22 17:48:57 -04:00
Ned Batchelder
358788255c Merge pull request #13546 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-09-22 17:12:47 -04:00
Douglas Hall
8f6182aabf Allow for site override of MKTG_URLS setting in index view 2016-09-22 15:58:27 -04:00
Douglas Hall
a9939fa1a6 Merge pull request #13543 from edx/douglashall/AC-578/fix_typo 
AC-578 Fix marketing link key typo
 2016-09-22 15:54:48 -04:00
alisan617
0ffeb4639b Make the left sidebar in Discussion page accessible 
TNL-5169
 2016-09-22 15:28:29 -04:00
Douglas Hall
9f29a889a6 Fix marketing link key typo 2016-09-22 14:18:50 -04:00
Eric Fischer
1b1bb94887 Merge pull request #13522 from edx/efischer/standardize_grades_logging 
Standardize logged errors
 2016-09-22 13:51:18 -04:00
Ned Batchelder
0a2e7363e7 Update translations (autogenerated message) 2016-09-22 17:35:44 +00:00
Nimisha Asthagiri
4202546158 Merge pull request #13533 from edx/beryl/integration-tests 
Grades python integration tests
 2016-09-22 13:24:37 -04:00
Andy Armstrong
810835700a Merge pull request #13527 from edx/release 
Release
 2016-09-22 13:05:33 -04:00
Brian Jacobel
abe7fd29dd Prevent url.min.js from being loaded outside a bundle 2016-09-22 12:07:23 -04:00
Nimisha Asthagiri
613652b74a Test: Rescoring problem updates grades accordingly 
TNL-5465
TNL-802
 2016-09-22 12:01:19 -04:00
Nimisha Asthagiri
e1f5e40f69 Test: Changing assignment weight changes course grade 
TNL-5465
 2016-09-22 11:58:41 -04:00
Eric Fischer
9b9ab2e44f Standardize logged errors 
For easier consumption by splunk, match the pattern used by other grades-
related log statements. Also, reduce the firehose of events being logged
in splunk.
 2016-09-22 11:53:12 -04:00
Asad Iqbal
0b7ec75a3f Merge pull request #13492 from edx/asadiqbal08/WL-603-edx 
WL-603 load locale paths for themes directories
 2016-09-22 16:28:19 +05:00
Muddasser
8774728226 Base url for help links is changed 2016-09-22 09:58:34 +00:00
asadiqbal
2833d1e9a5 WL-603 load locale paths for themes directories 2016-09-22 13:26:11 +05:00
Rene Sorel
cd0f5a5903 Merge branch 'proversity/feature-mobile-org-filter' of https://github.com/proversity-org/edx-platform into proversity/feature-mobile-org-filter 2016-09-22 09:44:43 +02:00
Rene Sorel
e503bb6fc2 correctly test count on org filtered courses 2016-09-22 09:44:12 +02:00