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
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
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
Christina Roberts
0561533b03 Merge pull request #13580 from edx/revert-13567-aj/fix-celery-email-sending-on-registration 
Revert "Fix user registration "
 2016-09-27 10:56:45 -04:00
Nimisha Asthagiri
5ba77275d8 Fix problem weights in persisted grades 
TNL-5599
 2016-09-27 10:09:09 -04:00
attiyaishaque
e8f109a328 Revert "ECOM-5281 Add retires for email sending while registering." 
This reverts commit 4bbeaf32ae.
 2016-09-27 17:21:24 +05:00
attiyaishaque
648bc7efb4 Revert "Adding celery task for sending activation email." 
This reverts commit fe136122db.
 2016-09-27 17:20:57 +05:00
Awais Jibran
b74e964d7c Revert "Fix user registration " 2016-09-27 16:19:34 +05: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
stu
d083a072c7 removed git commit from codecov call 2016-09-26 17:05:26 -04: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
Christina Roberts
2845b66d26 Merge pull request #13568 from open-craft/haikuginger/update-dnd-2.0.10 
[SOL-2077] Re-updating DnDv2 to 2.0.10
 2016-09-26 13:14:42 -04:00
Awais Jibran
0a1f5c4032 Merge pull request #13567 from edx/aj/fix-celery-email-sending-on-registration 
Fix user registration
 2016-09-26 22:08:54 +05: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