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

34574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cristian Salamea
c7c542d7da Remove duplicate import 2015-12-30 21:51:14 -05:00
AlasdairSwan
da7830db99 Merge pull request #11101 from edx/alasdair/ECOM-3047-programs-ida-integration-update 
ECOM-3047 update DOM to include the data-attributes that the programs…
 2015-12-30 16:43:07 -05:00
Peter Fogg
51a89cab29 Merge pull request #11102 from edx/peter-fogg/active-email-text-change 
Add mailing address to activation email form.
 2015-12-30 15:19:32 -05:00
AlasdairSwan
a1d81ed781 ECOM-3047 update DOM to include the data-attributes that the programs IDA expects 2015-12-30 14:43:52 -05:00
clrux
622413a8e5 Merge pull request #11050 from edx/clrux/ac-296 
LMS: re-enable Enter and Space to toggle transcript
 2015-12-30 14:43:05 -05:00
Peter Fogg
80848135cd Merge pull request #11100 from edx/peter-fogg/remove-update-deadline-cat 
Allow removing upgrade deadlines through the Commerce API.
 2015-12-30 13:31:48 -05:00
Peter Fogg
238968c3cd Add mailing address to activation email form. 
ECOM-3318
 2015-12-30 13:30:43 -05:00
Syed Hasan raza
a5f7f502f2 Merge pull request #11093 from edx/shr/bug/AN-4509-detail-logging 
Detail logging for backend_logger
 2015-12-30 22:23:37 +05:00
Peter Fogg
69432015f3 Allow removing upgrade deadlines through the Commerce API. 2015-12-30 12:22:22 -05:00
Peter Fogg
bc61e72c0c Merge pull request #11099 from edx/peter-fogg/remove-verification-deadline-cat 
Allow removing a verification deadline through the Commerce API.
 2015-12-30 12:20:59 -05:00
Peter Fogg
45bff268ae Allow removing a verification deadline through the Commerce API. 
ECOM-3268
 2015-12-30 11:25:52 -05:00
Peter Fogg
d2392b451f Merge pull request #11089 from edx/peter-fogg/update-account-settings-name-label 
Update name label on account settings page.
 2015-12-30 09:49:10 -05:00
Christine Lytwynec
00b1e2155b Merge pull request #11090 from edx/clytwynec/ac-250 
add sr text for show/hide answer button
 2015-12-30 09:28:30 -05:00
David Ormsbee
dba12c09a3 Merge pull request #11088 from edx/ormsbee/seq_new_relic_tagging 
Add New Relic instrumentation to SequenceModule.
 2015-12-30 08:51:08 -05:00
Syed Hassan Raza
a16791baaa Detail logging for backend_logger 2015-12-30 15:41:01 +05:00
Awais Jibran
4f185abc33 Merge pull request #10749 from edx/aj/tnl3779-use-get-courses-summaries-for-staff 
Render CMS course listing Using CourseSummary class for staff
 2015-12-30 11:49:55 +05:00
David Ormsbee
0219071502 Add New Relic instrumentation to SequenceModule. 
The goal of this is to capture more detailed usage and performance
information around the kind of course content we have out there.
Having this information will allow us to more easily query to see
how sequence size and specific block types affect front end
performance.
 2015-12-29 19:08:30 -05:00
Vedran Karačić
e30761b89a Merge pull request #10352 from edx/vkaracic/TNL-2896 
[TNL-2896] Colons in problem names
 2015-12-30 00:08:58 +01:00
Christine Lytwynec
bb329c7b6f add sr text for show/hide answer button 2015-12-29 17:03:32 -05:00
Peter Fogg
bd50186fb9 Update name label on account settings page. 
ECOM-3130
 2015-12-29 16:19:22 -05:00
vkaracic
534b32c78c Xblock utilities tests 
Tests for xblock_utils.py functions.
 2015-12-29 18:46:10 +00:00
Christine Lytwynec
64d20bb66d Merge pull request #11079 from edx/clytwynec/release-process 
remove cut-branch option from release.py
 2015-12-29 10:53:34 -05:00
Matt Drayer
d7bc32f590 Merge pull request #11071 from edx/asadiqbal08/SOL-1358 
asadiqbal08/SOL-1538 Incorrect Course Number Override appears on certificate setup page
 2015-12-29 10:10:25 -05:00
Aamir
bd1052cb72 Merge pull request #10940 from edx/aamir-khan/ECOM-3107-credit-eligibility-on-progress 
ECOM-3107: Updated the progress page to not display the eligibility in honor mode
 2015-12-29 18:31:00 +05:00
Awais Jibran
c32823dfa6 Render cms course listing using CourseSummary class. 2015-12-29 17:35:12 +05:00
aamir-khan
3fbdebcd30 ECOM-3107: Updated the progress page to not display the eligibility if user is not enrolled as credit mode 2015-12-29 17:34:34 +05:00
asadiqbal
624b2ba406 SOL-1358 2015-12-29 16:40:27 +05:00
Nimisha Asthagiri
5df15fcf03 Merge pull request #11077 from edx/course-api/field-name-change 
Course API: Change field name from course_id to id
 2015-12-28 17:17:39 -05:00
Nimisha Asthagiri
a00c2a7c47 Course API: Change field name from course_id to id 2015-12-28 16:24:54 -05:00
Nimisha Asthagiri
6bbc46b1b5 Merge pull request #11049 from edx/mobile/catalog-api-overview-field 
Update Course Catalog API to support About Overview field
 2015-12-28 16:09:15 -05:00
Nimisha Asthagiri
3d84e29218 Update Course Catalog API to include About Overview field. 2015-12-28 15:03:22 -05:00
Christine Lytwynec
0c5cd86c5d remove cut-branch option from release.py 2015-12-28 14:43:15 -05:00
Douglas Hall
1b3e73023d Merge pull request #11012 from edx/cdodge/edx-proctoring-0.12 
use edx-proctoring version 0.12.x
 2015-12-28 14:05:16 -05:00
Ben Patterson
d460eb62a9 Merge pull request #11075 from edx/benp/fix-flaky-hello 
Fix flaky condition.
 2015-12-28 13:34:58 -05:00
Ben Patterson
1599ae2f26 Merge pull request #11065 from edx/benp/fix-flaky-course-import 
Fix flaky condition. TNL-3937.
 2015-12-28 13:33:48 -05:00
Douglas Hall
88e21c3610 Merge pull request #11067 from edx/cdodge/allow-nested-templates 
Replace https://github.com/edx/edx-platform/pull/10780 with this PR
 2015-12-28 12:27:28 -05:00
Chris Dodge
45ce28961c use edx-proctoring version 0.12.x 2015-12-28 11:49:53 -05:00
Ben Patterson
056158d72b Fix flaky condition in lettuce test. 2015-12-28 10:50:45 -05:00
Peter Fogg
d9b181e83f Merge pull request #11053 from edx/peter-fogg/enrollment-api-slashes 
Add optional trailing slashes to the Enrollment API.
 2015-12-28 10:29:40 -05:00
Chris Dodge
0b4f3599b3 Apply patch from hasnain-naveed/HOL-4-navigation-template-change in order to get a Jenkins build running 2015-12-27 19:18:07 -05:00
Nimisha Asthagiri
76df0f06db Merge pull request #11057 from edx/course_api/has_access_performance 
Performance enhancement in see_exists: reverse order of checks
 2015-12-27 17:02:39 -05:00
Ben Patterson
d522068265 Fix flaky condition. TNL-3937. 2015-12-26 19:42:59 -05:00
Nimisha Asthagiri
44abf7a9a2 Performance enhancement in see_exists: reverse order of checks 2015-12-23 16:40:38 -05:00
Nimisha Asthagiri
765f5285a0 Merge pull request #11047 from edx/mobile/course-api-filter 
Update Course Catalog API to support filters
 2015-12-23 13:54:15 -05:00
raeeschachar
365191d6d5 Merge pull request #11056 from edx/raees/chrome-bokchoy-test-cannot-upload-sjson-translation 
Fixed test cannot upload json translation failing on Chrome
 2015-12-23 23:21:40 +05:00
Nimisha Asthagiri
8e3f4e058d Update Course Catalog API to support filters 2015-12-23 12:31:31 -05:00
raeeschachar
e5cbb1c92e Fixed test cannot upload json translation failing on Chrome 2015-12-23 18:15:09 +05:00
Usman Khalid
766c3dca71 Merge pull request #11051 from Ayub-Khan/ayubkhan/TNL-3822 
Fix escaping in studio editor
 2015-12-23 14:57:50 +05:00
Peter Fogg
3149aaa319 Add options trailing slashes to the Enrollment API. 
This allows the edX REST API Client to perform a sucessful GET against
this API, since Slumber (which our client is based off of) appends the
trailing slash by default.
 2015-12-22 14:52:27 -05:00
Robert Raposa
f5a63b1e36 Merge pull request #10962 from edx/robrap/TNL-3425 
Deprecate escaping in display_name_with_default
 2015-12-22 14:49:32 -05:00