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

1070 Commits

Author SHA1 Message Date
Renzo Lucioni
21cd5c8014 Ignore run publication status when requesting programs from the catalog 
The programs service has no concept of run publication status. The catalog does, and many runs returned by the programs service are marked as unpublished in the catalog. To maintain existing behavior and continue displaying these runs as part of their respective programs, we need to ignore their publication status.

ECOM-6925
 2017-01-25 11:34:16 -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
9ab93d1fe2 Disabled system checks for the compile_sass management command 
The system checks require database access, which is not available when building Docker images. This relaxes the check, allowing the command to execute without a database.

ECOM-6634
 2017-01-23 23:47:17 -05:00
Nimisha Asthagiri
b83ed6ef68 Merge pull request #14358 from edx/beryl/bs_cache_invalidation 
Block Structure: Don't invalidate immediately upon course publish
 2017-01-23 14:47:31 -05:00
Nimisha Asthagiri
b79eda78fb Merge pull request #14368 from edx/beryl/bt_version_checking 
Fix Block Transformer version checking so cache can be pre-populated
 2017-01-23 14:28:47 -05:00
Renzo Lucioni
21e92a41d1 Add testing utility for toggling Waffle Switches 2017-01-23 11:29:38 -05:00
Nimisha Asthagiri
408ed01b1d Block Structure: Don't invalidate immediately upon course publish 
Introduces the use of Waffle to put the change behind a Switch.
TNL-6323
 2017-01-23 11:27:30 -05:00
Nimisha Asthagiri
4ef07c25bd Fix Block Transformer version checking so cache can be pre-populated 
This change requires Block Transformer schema changes to be backwards
compatible for older Block Transformer code versions - at least 1
version back to allow smooth deployments in a multi-version setting.
 2017-01-23 10:56:50 -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
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
cahrens
a6776f6973 Always check group access when masquerading. 
TNL-6050
 2017-01-19 14:47:10 -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
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
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
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
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
Marko Jevtic
ba32bd0899 Fix test owner 2017-01-11 07:43:19 +00:00
Marko Jevtic
8e33ec52b5 Address comments 2017-01-11 07:09:48 +00:00
Douglas Hall
b44864b353 Check API View kwargs for username when checking for staff or owner permission 2017-01-11 07:09:48 +00: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
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
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
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
Gregory Martin
1b2fbbd61d delete datetext functions, implement dateutils 2017-01-03 10:18:26 -05:00
Calen Pennington
30bf20687b Merge pull request #14242 from edx/release 
Release 2016-12-22
 2017-01-03 10:11:04 -05:00
Nimisha Asthagiri
99e6d53939 Preload definitions when collecting block structures 2016-12-29 08:51:26 -05:00
Calen Pennington
47e21ca5b0 Revert "Merge pull request #14078 from edx/yro_remove-datetimetext-functions" 
This reverts commit 8c0098812d, reversing
changes made to 5b6e2dd5ee.
 2016-12-22 09:29:33 -05:00
Calen Pennington
4ead911f05 Merge pull request #14199 from cpennington/revert-wajeeha 
Fix quality issues
 2016-12-21 16:23:31 -05:00
Calen Pennington
a24ac5155b Merge remote-tracking branch 'edx/master' into release 2016-12-21 15:01:46 -05:00
Calen Pennington
3e0c8fb7ba Fix quality issues 2016-12-21 14:20:36 -05:00
Calen Pennington
04115bfe43 Revert "Merge pull request #13235 from edx/jia/MA-2684" 
This reverts commit bde0f7b2a7, reversing
changes made to 71693c3a12.
 2016-12-21 13:21:47 -05:00
J. Cliff Dyer
9259156565 review response. 2016-12-20 14:00:47 -05:00
Gregory Martin
b0bf19a741 delete datetext functions, implement dateutils 2016-12-20 11:10:06 -05:00
Douglas Hall
65f0420500 Allow for SiteConfiguration override of SESSION_COOKIE_DOMAIN setting in Studio 2016-12-20 05:17:27 -05:00
Afzal Wali Naushahi
024e2e4b33 Merge pull request #14045 from edx/afzaledx/WL-829_add_programs_to_courses_view_context 
Add programs list to the context for index.html and courses.html template.
 2016-12-16 16:43:47 +05:00
Eric Fischer
9d545eca4c update_course_in_cache exception handler cleanup 2016-12-15 14:59:24 -05:00
Gregory Martin
fd9c26b11f Merge pull request #14152 from juananpe/honorbrowserlangs 
Honor browser defined language preferences when possible
 2016-12-15 12:07:52 -05:00
Afzal Wali
e44e18592f Programs list conditionally added to the context of index and courses page. 2016-12-15 18:16:48 +05:00
wajeeha-khalid
11356965b5 MA-2684: return correct marketing url for course about 2016-12-15 16:19:44 +05:00
Juanan Pereira
83d91fa7ff Honor browser defined language preferences when possible 2016-12-14 23:03:12 +01:00
Jesse Zoldak
5962328370 Revert "Honor browser defined language preferences when possible" 2016-12-14 14:52:57 -05:00
Gregory Martin
790a642ab1 Merge pull request #13441 from juananpe/honorbrowserdefinedlangs 
Honor browser defined language preferences when possible
 2016-12-14 14:16:23 -05:00
Juanan Pereira
67d0245e5a Honor browser defined langs 
Add tests for PR13441

Apply DRY principle, rename test function name
 2016-12-14 19:53:47 +01:00
Awais Jibran
2b1598f85b Merge pull request #14123 from edx/aj/filter-unpublish-courses-from-discovery 
Fix accidentally exposed Supply Chain course run
 2016-12-13 21:21:13 +05:00
Jesse Shapiro
fc814aee95 Add data sharing consent features for EnterpriseCustomer 2016-12-12 09:30:38 -05:00