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

39939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Renzo Lucioni
acef28c70c Merge pull request #14259 from edx/ECOM-6535 
ECOM-6535 Change celery task to only pull from catalog and not programs api
 2017-01-20 15:55:57 -05:00
Matthew Piatetsky
05b461824e Pull programs from catalog when issuing program credentials 
Lays the groundwork for pulling all program data from the catalog.

ECOM-6535
 2017-01-20 14:48:43 -05:00
Calen Pennington
a432f15ccd Merge pull request #14355 from edx/release 
Merge release to master
 2017-01-20 12:48:55 -05:00
Calen Pennington
e4c0c61ded Merge pull request #14354 from cpennington/merge-release-candidate 
Merge pull request #14351 from edx/release
 2017-01-20 12:42:29 -05:00
alisan617
bcaeaffa7b Merge pull request #14338 from edx/alisan/inline-discussion-sort-TNL-6117 
Inline discussion sorting TNL-6117
 2017-01-20 10:48:35 -05:00
alisan617
f12dfae2d1 inline discussion component filtering and sorting 
TNL-6117
 2017-01-20 09:52:44 -05:00
Robert Raposa
126229a54a Merge pull request #14348 from edx/robrap/upgrade-xblock-lti-consumer 
OSPR-1490: Upgrade to 1.1.1 release of xblock-lti-consumer
 2017-01-19 16:54:49 -05:00
Robert Raposa
23c61ada7f Upgrade to v1.1.1 release of xblock-lti-consumer 2017-01-19 16:14:06 -05:00
Christina Roberts
b9c3848449 Merge pull request #14337 from edx/christina/tnl-6050 
Allow "masquerading as a group member" in Preview
 2017-01-19 15:49:02 -05:00
cahrens
a6776f6973 Always check group access when masquerading. 
TNL-6050
 2017-01-19 14:47:10 -05:00
Calen Pennington
cd4971a45f Merge pull request #14351 from edx/release 
Merge pull request #14350 from edx/release-candidate
 2017-01-19 14:04:21 -05:00
Calen Pennington
7df62ee89a Merge pull request #14350 from edx/release-candidate 
Merge release-candidate to release
 2017-01-19 09:57:50 -05:00
Calen Pennington
7f66d011b5 Merge pull request #14347 from edx/release 
Merge hotfix release into master
 2017-01-18 15:53:00 -05:00
Calen Pennington
f154f8c1ac Merge pull request #14346 from edx/release-candidate 
Release candidate
 2017-01-18 15:52:22 -05:00
Calen Pennington
52f75d7fe5 Merge tag 'release-2017-01-13b' into release-candidate 
Hotfix for Jan 13, 2017
 2017-01-18 14:38:20 -05:00
Eric Fischer
f84f3c09d3 Merge pull request #14343 from edx/efischer/hide_after_end 
Revert "Merge pull request #14324 from edx/efischer/revertins"
 2017-01-18 13:51:04 -05:00
Clinton Blackburn
0e3bb60c27 Merge pull request #14344 from edx/clintonb/update-edx-organizations 
Upgraded to edx-organizations 0.4.2
 2017-01-18 13:18:53 -05:00
jareerahsan
7baecd3a41 Merge pull request #14317 from edx/jareer/ecom-2963-added-new-fields-in-email-opt-out 
Added username and user_id in opt out email csv.
 2017-01-18 22:26:19 +05:00
Calen Pennington
0903073413 Merge pull request #14342 from edx/release 
Merge pull request #14341 from edx/release-candidate
 2017-01-18 12:22:32 -05:00
Clinton Blackburn
9f7b4f34a4 Upgraded to edx-organizations 0.4.2 
This version includes updated help text for the Organization logo field.

ECOM-6862
 2017-01-18 11:42:25 -05:00
Jeff LaJoie
43c5cb2af8 Merge pull request #14307 from edx/jlajoie/TNL-5619 
Fixes submit button enablement on save/reset
 2017-01-18 11:40:28 -05:00
Eric Fischer
507e621ccc Revert "Merge pull request #14324 from edx/efischer/revertins" 
This reverts commit c7d2d601b8, reversing
changes made to fb2173f43e.
 2017-01-18 10:56:13 -05:00
Jeff LaJoie
139f91ebed TNL-5619: removes enable/disable all button methods to save button state and disable active, modifies tests for new functions 2017-01-18 10:48:32 -05:00
Calen Pennington
fca49e9dfd Merge pull request #14341 from edx/release-candidate 
Merge Release candidate to Release
 2017-01-18 10:46:06 -05:00
Cliff Dyer
c4bcac3b66 Merge pull request #14266 from edx/beryl/task-failure-model 
Store failed subsection grade calculations
 2017-01-18 10:32:08 -05:00
J. Cliff Dyer
f33832a691 scoutrule: dedupe skip_unless_lms 2017-01-18 09:43:46 -05:00
J. Cliff Dyer
0d2ae5d4af Store failed subsection grade calculations 
TNL-6250
 2017-01-18 09:43:07 -05:00
Calen Pennington
78d1336497 Merge pull request #14331 from edx/release 
Release
 2017-01-17 13:30:17 -05:00
alisan617
55f474605f Merge pull request #14332 from edx/alisan/sr-sequence-nav-TNL-5918 
Hide previous next buttons in sequence nav from screen reader
 2017-01-17 13:26:58 -05:00
Christina Roberts
c80f700e75 Merge pull request #14335 from edx/christina/remove-names 
Remove warnings about WIP API.
 2017-01-17 12:18:35 -05:00
cahrens
80ff25f7b9 Remove warnings about WIP API. 2017-01-17 10:10:20 -05:00
alisan617
356885e91e seq nav screen reader hidden 2017-01-17 09:56:30 -05:00
Muhammad Ammar
be28e5c441 Merge pull request #14314 from edx/ammar/log-videoid-and-status 
log video id and status along with message
 2017-01-17 19:49:35 +05:00
Ari Rizzitano
577dea6ae8 Merge pull request #14239 from edx/arizzitano/courseware-sequence-title 
generate sequence-specific titles server-side
 2017-01-17 09:09:57 -05:00
Ari Rizzitano
54a48a3227 [courseware] generate sequence-specific titles server-side (AC-695) 
[courseware] generate sequence-specific titles server-side (AC-695)

[courseware] generate sequence-specific titles server-side (AC-695)

case for empty subsections [AC-695]

move title logic into courseware context method [AC-695]

pep8

coffeescript -> js

js mistake

jslint

refactor sequence title generation slightly

missed a line

line too long

python is not javascript

ugh js

ugh js part 2
 2017-01-14 17:55:09 -05:00
alisan617
d497e19462 Merge pull request #14218 from edx/alisan/kb-support-seq-nav-TNL-5917 
Sequence navs arrow keyboard support
 2017-01-13 14:51:59 -05:00
alisan617
88e10e0ee8 sequence navs keyboard support and test update 2017-01-13 14:07:10 -05:00
Eric Fischer
4503ab42c0 Merge pull request #14330 from edx/efischer/fix_targets 
Fix for bulk_email target selection
 2017-01-13 14:06:13 -05:00
Renzo Lucioni
a4a69f83da Merge pull request #14318 from edx/renzo/copyright-year 
Update the year in the copyright
 2017-01-13 13:20:49 -05:00
Ned Batchelder
e14db7f893 Merge pull request #14328 from edx/ned/allow-codejail-threads 
Use codejail with 15 threads
 2017-01-13 13:08:41 -05:00
Calen Pennington
3ea2d72590 Merge pull request #14329 from edx/release-candidate 
Merge release-candidate to release
 2017-01-13 13:05:59 -05:00
Renzo Lucioni
c867308441 Update the year in the copyright 
Datetime is used to make sure we never need to make a change like this again.
 2017-01-13 11:34:43 -05:00
Eric Fischer
9cb3f66a1c Bad line-copy :( 2017-01-13 11:27:23 -05:00
Ned Batchelder
d87d716dbd Use codejail with 15 threads 2017-01-13 11:13:51 -05:00
Eric Fischer
fe7eef036d Merge pull request #14118 from edx/efischer/hackathon_emails 
Bulk Email for course modes
 2017-01-13 09:51:25 -05:00
AsadAzam
6edd0af6aa Merge pull request #14294 from edx/asadazam/tnl-6046-empty-handouts 
Fixed Course handouts rejects deletion of all text
 2017-01-13 15:06:12 +05:00
Ned Batchelder
57b88abf4b Merge pull request #14326 from edx/ned/allow-codejail-threads 
Allow codejail threads TNL-6291
 2017-01-12 16:57:45 -05:00
Ned Batchelder
89a13cb7cc Use a codejail change that allows threads 2017-01-12 16:42:46 -05:00
Eric Fischer
4b794372cd Add registration tracks as valid bulk_email targets 
Hackathon XV project
 2017-01-12 15:05:49 -05:00
Ned Batchelder
a05488a419 Merge pull request #14323 from edx/ned/update-translations 
Update translations (autogenerated message)
 2017-01-12 14:53:13 -05:00