Commit Graph

39373 Commits

Author SHA1 Message Date
Dmitry Viskov
693408eb4e Ability to create two or more LTI consumers through the Django admin with an empty instance_guid field. 2016-11-18 18:43:26 +03:00
Gregory Martin
14c01e3a49 Merge pull request #14007 from edx/release
Release Nov 16th, 2016
2016-11-17 08:49:26 -05:00
Gregory Martin
aeb0f23d9d Merge pull request #13973 from edx/release-candidate
Release Candidate rc/2016-11-15
2016-11-16 16:11:06 -05:00
Albert (AJ) St. Aubin
863aa78bdf Merge pull request #13933 from edx/aj/TNL-1955_save_ui
Initial set of changes for ui correctness state when saving a problem
2016-11-16 14:57:27 -05:00
Clinton Blackburn
531ed41822 Updated the Credit API to support JWT authentication 2016-11-16 13:44:46 -05:00
Calen Pennington
1e9649e01e Merge pull request #13972 from cpennington/timer-logging
Add timer logging to jenkins test runs
2016-11-16 12:43:37 -05:00
Albert St. Aubin
866399ba05 Changes for ui correctness state when saving a problem
TNL-1955
2016-11-16 12:30:04 -05:00
Christina Roberts
695e5c0751 Merge pull request #13997 from edx/christina/ora-release-colors
Update ORA version
2016-11-16 11:15:35 -05:00
alisan617
47eee23814 Merge pull request #13999 from edx/alisan/fix-pr-13843-separate-discussion-tab-ui-view
Fix the Discussion Editing Post error
2016-11-16 10:14:27 -05:00
Ahsan Ulhaq
6776ce4646 Merge pull request #13980 from edx/ahsan/ECOM-4763-update-log-messages-updated
Add log info for course enrollment
2016-11-16 20:10:52 +05:00
Gregory Martin
042244c342 Merge pull request #14000 from edx/yro_fix_utils
fix async js dateutil issue
2016-11-16 09:33:37 -05:00
Gregory Martin
b814678933 register dateutil_factory in request.js 2016-11-16 07:18:19 -05:00
Ahsan Ulhaq
2157202aaf Add log info for course enrollment
ECOM-4763
2016-11-16 12:00:28 +05:00
Douglas Hall
b65d245b29 Merge pull request #13979 from edx/hasnain-naveed/WL-633
WL-633 | refactor pay_and_verify.html template.
2016-11-15 16:50:35 -05:00
alisan617
cb14d1598e discussion course settings change 2016-11-15 15:05:28 -05:00
alisan617
6072e52ca9 Merge pull request #13998 from edx/revert-13987-alisan/revert-13843-separate-discussion-tab-ui-view
Revert "Revert PR#13843"
2016-11-15 14:58:33 -05:00
alisan617
57fa123f5e Revert "Revert PR#13843" 2016-11-15 14:46:57 -05:00
Christina Roberts
9fc0138225 Merge pull request #13836 from eduNEXT/fmo/unicode_username_fixes
Quick fixes for users with unicode usernames.
2016-11-15 14:27:03 -05:00
cahrens
9196615322 Update ORA version 2016-11-15 13:18:15 -05:00
sanfordstudent
dd809dfdc3 Merge pull request #13961 from edx/sstudent/TNL-5895
Add first_attempted to subsection grades data model
2016-11-15 11:41:19 -05:00
Calen Pennington
f5f64c03fc Don't try to create a directory from an empty string 2016-11-15 11:38:33 -05:00
Calen Pennington
a207080897 Add timer logging to jenkins test runs 2016-11-15 11:00:19 -05:00
alisan617
e5a57e75a7 Merge pull request #13987 from edx/alisan/revert-13843-separate-discussion-tab-ui-view
Revert PR#13843 that caused regression issue in editing discussion post
2016-11-15 10:50:44 -05:00
Sanford Student
6d50044ec4 adding first attempted timestamp to subsection grades
for TNL-5895
2016-11-15 10:01:44 -05:00
Ned Batchelder
48507af229 Merge pull request #13971 from edx/ned/make-clean
A perhaps too-baroque way to clean files but also keep some.
2016-11-15 08:04:27 -05:00
Hasnain
3c29ecbf57 WL-633 | refactor pay_and_verify.html template. 2016-11-15 11:01:37 +00:00
wajeeha-khalid
07b6cdc215 Merge pull request #13954 from edx/jia/MA-2554
MA-2554: DiscussionAPI - fixed unread_comment_count
2016-11-15 15:07:50 +05:00
wajeeha-khalid
b837427bd5 MA-2554: DiscussionAPI - fixed unread_comment_count 2016-11-15 11:33:07 +05:00
alisan617
18e7322e8d Revert "Refactor discussion tab UI code into parts to be reusable for inline discussions"
This reverts commit e80d9b5792.
2016-11-14 21:43:03 -05:00
Gregory Martin
f8b90f2235 Merge pull request #13983 from edx/yro_resolve_translation_settings
fix concat string for translator
2016-11-14 18:33:54 -05:00
Gregory Martin
af410963c6 Merge pull request #13984 from edx/yro_fix-js
fixes dateutil bundling error
2016-11-14 16:32:48 -05:00
Gregory Martin
5b4048ddff fix for send to transifex 2016-11-14 14:53:59 -05:00
Gregory Martin
1fa805a052 js bundling error 2016-11-14 14:33:23 -05:00
Clinton Blackburn
b8bc4c8700 Merge pull request #13950 from edx/clintonb/verification-admin-update
Updated SoftwareSecurePhotoVerificationAdmin to use raw ID for copy_id_photo_from field
2016-11-14 13:02:19 -05:00
Brian Jacobel
3e9e000842 Merge pull request #13976 from edx/revert-13860-bjacobel/susy
Revert "Update to UXPL 0.17 (grids compilation performance work)" (release candidate version)
2016-11-14 12:51:18 -05:00
Eugeny Kolpakov
4e773095c3 Merge pull request #13941 from edx/hash-update/drag-and-drop-v2
Hash update: Bumped DnDv2 to v2.0.12
2016-11-14 10:17:19 +03:00
wajeeha-khalid
896856fe76 Merge pull request #13874 from edx/jia/MA-2871
MA-2871: return response_count on thread patch
2016-11-11 10:22:46 +05:00
Jesse Shapiro
c8135adf12 Merge pull request #13910 from open-craft/haikuginger/sol-2071
Increase polling rate to wait for mini-notification
2016-11-10 21:23:13 -05:00
Brian Jacobel
09947ab094 Revert "Update to UXPL 0.17 (grids compilation performance work)" 2016-11-10 18:35:51 -05:00
Brian Jacobel
492d417dca Merge pull request #13975 from edx/revert-13860-bjacobel/susy
Revert "Update to UXPL 0.17 (grids compilation performance work)"
2016-11-10 18:31:41 -05:00
Brian Jacobel
d39f7197c3 Revert "Update to UXPL 0.17 (grids compilation performance work)" 2016-11-10 15:49:33 -05:00
Jesse Shapiro
dffe3e0780 Update wait for mini-notification in testing to be more fine-grained; remove flaky test decorator 2016-11-10 15:08:08 -05:00
Douglas Hall
b4c61e87aa Merge pull request #13967 from edx/ibrahimahmed443/WL-785-password-reset-message
make password reset message customizable
2016-11-10 13:34:13 -05:00
Douglas Hall
f85aa4773e Merge pull request #13956 from edx/hasnain-naveed/WL-615
WL-615 | Fix the preview certificate link.
2016-11-10 12:53:09 -05:00
Christopher Lee
1ec55113af Merge pull request #13969 from edx/release
Release hotfix-2016-11-08 patch-2016-11-10
2016-11-10 12:51:51 -05:00
Ben Patterson
562b48cfb2 Merge pull request #13911 from edx/benp/nodeenv
Use nodeenv to manage node version in Jenkins builds
2016-11-10 12:46:29 -05:00
Douglas Hall
c42d207e48 Merge pull request #13965 from edx/release-candidate
Merge 2016-11-09 Patch Release to release branch
2016-11-10 11:31:20 -05:00
Cliff Dyer
2c86a6ddd6 Merge pull request #13963 from edx/beryl/date-passed
Add date_passed column to PersistentCourseGrade model
2016-11-10 11:26:19 -05:00
Ned Batchelder
781d3c9b30 Merge pull request #13925 from stvstnfrd/up/settings/zendesk
Fallback to default ZENDESK_URL when not in JSON
2016-11-10 11:12:49 -05:00
Ned Batchelder
45f92f73de A perhaps too-baroque way to clean files but also keep some. 2016-11-10 10:55:11 -05:00