Commit Graph

38733 Commits

Author SHA1 Message Date
Sanford Student
39fb66fccf removing scored/has_score from randomized content block
for TNL-4171
2016-09-30 09:59:39 -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
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
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
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
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