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

39813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Chen
8309930bbf Add the email marketing welcome email delay ECOM-6760 2017-01-10 11:41:02 -05:00
Ned Batchelder
7be0d67546 Merge pull request #14285 from edx/ned/2017 
Happy New Year
 2017-01-07 22:34:04 -05:00
Ned Batchelder
9ff91756e5 Happy New Year 2017-01-07 20:19:51 -05:00
Jeff LaJoie
b8befaf756 Merge pull request #14278 from edx/jlajoie/TNL-6186 
Change CourseTeamMembership emit to use proper id
 2017-01-06 13:33:46 -05:00
Christina Roberts
adc3c8f89c Merge pull request #14134 from edx/christina/jsinput-newtemplate 
New jsinput example problem
 2017-01-06 10:29:59 -05:00
Christina Roberts
7c7b4da79a Merge pull request #14269 from edx/christina/tnl-6041 
Remove flaky decorator from test_capa_module
 2017-01-06 09:47:31 -05:00
Jeff LaJoie
982d56ca24 added self to AUTHORS 2017-01-06 08:11:12 -05:00
Jeff LaJoie
d66e323d42 TNL-6186 changes field used in CourseTeamMembership emit to be correct team_id and fixes tests 2017-01-06 08:10:31 -05:00
Jesse Zoldak
2a6432dba4 Merge pull request #14188 from edx/zoldak/bok-choy-startup-time 
Give the bok choy server more time to start up
 2017-01-05 18:06:21 -05:00
Anthony Mangano
00b0eefe2c Merge pull request #14217 from edx/ECOM-5936-add-display-name-to-enrollment-api-response 
Add course_name to enrollment api responses
 2017-01-05 16:30:38 -05:00
cahrens
96d99bf756 Update version for JSME. 2017-01-05 16:09:23 -05:00
cahrens
ed614448e4 Cleanup of status. 
Also remove unused empty jsinput_css.css.
 2017-01-05 16:09:23 -05:00
cahrens
77be91baf9 Related to javascriptresponse, which was already deleted. 
I missed these files the first time around.
 2017-01-05 16:09:22 -05:00
cahrens
aa8d222678 New example jsinput problem. 
TNL-5893
 2017-01-05 16:09:22 -05:00
sanfordstudent
c3c86b8b58 Merge pull request #14276 from edx/sstudent/me 
Add /me endpoint for retrieving own username when logged in.
 2017-01-05 15:32:56 -05:00
Ned Batchelder
e36cf4a596 Merge pull request #14272 from edx/ned/update-translations 
Update translations (autogenerated message)
 2017-01-05 15:13:49 -05:00
Feanil Patel
04f8769428 Merge pull request #14273 from edx/feanil/test_with_system_firefox 
Use the system version of Firefox
 2017-01-05 14:53:21 -05:00
Calen Pennington
4b196d421b Merge pull request #14274 from edx/release 
Merge pull request #14271 from edx/release-candidate
 2017-01-05 14:47:00 -05:00
Sanford Student
68daaf435a return only username from /me endpoint, with associated test changes 2017-01-05 14:23:37 -05:00
Rene Sorel
12e5244720 user api endpoint for logged in users info 2017-01-05 14:23:36 -05:00
alisan617
5f0b68df4a Merge pull request #14228 from edx/alisan/response-btn-TNL-6175 
Discussion hide Add a Response button response count if zero other responses in an answered question
 2017-01-05 13:57:22 -05:00
Brian Jacobel
d9a65a9674 Merge pull request #14167 from edx/bjacobel/sequence-coffee-to-js 
Move Sequence coffee files to JS
 2017-01-05 12:45:33 -05:00
cahrens
bf8b345586 Remove flaky decorator. 
Increased number of retries, as it is expected that sometimes
a seed will be reused. TNL-6041
 2017-01-05 12:34:00 -05:00
Calen Pennington
4eeff90775 Merge pull request #14271 from edx/release-candidate 
Merge Release candidate into release
 2017-01-05 12:20:36 -05:00
Feanil Patel
17c8932482 Use the system version of Firefox 
Use the system version of firefox for running test.
 2017-01-05 12:04:16 -05:00
Ned Batchelder
bbef15625f Update translations (autogenerated message) 2017-01-05 16:57:06 +00:00
Brian Jacobel
749909b8ff Remove unused a11y functionality for prev/next buttons 2017-01-05 11:55:15 -05:00
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
Anthony Mangano
0fd91f0739 add course_name to enrollment api reponse 
ECOM-5936
 2017-01-05 08:50:31 -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
alisan617
229f112274 hide add a response button if 0 other responses 2017-01-04 16:14:29 -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
Brian Jacobel
36e0086769 Clean up generated javascript for display.js 2017-01-04 15:23:00 -05:00
Brian Jacobel
20290d2b77 Convert display.js to javascript, preserving comments 2017-01-04 15:22:59 -05:00
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
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