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

1309 Commits

Author SHA1 Message Date
Adam
691d6872c7 Merge pull request #15294 from edx/adam/add-precedes-to-coursegraph-3 
write courses to neo4j in background tasks (EDUCATOR-583)
 2017-06-15 15:10:11 -04:00
rabiaiftikhar
7bf0674de8 EDUCATOR-394 disable self-generated certificates when course is reset to instructor-paced 2017-06-14 19:46:59 +05:00
Noraiz Anwar
371c422aaf Revert "EDUCATOR-394 Disable self generation certificates when course is reset to instructor-paced." 2017-06-14 15:57:07 +05:00
rabiaiftikhar
2eab85ebf7 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-14 13:38:29 +05:00
Sarah Fischmann
eafb79defc Added lang attribute in LMS and Studio; added language col to course_overviews 
Added course level lang attribute for LMS

added lang attribute to Studio

fixed error when trying to get language attribute on course that does not exist

simplified code

added lang attribure to more places in LMS, added migration for language attribute in course_overview

fixing contraints in the database for language attribute

added lang attribute to several more places in LMS and Studio

added lang attribute to discussion and custom pages; cleaned up code

fixed issue that was causing test failures

moved lang attribute higher in tree in two places
 2017-06-13 14:42:29 -04:00
Brandon Baker
7d2d0657fe Merge pull request #15290 from edx/bbaker/educator-344 
Bbaker/educator 344
 2017-06-13 10:42:35 -04:00
rabiaiftikhar
22d3b02807 respond to comments 2017-06-13 16:29:17 +05:00
rabiaiftikhar
b84d4c0209 Review Rehan 2017-06-13 15:43:36 +05:00
rabia23
a8913f9a66 Review Alex 2017-06-13 06:51:38 +00:00
Adam Palay
51abe89a80 respond to comments 2017-06-12 11:55:58 -04:00
Adam Palay
69d76b69d7 write courses to neo4j in background tasks (EDUCATOR-583) 
move tasks into tasks.py

add more logging
 2017-06-12 10:44:27 -04:00
rabia23
bb219ed4a7 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-12 11:24:30 +00:00
Marko Jevtic
bf164ae962 [LEARNER-1183] Prepare program data to be presented on program marketing page 
[LEARNER-1393] Filter program course runs by status
 2017-06-12 10:15:38 +00:00
rabia23
642c3b47e2 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-11 09:53:08 +00:00
rabia23
955c64470e reset self-generation of certs according to course pacing 2017-06-11 09:48:29 +00:00
Ibrahim Ahmed
07dc1e6b20 Merge pull request #15248 from edx/ibrahimahmed443/LEARNER-1127 
Exclude hidden programs from white label course page and home page
 2017-06-10 03:41:09 +05:00
Brandon Baker
f4c9044d2e EDUCATOR-344 
Removed instances of track function
 2017-06-09 18:51:10 +00:00
Ibrahim
9995716899 Exclude hidden programs from white label course and homepage 
LEARNER-1126, LEARNER-1127
 2017-06-09 21:42:21 +05:00
Marko Jevtic
2422728671 LEARNER-1366 EcommerceService should be able to provide a link to the basket page that contains multiple products 2017-06-09 12:29:29 +02:00
cahrens
d9592fc422 Make the code robust to the request cache being cleared. 2017-06-08 16:31:37 -04:00
Sofiya Semenova
91f1923dbf Merge pull request #15266 from edx/ssemenova/EDUCATOR-367 
ED-367 log in production logging when it shouldn't be
 2017-06-08 15:51:42 -04:00
Adam
c3a7088a94 Merge pull request #15211 from edx/adam/add-precedes-to-coursegraph-2 
add precedes relationship to coursegraph (EDUCATOR-484)
 2017-06-08 15:29:32 -04:00
Sofiya Semenova
6acc6fde95 ED-367 log in production 2017-06-08 18:48:26 +00:00
Adam Palay
e798b2e8a6 add precedes relationship to coursegraph (EDUCATOR-484) 2017-06-08 12:53:27 -04:00
cahrens
be0a5f3c36 Ran isort on file. 2017-06-08 11:50:37 -04:00
cahrens
052492dbe3 Add GUID to memory middleware logs. 2017-06-08 11:36:48 -04:00
Albert (AJ) St. Aubin
27b0dc9fd1 Merge pull request #15037 from edx/christina/ed11-simplification 
Feature branch: dividing discussions by enrollment tracks
 2017-06-07 13:22:13 -04:00
Brandon Baker
ec9ad2ccb2 EDUCATOR-344 
Change event emission for random partition scheme assignment
 2017-06-07 17:02:58 +00:00
Shirley He
49074f64a0 Merge pull request #15231 from edx/shrlyhe/ENT-385 
ENT-385: change error msg for confirm email
 2017-06-06 14:27:42 -04:00
ayub-khan
761db165b5 LEARNER-925 - Allow user to get program certificate if enrolled as verified in credit course 2017-06-06 01:14:52 +05:00
cahrens
3abc7dc07e isort updates 2017-06-05 13:47:48 -04:00
cahrens
36c51450c2 Adds in radio button patch request and text for page 
EDUCATOR-229
 2017-06-05 13:00:31 -04:00
Albert St. Aubin
c23c0b991b EDUCATOR-141: Moved the Discussions Mgt to its own tab and updated tests 2017-06-05 12:59:51 -04:00
cahrens
8951ac8c61 Refactor server-size code to enable enrollment tracks. 
EDUCATOR-11
 2017-06-05 12:59:50 -04:00
Robert Raposa
eaab2cf444 Add course overrides of waffle flags. 2017-06-01 15:12:50 -04:00
Shirley He
e61f8b62d8 ENT-385 fix confirmation error message 2017-06-01 13:22:36 +00:00
rabiaiftikhar
3de758f631 Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-06-01 15:07:04 +05:00
rabiaiftikhar
867bc9e316 get the course from CourseOverview table instead of Modulestore in certificates/signals.py. 2017-06-01 15:04:42 +05:00
Andy Armstrong
f4b0a76c0b Merge pull request #15204 from edx/andya/clean-imports-2 
Reorder imports using isort (except lms and cms)
 2017-05-30 20:36:41 -04:00
Clinton Blackburn
e9cdc133a6 Updated programs detail page to always call Credentials API 
The programs detail page now always makes a call to the Credentials API to check for program credentials, regardless of whether the user has earned a course certificate. The course certificate constraint adds an additional burden to testing in exchange for slightly decreased load on the API. The cost outweighs the benefit given the limited traffic to this page.

LEARNER-1103
 2017-05-30 17:30:20 -04:00
Adam Palay
4331132920 add indices to item nodes when dumping to neo4j 2017-05-30 16:33:15 -04:00
Andy Armstrong
93235d118d Reorder imports using isort (except lms and cms) 2017-05-30 16:04:54 -04:00
John Eskew
3b57542ab0 Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance" 
This reverts commit f97f052591, reversing
changes made to 800bcd8e20.
 2017-05-30 12:42:54 -04:00
John Eskew
f1369b912e Move LicenseMixin and accompanying code to openedx/core/lib. 2017-05-25 16:17:31 -04:00
John Eskew
f97f052591 Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance 
Move fields.py, inheritance.py, and partitions to openedx/core.
 2017-05-25 14:21:03 -04:00
Clinton Blackburn
800bcd8e20 Updated CredentialsApiConfig to pull URLs from settings 
Pulling URLs from settings allows us to rely on site configuration overrides in order to support multi-tenancy.

LEARNER-1103
 2017-05-25 13:30:43 -04:00
John Eskew
76389d8678 Run all files touched in inheritance/partition work through isort. 2017-05-25 13:24:08 -04:00
John Eskew
66f3aa5ccf Move fields.py, inheritance.py, and partitions to openedx/core. 2017-05-25 13:24:08 -04:00
Anthony Mangano
0172ff315a add ability to show footer language selector on LMS 2017-05-24 16:41:45 -04:00
Renzo Lucioni
6129494a4c Retry getting program details if they initially fail to be retrieved 
get_many sometimes fails to bring back details cached on one or more Memcached nodes. It doesn't look like these keys are being evicted. 99% of the time all keys come back, but 1% of the time all the keys stored on one or more nodes are missing from the result of the get_many. One get_many may fail to bring these keys back, but a get_many occurring immediately afterwards will succeed in bringing back all the keys. This behavior can be mitigated by trying again for the missing keys, which is what we do here. Splitting the get_many into smaller chunks may also help.

LEARNER-382
 2017-05-24 10:00:05 -04:00