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

39921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
a6776f6973 Always check group access when masquerading. 
TNL-6050
 2017-01-19 14:47:10 -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
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
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
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
Eric Fischer
c7d2d601b8 Merge pull request #14324 from edx/efischer/revertins 
Revert #14225 hide_after_due for self-paced courses
 2017-01-12 13:55:28 -05:00
Eric Fischer
0b620ebbc1 Revert "Merge pull request #14225 from edx/efischer/tnl-6108" 
This reverts commit 8b8cf5f9e0, reversing
changes made to 2716ffbf8e.
 2017-01-12 13:50:05 -05:00
sanfordstudent
fb2173f43e Merge pull request #14322 from edx/sstudent/grading-indexes 
add index for modified to course and subsection grades
 2017-01-12 13:42:07 -05:00
Calen Pennington
6e0c54ed94 Merge pull request #14321 from edx/release 
Merge pull request #14320 from edx/release-candidate
 2017-01-12 13:08:44 -05:00
Ned Batchelder
2b007e78c5 Update translations (autogenerated message) 2017-01-12 18:06:11 +00:00
Sanford Student
00471d4a78 add index for modified to course and subsection grades 
and first attempted for subsection
for TNL-6281
 2017-01-12 12:50:35 -05:00
Gregory Martin
eea2518452 Merge pull request #14299 from edx/yro_change-display-helptext 
change help strings
 2017-01-12 12:15:20 -05:00
Kevin Falcone
3f91367194 Merge pull request #14312 from edx/jibsheet/move-short-tasks-out-of-gradereport-queue 
These tasks tend to be very short but can queue behind grade reports
 2017-01-12 12:02:40 -05:00
sanfordstudent
a4fca6be1b Merge pull request #14319 from edx/revert-14311-sstudent/TNL-6281 
Revert "add index for modified to course and subsection grades"
 2017-01-12 11:36:15 -05:00
Calen Pennington
0dad9f61c0 Merge pull request #14320 from edx/release-candidate 
Merge release candidate to release
 2017-01-12 11:20:12 -05:00
sanfordstudent
c07f6405b9 Revert "add index for modified to course and subsection grades" 2017-01-12 10:54:35 -05:00
sanfordstudent
136355c48f Merge pull request #14311 from edx/sstudent/TNL-6281 
add index for modified to course and subsection grades
 2017-01-12 10:54:31 -05:00
Eric Fischer
8b8cf5f9e0 Merge pull request #14225 from edx/efischer/tnl-6108 
hide_after_due for self paced courses
 2017-01-12 10:25:02 -05:00
Andy Armstrong
2716ffbf8e Merge pull request #14252 from edx/andya/proctoring-transifex 
Update edx-proctoring version
 2017-01-12 10:17:51 -05:00
Andy Armstrong
f76f9d3b09 Update edx-proctoring to latest release (0.17.0) 2017-01-12 09:36:02 -05:00
Eric Fischer
6845c64977 Hide after course end 
Hijacks the existing hide_after_due field to be repected as "hide after course
end" for self-paced courses. Includes tests.

TNL-6108
 2017-01-12 09:12:54 -05:00
Gregory Martin
e1e47793df change help strings 2017-01-12 09:02:28 -05:00
Jareer Ahsan
8afc273dec Added username and user_id in opt out email csv. 
ECOM-2963
 2017-01-12 18:21:27 +05:00