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

39762 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Jacobel
be18f9e93b Do a little cleanup of this coffee file before conversion 2017-01-04 15:22:59 -05:00
Brian Jacobel
e98aeda29e Move sequence nav display.coffee to new js location, and remove dead code 2017-01-04 15:22:59 -05:00
Gregory Martin
74a0d76956 Merge pull request #14247 from edx/yro_update-ui-toolkit-vers 
update edx-ui-toolkit version
 2017-01-03 16:03:13 -05:00
Eric Fischer
475dbc91a5 Merge pull request #14251 from edx/efischer/add_test 
Test for missing submission score
 2017-01-03 15:46:57 -05:00
Eric Fischer
69eae7b8fb Test for missing submission score 
Follow-up to this morning's change for TNL-6236
 2017-01-03 14:47:23 -05:00
Eric Fischer
e4d32e7fea Merge pull request #14245 from edx/efischer/none_sub_score 
Submissions scores can be too quick
 2017-01-03 14:05:01 -05:00
Ben Patterson
74302e3b08 Merge pull request #14238 from edx/benp/bok-choy-shard-11 
Run bok-choy tests across 11 shards
 2017-01-03 13:55:39 -05:00
Gregory Martin
be5cd11cac update edx-ui-toolkit version 2017-01-03 13:23:35 -05:00
Christopher Lee
ac2387376d Merge pull request #14233 from edx/clee/block_id 
Added block_id to course blocks API response.
 2017-01-03 12:53:00 -05:00
Gregory Martin
b816982b8e Merge pull request #14224 from edx/yro_fix-PR14078 
Fix PR 14078; fix course home regression
 2017-01-03 12:39:47 -05:00
Eric Fischer
033567752b Submissions scores can be too quick 
It's possible this score has not been logged yet, we should handle that.

TNL-6236
 2017-01-03 12:01:08 -05:00
Ben Patterson
bf28861eec Create shards 10 and 11 for bok-choy. 2017-01-03 12:00:40 -05:00
christopher lee
abe396164c Added block_id to course blocks API response. 2017-01-03 10:40:16 -05:00
Christina Roberts
4a71af8d6e Merge pull request #14160 from edx/christina/help-menu-tests 
Add tests for context-sensitive Help button.
 2017-01-03 10:39:43 -05:00
Gregory Martin
1b2fbbd61d delete datetext functions, implement dateutils 2017-01-03 10:18:26 -05:00
Gregory Martin
bd87b218ce Fix PR 14078; fix course home regression 2017-01-03 10:15:58 -05:00
Calen Pennington
30bf20687b Merge pull request #14242 from edx/release 
Release 2016-12-22
 2017-01-03 10:11:04 -05:00
Calen Pennington
2b46c329a2 Merge pull request #14241 from edx/release-candidate 
Release candidate
 2017-01-03 10:03:21 -05:00
Nimisha Asthagiri
1de87f9112 Merge pull request #14213 from edx/beryl/mongocrazy 
Pre-load Definitions in Split Modulestore when accessing all blocks
 2017-01-03 09:37:40 -05:00
Saleem Latif
0d222b3ed4 Merge pull request #14203 from edx/saleem-latif/ENT-111 
ENT-111: edx-enterprise version update for 'Added alphabetical ordering for catalog drop down '
 2016-12-30 11:35:39 +05:00
Zia Fazal
6274758868 Merge pull request #14215 from edx/ziafazal/WL-755 
ziafazal/WL-755: disable password reset button after click
 2016-12-30 11:14:07 +05:00
sanfordstudent
83bc318e37 Merge pull request #14235 from edx/sstudent/TNL-6214 
add verfication and enrollment to user profile report
 2016-12-29 19:43:25 -05:00
Sanford Student
5fd94a6698 add verfication status and enrollment mode to user profile report 
for TNL-6214
 2016-12-29 16:44:41 -05:00
Nimisha Asthagiri
99e6d53939 Preload definitions when collecting block structures 2016-12-29 08:51:26 -05:00
Awais Jibran
df1bec4b98 Merge pull request #14214 from edx/aj/fix-grade-rescore 
Fix problem rescore
 2016-12-29 15:15:02 +05:00
Awais Jibran
78790efdd8 Fix rescore TNL-6199 2016-12-29 11:22:27 +05:00
Gregory Martin
9e5139dcb0 Merge pull request #14107 from edx/yro_flaky-bokchoy-test_progress_page 
clean flaky test
 2016-12-27 15:48:30 -05:00
Gregory Martin
1ec9371f31 set wait for jquery decorator 2016-12-27 14:37:52 -05:00
Anthony Mangano
47f7072ffe Merge pull request #14142 from edx/ECOM-6107-fix-error-handling-for-sr 
Improve screen reader support on logistration pages
 2016-12-27 14:14:57 -05:00
Anthony Mangano
57f0999b3a improve screen reader support on logistration pages 
ECOM-6107
 2016-12-27 09:33:29 -05:00
Zia Fazal
32eb016428 disable password reset button after click 
fixed quality violation
 2016-12-27 13:41:50 +05:00
Ned Batchelder
82647ee8c0 Merge pull request #14212 from edx/ned/upgrade-drf-extensions 
Use DRF extensions 1.2.2 to fix test suite bug
 2016-12-23 17:30:47 -05:00
Ned Batchelder
5c5d5b789e Use DRF extensions 1.2.2 to fix test suite bug 
See http://nedbatchelder.com/blog/201612/finding_test_coupling.html for
the complete saga.
 2016-12-23 07:29:34 -05:00
Jillian Vogel
eef4539355 Merge pull request #14153 from open-craft/jill/fix-insights-ccx-staff 
Checks access using the CCX course key instead of the base course key
 2016-12-23 08:20:24 +10:30
Robert Raposa
18e3e095d1 Merge pull request #14174 from edx/robrap/credo-hide-bookmarks-feature-in-lti-mode-3 
OSPR-1527: robrap/credo hide bookmarks feature in lti mode
 2016-12-22 11:39:25 -05:00
Brian Jacobel
7774b7932b Merge pull request #14172 from edx/bjacobel/TNL-5770 
TNL-5770 (non-)flaky test
 2016-12-22 10:28:07 -05:00
Dmitry Viskov
fc0577d081 Hide bookmarks link in the LTI mode 2016-12-22 09:56:33 -05:00
Calen Pennington
f0aa24eff2 Merge pull request #14205 from cpennington/revert-14078 
Revert "Merge pull request #14078 from edx/yro_remove-datetimetext-fu…
 2016-12-22 09:44:10 -05:00
Calen Pennington
47e21ca5b0 Revert "Merge pull request #14078 from edx/yro_remove-datetimetext-functions" 
This reverts commit 8c0098812d, reversing
changes made to 5b6e2dd5ee.
 2016-12-22 09:29:33 -05:00
mikedikan
562f35bc92 Merge pull request #14181 from edx/mdikan/add-utm-tracking-to-free-purchases 
Adding support for UTM Tracking to apply to free purhases
 2016-12-22 07:29:13 -05:00
Attiya Ishaque
7daf1df96b Merge pull request #14202 from edx/TNL-6203-duplicate-button 
TNL-6203 Fix Duplicate button in Studio if user language is changed.
 2016-12-22 17:22:48 +05:00
attiyaishaque
8eb81ea585 TNL-6203 Fix Duplicate button in Studio if user language is changed. 2016-12-22 15:56:44 +05:00
Saleem Latif
80d85c4abf edx-enterprise version update for 'Added alphabetical ordering for catalog drop down ' 2016-12-22 14:42:57 +05:00
Mushtaq Ali
07c93a8ed5 Merge pull request #14140 from edx/mushtaq/video-upload-restrict 
Video upload restrictions
 2016-12-22 14:35:17 +05:00
Mike Dikan
8f4cf6829a Adding support for UTM Tracking to apply to free purhases 
ECOM-6450

Updating commerce api endpoint to capture user UTM cookies and resend them in the server request to the ecommerce IDA.
Currently, the non-free purchases are tracked because the user makes the request directly on ecommerce and user cookie
contains UTM data, but for free purchases, the UTM cookie isn't sent in the background server request to the ecommerce
IDA.
 2016-12-21 19:09:56 -05:00
Brian Jacobel
c3930956ca Remove flaky decorator from test, it's not flaky. 2016-12-21 19:09:43 -05:00
Brian Jacobel
a56b30495d Merge pull request #14192 from edx/bjacobel/a11y-discussions-test-broken 
Flaky inline discussions test marked with @flaky
 2016-12-21 19:04:51 -05:00
Jillian Vogel
8493ff6028 Checks access using the CCX course key, 
instead of using the base course key (which does not contain the CCX info).
This removes the need for special checking of CCXKey/CCXLocator types, and just
treats them like normal CourseKeys.

This fix allows users with a Staff role on a CCX course to view CCX courses in Insights.
 2016-12-22 08:37:49 +10:30
Cliff Dyer
b3051ced35 Merge pull request #14195 from edx/cdyer/save-cl-data 
Save content library selected blocks during transform phase.
 2016-12-21 16:58:10 -05:00
Brian Jacobel
86975faa5f Skip this test until it can be fixed, in TNL-6215 2016-12-21 16:54:41 -05:00