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

15588 Commits

Author SHA1 Message Date
Clinton Blackburn
bb7c5b3384 Corrected OAuth URL for Docker-base devstack 
ECOM-6634
 2017-01-25 13:13:50 -05:00
asadiqbal
8f5ba0115c WL-606 2017-01-25 15:05:57 +05:00
Nimisha Asthagiri
784ef04221 Merge pull request #14359 from edx/beryl/command_generate_cb_tasks 
Update generate_course_blocks management command to enqueue tasks.
 2017-01-24 17:24:30 -05:00
Nimisha Asthagiri
c04f4401dc Update generate_course_blocks management command to enqueue tasks 2017-01-24 09:11:57 -05:00
Clinton Blackburn
e7c0ed77e5 Added settings for Docker-based devstack 
ECOM-6634
 2017-01-24 00:38:00 -05:00
Nimisha Asthagiri
59532fb9a2 Merge pull request #14360 from edx/beryl/fix_db_updated_check 
Update has_database_updated_with_new_score to handle all block types
 2017-01-23 20:24:43 -05:00
Christopher Lee
b287f48f8b Merge pull request #14301 from edx/clee/return-all-courses-on-mobile 
MA-3091: Return non-mobile courses from the mobile enrollments API
 2017-01-23 15:55:08 -05:00
Nimisha Asthagiri
5a9179bf00 Update has_database_updated_with_new_score to handle all block types 
TNL-6331
 2017-01-23 15:50:16 -05:00
christopher lee
b5e987ba61 MA-3091: Added mobile_available flag override admin setting 2017-01-23 15:04:40 -05:00
Renzo Lucioni
3fd23629a3 Transition program list and detail pages to the catalog 
Uses a Waffle Switch to route traffic between the programs and catalog services. A future commit will remove use of the switch and use the catalog exclusively.

ECOM-4422
 2017-01-23 11:29:38 -05:00
Renzo Lucioni
12c595f80d Merge pull request #14353 from edx/renzo/waffle 
Reintroduce Waffle
 2017-01-20 17:15:35 -05:00
Ned Batchelder
ce97df15c5 Merge pull request #14356 from edx/ned/update-translations 
Update translations (autogenerated message)
 2017-01-20 17:01:10 -05:00
Renzo Lucioni
3f6d6cbf84 Reintroduce Waffle 
Waffle serves as a complement to config models. It's useful in feature rollout situations where you may not want to incur the overhead of creating and committing a migration (required for adding a field to a config model), and also handles gradual, percentage-based rollouts.

ECOM-4422
 2017-01-20 16:20:13 -05:00
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
Ned Batchelder
aadd48eb7b Update translations (autogenerated message) 2017-01-20 20:01:52 +00: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
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
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
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
J. Cliff Dyer
0d2ae5d4af Store failed subsection grade calculations 
TNL-6250
 2017-01-18 09:43:07 -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
alisan617
356885e91e seq nav screen reader hidden 2017-01-17 09:56:30 -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
88e10e0ee8 sequence navs keyboard support and test update 2017-01-13 14:07:10 -05:00
Eric Fischer
9cb3f66a1c Bad line-copy :( 2017-01-13 11:27:23 -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
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
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
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
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
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
Kevin Falcone
4e6745f3c1 These tasks tend to be very short but can queue behind grade reports 
Here are the 3 tasks over the last 30 days with average duration
runtimes in seconds:

lms.djangoapps.instructor_task.tasks.calculate_students_features_csv 37.794393
lms.djangoapps.instructor_task.tasks.calculate_may_enroll_csv   0.030303
lms.djangoapps.instructor_task.tasks.export_ora2_data   67.629921

All but ora2 seem fine to pass through the default queue, which has 3
workers per physical machine.
 2017-01-11 17:18:45 -05:00
Sanford Student
434d403807 forgot migration 2017-01-11 15:51:20 -05:00
Sanford Student
85fb7b8ad2 add index for modified to course and subsection grades 2017-01-11 15:51:20 -05:00
Simon Chen
28e3b1cb5a Merge pull request #14297 from edx/schen/ECOM-6760 
Add the Sailthru welcome email delay
 2017-01-11 14:52:31 -05:00
Nimisha Asthagiri
05087bfac2 Management command to Reset Grades 
TNL-6251
 2017-01-10 15:26:52 -05:00
Nimisha Asthagiri
adad6b2e83 Merge pull request #14293 from edx/beryl/pre-collect-grade-report 
Grade Report: Reuse collected block structure
 2017-01-10 13:44:24 -05:00
Simon Chen
8309930bbf Add the email marketing welcome email delay ECOM-6760 2017-01-10 11:41:02 -05:00
Jesse Zoldak
4a5426a6a7 Merge pull request #14289 from edx/zoldak/no-celery-retry-for-bok-choy 
Do not retry block structures tasks on bok choy servers
 2017-01-10 11:16:20 -05:00
Anthony Mangano
2d85fe4ab2 Merge pull request #14279 from edx/ECOM-5936-send-course-id-and-enrollment-track-to-zendesk-custom-fields 
Ecom 5936 enable users to select course when making support requests
 2017-01-10 10:55:51 -05:00
Brian Jacobel
f58076e726 Don't hijack existing context to do this 2017-01-10 10:00:23 -05:00
Brian Jacobel
30f62203e2 Hide read state on profile pages. Add tests for read state generally 2017-01-10 10:00:23 -05:00
Jesse Zoldak
c25e836128 Do not retry block structures tasks on bok choy servers 2017-01-10 09:53:15 -05:00
Nimisha Asthagiri
04d4ab0e4d Grade Report: Reuse collected block structure 2017-01-09 22:04:16 -05:00