Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,691 Commits 1 Branch 0 Tags
20fc5bae87cfad30eaeac96838aeef61e7ef37e7
Commit Graph

38691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Matjaz Gregoric
d2c0ac3286 Merge pull request #13475 from open-craft/mtyaka/youtube-api-error 
Don't show error in studio when fetching YouTube metadata fails.
 2016-09-27 17:30:10 +02:00
Tim Krones
ab6b23b139 Merge pull request #13443 from open-craft/itsjeyd/update-xblock-utils 
Update xblock-utils dependency to v1.0.3.
 2016-09-27 17:19:27 +02:00
Nimisha Asthagiri
5ba77275d8 Fix problem weights in persisted grades 
TNL-5599
 2016-09-27 10:09:09 -04:00
muhammad-ammar
6ff762b63e allow html inside label and descriptions 
TNL-5557
 2016-09-27 15:48:27 +05:00
Chris
2b80c61980 Merge pull request #13520 from edx/clrux/ac-586-course-card-contrast 
AC-586 adding min-height and bg color for contrast
 2016-09-27 06:36:27 -04:00
Saleem Latif
af841336c7 Merge pull request #13549 from edx/saleem-latif/SOL-2080 
SOL-2080: Create a management command to add commerce configuration in lms
 2016-09-27 12:50:46 +05:00
Jesse Zoldak
d6a4d7c0da Merge pull request #13558 from edx/zoldak/fix-capa-imports 
Move helper methods from the capa tests module __init__ file
 2016-09-26 16:50:39 -04:00
Robert Raposa
acaa1ffc6a Merge pull request #13569 from edx/robrap/update-thresholds 
Update safe template thresholds.
 2016-09-26 15:35:04 -04:00
Nimisha Asthagiri
6b4972e1d4 Merge pull request #13507 from edx/beryl/gating-grades 
Fix Gating to use grades API, instead of its own calculations
 2016-09-26 15:14:49 -04:00
Douglas Hall
f806f3a165 Merge pull request #13474 from open-craft/bdero/site-sso 
ENT-16 Make SSO configurable per Site
 2016-09-26 14:54:40 -04:00
Douglas Hall
d1a3af9460 Merge pull request #13526 from edx/douglashall/JER-157/allow_for_site_override_of_mktg_urls_setting 
JER-157 Allow for per-Site override of MKTG_URLS setting
 2016-09-26 14:01:36 -04:00
Ned Batchelder
c8f122eed9 Merge pull request #13394 from open-craft/bdero/vectordraw-fixes 
Update Vector Drawing XBlock to the latest version.
 2016-09-26 13:44:56 -04:00
Chris Rodriguez
dadd7195eb AC-586 updating button styles for automated a11y checks 2016-09-26 13:01:26 -04:00
Brandon DeRosier
3dcf689ee2 Implement Site settings for Third Party Auth providers 2016-09-26 12:43:00 -04:00
Jesse Shapiro
6b9b34886c Merge pull request #13537 from open-craft/haikuginger/adjust-saml-expiration-type 
[ENT-23] Convert SAML cache expiration to timezone-aware datetime.datetime
 2016-09-26 12:33:23 -04:00
Jesse Shapiro
4360c50d6f Merge pull request #13252 from felipevolpone/master 
Disable the "View Unit in Studio" button in CCX courses
 2016-09-26 11:55:57 -04:00
Stu Young
cd20c7097b Merge pull request #13559 from edx/estute/report-to-both-coveralls-and-codecov 
add codecov to jenkins-report
 2016-09-26 11:53:45 -04:00
Jesse Shapiro
45bca67f79 Set up type conversion in third_party_auth to allow cacheDuration attribute to work 2016-09-26 10:28:39 -04:00
Robert Raposa
dcadf73a5e Update safe template thresholds. 2016-09-26 10:13:12 -04: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