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

34879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Palay
cfab793cd3 Revert "Merge pull request #11302 from edx/ahsan/ECOM-3486-add-organization-api" 
This reverts commit 8bc8b6cafd, reversing
changes made to c2255ef0d6.
 2016-01-25 13:36:26 -05:00
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1" 
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
 2016-01-25 12:46:57 -05:00
Adam Palay
6b937a8db3 Revert "Merge pull request #11311 from edx/jsa/fail-safe-reverse" 
This reverts commit 0d1765e190, reversing
changes made to d2eaa63353.
 2016-01-25 12:45:50 -05:00
Adam Palay
c9c8116da7 Revert "Merge pull request #11324 from edx/ahsan/rc-add-service-user-in-cms" 
This reverts commit a84b81113b, reversing
changes made to 0d1765e190.
 2016-01-25 12:45:07 -05:00
Ahsan Ulhaq
a84b81113b Merge pull request #11324 from edx/ahsan/rc-add-service-user-in-cms 
Ahsan/rc add service user in cms
 2016-01-25 21:00:23 +05:00
Ahsan Ulhaq
31ec8ef708 Add service username in cms settings 2016-01-25 20:04:10 +05:00
Adam
0d1765e190 Merge pull request #11311 from edx/jsa/fail-safe-reverse 
ensure reverse migration to delete a specific row won’t fail.
 2016-01-22 15:48:35 -05:00
jsa
f65c5b9ce3 ensure reverse migration to delete a specific row won’t fail. 2016-01-22 14:55:51 -05:00
Adam
d2eaa63353 Merge pull request #11308 from edx/revert-11295-bump-problem-builder 
Revert "Bump Problem Builder Hash"
 2016-01-22 11:45:13 -05:00
Peter Fogg
6cd12f9f39 Merge pull request #11296 from edx/peter-fogg/fix-certs-migrations 
[wip] Reintroduce generated certificate changes, with updates to not require a giant migration.
 2016-01-22 11:19:54 -05:00
Ben Patterson
15ff497f75 Merge pull request #11298 from edx/benp/bok-choy-0410 
Upgrade to bok-choy 0.4.10
 2016-01-22 11:15:01 -05:00
Ned Batchelder
106a822def Merge pull request #11305 from edx/ned/fix-flaky-test 
Add @flaky
 2016-01-22 11:11:59 -05:00
raeeschachar
8b24d6380a Merge pull request #11303 from edx/raees/chrome-bokchoy-test-can-create-edit-signatories-of-certificate 
Fixed test can create and edit signatories of certificate failing on …
 2016-01-22 21:10:17 +05:00
Ned Batchelder
6d1abbad9c Merge pull request #11299 from edx/ned/updated-translations 
Update translations (autogenerated message)
 2016-01-22 10:56:04 -05:00
Adam
f3159e40e5 Revert "Bump Problem Builder Hash" 2016-01-22 10:47:39 -05:00
Peter Fogg
96cc38951d Disable audit certificates for new audit enrollments. 
Two new certificate statuses are introduced, 'audit_passing' and
'audit_notpassing'. These signal that the GeneratedCertificate is not
to be displayed as a cert to the user, and that they either passed or
did not. This allows us to retain existing grading logic, as well as
maintaining correctness in analytics and reporting.

Ineligible certificates are hidden by using the
`eligible_certificates` manager on GeneratedCertificate. Some places
in the coe (largely reporting, analytics, and management commands) use
the default `objects` manager, since they need access to all
certificates.

ECOM-3040
ECOM-3515
 2016-01-22 10:27:55 -05:00
Ahsan Ulhaq
8bc8b6cafd Merge pull request #11302 from edx/ahsan/ECOM-3486-add-organization-api 
Update edx-organization version and organization URL
 2016-01-22 20:26:00 +05:00
Ned Batchelder
30209b1486 Add @flaky 2016-01-22 09:48:25 -05:00
Ahsan Ulhaq
4f94b50cf2 Update edx-organization version and organization URl 
ECOM-3486
 2016-01-22 19:35:59 +05:00
Awais Jibran
c2255ef0d6 Merge pull request #11226 from edx/aj/ecom3384-course-image-breaking 
Studio - Schedule & Details tab broken
 2016-01-22 18:56:15 +05:00
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
raeeschachar
8dbf66fbd9 Fixed test can create and edit signatories of certificate failing on Chrome 2016-01-22 18:29:17 +05:00
Awais Jibran
8a6699a46d Studio breaks DEFAULT_COURSE_ABOUT_IMAGE_URL is not set in settings in cms 
ECOM-3384
 2016-01-22 16:49:57 +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
Ned Batchelder
bf951b4e40 Update translations (autogenerated message) 
Update translations (autogenerated message)

Update translations (autogenerated message)
 2016-01-21 15:51:55 -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
Ben Patterson
3c3f929614 Upgrade to bok-choy 0.4.10 
This will provide us with backwards-compatibility options for an upcoming browser upgrade. See changelog for more.
 2016-01-21 15:04:43 -05: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