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

15022 Commits

Author SHA1 Message Date
Ned Batchelder
91bae6701d Merge pull request #13605 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-09-29 15:30:52 -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
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
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
Waheed Ahmed
44efb654fd Fixed keyboard focus remains within modal simulated dialogs. 
ECOM-4188
ECOM-5303
 2016-09-29 19:21:03 +05: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
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
Christina Roberts
1473bd6107 Merge pull request #13592 from edx/christina/merge-release 
Christina/merge release
 2016-09-28 12:47: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
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
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
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
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
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
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
Chris Rodriguez
dadd7195eb AC-586 updating button styles for automated a11y checks 2016-09-26 13:01:26 -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
Saleem Latif
f556035b22 Create a management command to add commerce configuration in lms 2016-09-26 17:08:10 +05: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
J. Cliff Dyer
37fc450b8b Add version to VisibleBlocks model. 
TNL-5600
 2016-09-23 13:52:30 -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
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
alisan617
0ffeb4639b Make the left sidebar in Discussion page accessible 
TNL-5169
 2016-09-22 15:28:29 -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