Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,855 Commits 1 Branch 0 Tags
46df4545361fb8ac372a1b01464e5ae34c19ef3a
Commit Graph

34855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ahsan Ulhaq
46df454536 Merge pull request #11241 from edx/feature/credentials-phase-1 
Feature/credentials phase 1
 2016-01-22 18:39:53 +05:00
Ahsan Ulhaq
bcb8afb2c4 Add jwt auth in LMS 
ECOM-3419
 2016-01-22 13:00:36 +05:00
Eric Fischer
039e6cdfe6 Merge pull request #11300 from edx/efischer/ora2_release 
ORA2 Weekly Release
 2016-01-21 16:48:13 -05:00
Eric Fischer
71cb070a72 edx-ora2 weekly release version update 2016-01-21 15:53:36 -05:00
Kelketek
3cc11d1b8c Merge pull request #11295 from edx/bump-problem-builder 
Bump Problem Builder Hash
 2016-01-21 14:32:26 -06:00
Piotr Mitros
3b2e0ddb83 Merge pull request #11229 from edx/pmitros/minor-studio-settings-cleanup 
Minor cleanup of Studio settings
 2016-01-21 14:38:24 -05:00
Ned Batchelder
7c9a65d8ce Merge pull request #11260 from eduNEXT/Bound3R/minwidth_layout 
Replace property min-width value
 2016-01-21 13:57:22 -05:00
Adam
c6b21d139a Merge pull request #11293 from edx/release 
Release
 2016-01-21 12:36:03 -05:00
Kelketek
677eb9b0c9 Bump Problem Builder Hash 
Per https://github.com/open-craft/problem-builder/pull/94
 2016-01-21 10:31:28 -06:00
Adam
ccc96cde1c Merge pull request #11248 from edx/rc/2016-01-20 
Rc/2016 01 20
 2016-01-21 10:36:12 -05:00
Daniel Naranjo
f4f4da4ef3 Add Bound3R in Authors List 2016-01-21 09:52:24 -05:00
Daniel Naranjo
a639846a26 Reemplace property min-width value 
The min-width property accept only values <length> | <percentage> | inherit. to reset better set to 0.
Properties documentation: https://www.w3.org/TR/CSS2/visudet.html#min-max-widths

This error generates an invalid style, and, therefore, this value is set to 760px by: https://github.com/edx/edx-platform/blob/master/lms/static/sass/course/courseware/_courseware.scss#L50
 2016-01-21 09:50:35 -05:00
Ned Batchelder
d8af95246c Merge pull request #11283 from open-craft/update-xblock-utils 
Bump xblock-utils hash.
 2016-01-21 09:26:33 -05:00
Syed Hasan raza
fb8478b084 Merge pull request #11228 from edx/shr/bug/AN-4509-HTTP_USER_AGENT 
Fix HTTP_USER_AGENT latin1 characters
 2016-01-21 15:23:16 +05:00
Braden MacDonald
5e3cc70783 Merge pull request #10943 from open-craft/email-authorized-list-master 
Allow each instance to configure restrictions on allowed email addresses
 2016-01-20 14:51:29 -08:00
Tim Krones
b9ac4e8341 Bump xblock-utils hash. 2016-01-20 22:22:19 +01:00
Peter Pinch
f584b1749f Merge pull request #10971 from msegado/msegado/customresponse-expect-context 
Allow python variable interpolation in CustomResponse "expect" field
 2016-01-20 16:09:36 -05:00
Bill DeRusha
3537a56bdc Merge pull request #11280 from edx/bderusha/revert-change-enrollments 
Revert "Update change_enrollment management command to be more robust…
 2016-01-20 15:40:32 -05:00
Piotr Mitros
417b0d2ebe Merge pull request #11252 from edx/pmitros/xblock-testcase-fixes 
Updating test case code to handle feedback XBlock
 2016-01-20 15:12:45 -05:00
Martin Segado
a15388b20c Allow python variable interpolation in CustomResponse 'expect' and 'answer' attributes 2016-01-20 15:11:51 -05:00
Eric Fischer
e65e8df2b5 Merge pull request #11269 from edx/efischer/flaky_tests 
Flaky test fix
 2016-01-20 15:01:37 -05:00
Peter Pinch
02a7d6eb47 Merge pull request #10931 from mitocw/gdm_push_ccx_info_to_connector_#128 
Added CCXCon app and CCXCon URL in course advanced settings
 2016-01-20 14:28:48 -05:00
Piotr Mitros
b480645654 Updating test case code to handle feedback XBlock 2016-01-20 14:24:06 -05:00
Eric Fischer
2b2f6d18d6 Wait for text to appear 
Adding a wait statement to allow ajax calls to finish before making assertions
about text that has changed. Fixes TNL-3943 flaky test ticket.
 2016-01-20 14:08:13 -05:00
Jim Abramson
3e88047e9b Merge pull request #11281 from edx/bderusha/rc-change-enrollment-cmd 
Update change_enrollment management command to be more robust and tested
 2016-01-20 14:03:40 -05:00
Braden MacDonald
110714ee81 Allow each instance to configure restrictions on allowed email addresses 2016-01-20 11:03:30 -08:00
Douglas Hall
73f311f1f6 Merge pull request #11270 from edx/douglashall/TNL-4046/fix_lti_consumer_due_date_comparison_bug 
TNL-4046 Updating xblock-lti-consumer requirement to pull in bug fix
 2016-01-20 13:59:16 -05:00
Diana Huang
ea2a0cab27 Merge pull request #11069 from OmarIthawi/edraak/oithawi/draggable-capa-rtl 
Fixup: draggable capa icons disappear in RTL layout
 2016-01-20 13:32:56 -05:00
Ned Batchelder
fe2e4a7481 Merge pull request #11273 from openfun/fun/fix_default_email_localization 
Fix (un)enrollment email default language
 2016-01-20 13:15:30 -05:00
Bill DeRusha
754e230f63 Update change_enrollment management command to be more robust and tested 2016-01-20 12:46:56 -05:00
Bill DeRusha
ce0fda7555 Revert "Update change_enrollment management command to be more robust and tested" 
This reverts commit ecae21e66c.
 2016-01-20 12:44:13 -05:00
Ben Patterson
31841bdcbb Merge pull request #11271 from edx/benp/9-bokchoy-shards 
Benp/9 bokchoy shards
 2016-01-20 12:09:53 -05:00
Régis Behmo
5fee7480e9 Fix (un)enrollment email default language 
When one or many users are sent an enrollment or unenrollment email via
the teacher subscription form, the emails are written in the user
language. If the user has no preferred language, e.g: when the user does
not exist, the platform language is supposed to be selected. In
practice, the emails were not being translated at all.
 2016-01-20 17:30:43 +01:00
Peter Fogg
8582380f86 Merge pull request #11276 from edx/peter-fogg/revert-certs-migration 
Revert certificates-related changes.
 2016-01-20 11:14:06 -05:00
Giovanni Di Milia
bb36ab013f Added CCXCon app 
The CCXCon app is used to push course updated to the CCXCon
 externale service.
 2016-01-20 10:47:37 -05:00
Mushtaq Ali
d8b902ad58 Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg 
Escape Course Name in enrolment message
 2016-01-20 20:04:23 +05:00
Peter Fogg
52d538444e Revert "Disable audit certificates for new audit enrollments." 
This reverts commit 60860e3aa8.
 2016-01-20 09:53:58 -05:00
Peter Fogg
b5400aa79b Revert "Ensure old audit certs don't get marked ineligible." 
This reverts commit 54c349b437.
 2016-01-20 08:56:48 -05:00
Peter Fogg
d0694aac75 Revert "Correctly query for any generated certificate, not just eligible ones." 
This reverts commit ee13ffd149.
 2016-01-20 08:56:39 -05:00
Syed Hassan Raza
de91ceaae2 Fix HTTP_USER_AGENT latin1 characters 2016-01-20 18:40:09 +05:00
Muhammad Ammar
4938601cd9 Merge pull request #11177 from edx/ammar/fix-play-video-event 
Avoid emitting play_video event during buffering
 2016-01-20 17:59:04 +05:00
Matt Drayer
68d770116b Merge pull request #11262 from edx/saleem-latif/WL-276 
WL-276: Move microsite_configuration/templatetags/microsite.py from individual templates to static_content.html
 2016-01-20 07:49:36 -05:00
Mushtaq Ali
8f76f3385a Fix enrollment message 2016-01-20 15:59:27 +05:00
Saleem Latif
6c8c67cad5 Remove microsite_configuration/templatetags/microsite.py references from individual templates. 2016-01-20 14:36:07 +05:00
Ahsan Ulhaq
8798ee0f53 Add credentials service user 2016-01-20 12:51:48 +05:00
Tasawer
6e14461adc Update 'certificate_url' field for view certificate on learner dashboard. 
ECOM-3281
 2016-01-20 12:51:48 +05:00
Ahsan Ulhaq
8fb998fee7 caching for requests to credentials service 
ECOM-3278
 2016-01-20 12:51:28 +05:00
Ahsan Ulhaq
4ce58a6f67 Show message for earned programs credentials 
ECOM-3015
 2016-01-20 12:50:30 +05:00
Ahsan Ulhaq
2cec045d92 Added configuration model for credentials 
ECOM-3033
 2016-01-20 12:50:29 +05:00
Ahsan Ulhaq
6f8727a285 Create placeholder django apps for credentials 
ECOM-3057
 2016-01-20 12:50:29 +05:00