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

39779 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Falcone
ebe332fc2d Merge pull request #14260 from edx/jibsheet/export-docs 
It's always bugged me that the help strings were nonsensical
 2017-01-05 10:50:33 -05:00
sanfordstudent
c18d932fa5 Merge pull request #14261 from edx/sstudent/TNL-6036 
fix auto enroll var mistake
 2017-01-05 10:36:05 -05:00
Simon Chen
20876b7a57 Merge pull request #14263 from edx/schen/ECOM-6581 
Remove Sailthru enrollment related signal handlers
 2017-01-05 10:15:30 -05:00
noraiz-anwar
a637121d19 Merge pull request #14216 from edx/noraiz/TNL-6197 
Error while exporting course with too long filename
 2017-01-05 15:43:44 +05:00
noraiz-anwar
9c139a87a6 Error while exporting course with too long filename 2017-01-05 14:43:48 +05:00
Kevin Falcone
2902c3b968 It's always bugged me that the help strings were nonsensical 
While here, the one-line docstring also bothered me.
 2017-01-04 16:51:34 -05:00
Simon Chen
3bda3c4a77 Remove Sailthru enrollment related signal handlers because they are being invoked from the ECOM service already. 
ECOM-6581
 2017-01-04 15:54:59 -05:00
Cliff Dyer
6d0af9d423 Merge pull request #14157 from edx/efischer/tnl-5799 
update_course_in_cache error handling cleanup.
 2017-01-04 12:40:27 -08:00
Sanford Student
1a49f4e230 fix auto enroll var mistake 2017-01-04 13:37:53 -05:00
Calen Pennington
d1fa83f34d Merge pull request #14258 from edx/release 
Merge pull request #14256 from edx/cale/release-candidate-for-merging
 2017-01-04 13:19:05 -05:00
Carol Tong
8a2daccca0 Merge pull request #14257 from edx/carol/DOC-3526 
DOC-3526 Clarify roles for cert activation
 2017-01-04 12:23:23 -05:00
Muhammad Ammar
825d73b61c Merge pull request #14206 from edx/ammar/tnl-4777-upload-error-message 
Improve error handling for Video Uploads
 2017-01-04 21:38:52 +05:00
David Ormsbee
ead5b590a2 Merge pull request #14211 from edx/ormsbee/remove_dd_metrics 
Remove Datadog instrumentation around model saves
 2017-01-04 11:36:09 -05:00
Calen Pennington
d07395d454 Merge pull request #14256 from edx/cale/release-candidate-for-merging 
Cale/release candidate for merging
 2017-01-04 11:18:33 -05:00
Carol Tong
e29f55368d DOC-3526 Clarify roles for cert activation 2017-01-04 11:01:47 -05:00
David Ormsbee
eaa2b9e764 Remove Datadog instrumentation around model saves 
We added this a long time ago as part of the shift to opaque-keys, but
left it on because it's occasionally useful for spotting unusual levels
of activity for certain models. That being said, because we have so
many models now, we're generating too many differently named metrics,
which might get expensive.

This is doing the simplest thing and just removing datadog reporting
of model updates altogether.
 2017-01-04 10:19:04 -05:00
muhammad-ammar
ab7f4140d1 Update error handling for Video Uploads 
Tnl-4777
 2017-01-04 18:15:37 +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