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

40751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ned Batchelder
d3ddb2ae68 Merge pull request #14857 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-04-11 14:13:10 -04:00
Eric Fischer
51133c5ab8 Merge pull request #14771 from edx/neem/grade-only-for-engaged 
Grade only engaged learners
 2017-04-11 14:04:06 -04:00
Dennis Jen
02f6715075 Merge pull request #14853 from edx/dsjen/update-mathjax-cdn 
Update mathjax CDN to cloudflare.
 2017-04-11 13:50:10 -04:00
Brittney Exline
7408548b25 Merge pull request #14858 from edx/bexline/enterprise_version_bump 
ENT-289 Version bump for latest enterprise release
 2017-04-11 12:21:31 -04:00
Clinton Blackburn
579ce168a7 Removed switch display_retired_programs_on_learner_dashboard 
This functionality has been in production for a few days, and will not
be disabled. This switch can now be removed.

ECOM-7650
 2017-04-11 11:48:17 -04:00
Ned Batchelder
babf349f87 Update translations (autogenerated message) 2017-04-11 15:12:19 +00:00
Brittney Exline
1491c3c1a9 ENT-289 Version bump for latest enterprise release 2017-04-11 15:11:44 +00:00
Nimisha Asthagiri
1503e5f768 Grade only engaged learners 
Add a new waffle switch that allows us to assume zero grades for
learners who have no entry previously recorded, and another to
disable persisting grades for unengaged learners.

TNL-6691
 2017-04-11 10:41:57 -04:00
Anthony Mangano
0fe4611d1e Merge pull request #14852 from edx/extract-i18n-strings-from-themes-templates 
Fix i18n string extraction for txt files in themes directory
 2017-04-11 09:59:18 -04:00
Calen Pennington
5726265c19 Merge pull request #14849 from cpennington/learner-243 
Learner 243: Unauthenticated User Language Settings
 2017-04-11 09:28:18 -04:00
Clinton Blackburn
1ff2be0d93 Removed unnecessary Studio settings for Docker devstack 2017-04-10 18:01:39 -04:00
Clinton Blackburn
016b652509 Corrected LMS Docker devstack settings 
- Fixed LMS_ROOT_URL
- Fixed Enterprise API URL
 2017-04-10 18:01:39 -04:00
Dennis Jen
f90b80da62 Update mathjax CDN to cloudflare. 2017-04-10 19:52:35 +00:00
Anthony Mangano
5d4c383535 update babel_mako config to extract strings from .txt files in themes directory 2017-04-10 15:25:41 -04:00
Calen Pennington
b2bf3ce60d fixup! Don't capture browser language into unauthenticated user session 2017-04-10 12:57:56 -04:00
Zia Fazal
14e45ad2ea Merge pull request #14850 from edx/ziafazal/WL-584 
WL-584: Updated recommender xblock to v1.2
 2017-04-10 20:15:09 +05:00
Christina Roberts
5bcf7422d9 Merge pull request #14830 from edx/christina/change-default-cohorting 
Change default value for "always_cohort_inline_discussions" to False
 2017-04-10 10:04:55 -04:00
Calen Pennington
32491f3c5e Make test settings configurable 2017-04-10 08:51:10 -04:00
Calen Pennington
073e29cc03 Don't capture browser language into unauthenticated user session 
[LEARNER-243]
 2017-04-10 08:44:40 -04:00
Calen Pennington
58f1ce0a7a Add language tests for student_account (logistration) 
[LEARNER-243]
 2017-04-10 08:42:35 -04:00
Saleem Latif
f38356ae3a Merge pull request #14841 from edx/saleem-latif/ENT-265 
ENT-265: Enterprise version upgrade from 0.32.0 to 0.32.1
 2017-04-10 16:37:40 +05:00
Saleem Latif
77fb01cde8 Enterprise version upgrade from 0.32.0 to 0.32.1 2017-04-10 15:15:00 +05:00
Zia Fazal
be3f6a5526 Updated recommender xblock to v1.2 2017-04-10 11:03:38 +05:00
Jesse Shapiro
405c6b31c1 Merge pull request #14793 from open-craft/haikuginger/sap-sf-sso-provider 
[ENT-285] SAP SuccessFactors SAML provider user metadata
 2017-04-07 19:32:10 -04:00
sanfordstudent
eda5f45daf Merge pull request #14842 from edx/sstudent/rescore_fix 
for TNL-6825, fix rescore logic
 2017-04-07 13:39:33 -04:00
cahrens
121078eb67 Change default value for "always cohort". 
TNL-6815
 2017-04-07 13:02:25 -04:00
Sanford Student
0f53585afe for TNL-6825, fix rescore logic 2017-04-07 11:09:16 -04:00
Zubair Afzal
6431d0f675 Merge pull request #14817 from edx/zub/ENT-277-enterprise-version-bump-to-31.2 
bump enterprise version from 0.30.0 to 0.32.0
 2017-04-07 17:49:32 +05:00
zubair-arbi
fd58f95c35 bump enterprise version from 0.30.0 to 0.31.2 
ENT-277
 2017-04-07 15:13:55 +05:00
Matthew Piatetsky
2e20c28fdb Merge pull request #14773 from edx/ECOM-7388 
ECOM-7388 Program details page redesign
 2017-04-06 17:02:10 -04:00
Matthew Piatetsky
18ac075a21 Program Progress page redesign 
ECOM-7388
 2017-04-06 16:11:27 -04:00
Clinton Blackburn
eaed23d55c Updated Docker devstack settings to support an external marketing site 
These changes help simplify integrating with edx.org's separate marketing site.

ECOM-6627
 2017-04-06 16:10:44 -04:00
Jesse Shapiro
da3867e870 Enable direct calls to SAP SuccessFactors OData API to fetch user data during SSO process 2017-04-06 10:31:01 -04:00
Jeff LaJoie
fac7e288c8 Merge pull request #14800 from edx/jlajoie/TNL-6739 
TNL-6739: Adds in masquerading as enrollment track user
 2017-04-06 10:29:02 -04:00
Andy Armstrong
ae1903fe8c Merge pull request #14829 from edx/andya/page-query-tests 
Add query count tests for old and new course pages
 2017-04-06 10:23:43 -04:00
Jeremy Bowman
871c931065 Merge pull request #14648 from edx/iivic/fix-get-xblock-settings 
Fix get xblock settings
 2017-04-06 10:17:58 -04:00
sanfordstudent
792db7594f Merge pull request #14832 from edx/sstudent/update_dnd_2_0_18 
upgrade dnd
 2017-04-06 10:13:33 -04:00
Attiya Ishaque
b3793f43aa Merge pull request #14819 from edx/ai/TNL-6284-blank-subcategories 
TNL-6284 Empty subcategory will not render in inline discussion modules.
 2017-04-06 18:37:40 +05:00
Jeff LaJoie
413bce3d72 TNL-6739: adds in masquerading as enrollment track user 2017-04-06 09:35:08 -04:00
attiyaishaque
a7550912f8 TNL-6284 Empty subcategory will not render in inline discussion modules. 2017-04-06 12:00:53 +05:00
Andy Armstrong
e7a4ed742a Add query count tests for old and new course pages 2017-04-05 21:35:34 -04:00
Renzo Lucioni
f00059f28c Collect data needed for program progress sidebar 
This includes a representation of the user's progress towards completing each course in the program and a list of any relevant course and/or program certificates the user has earned.

ECOM-7386
 2017-04-05 19:06:28 -04:00
Robert Raposa
d0fe7f8422 Merge pull request #14827 from edx/robrap/LEARNER-418 
Refactor more tests to use course home page.
 2017-04-05 17:29:30 -04:00
Clinton Blackburn
bc45f82f5c Updated program filter for learner dashboard 
Learners will now see both active and retired programs on their
dashboards.

ECOM-7625
 2017-04-05 16:18:51 -04:00
Sanford Student
3e4163aa6d upgrade dnd 2017-04-05 15:37:24 -04:00
Andy Armstrong
aa3781988e Add bulk operations around CourseTabView rendering 2017-04-05 14:23:19 -04:00
Christina Roberts
15ab2b6be7 Merge pull request #14798 from edx/christina/tnl-6744 
Add Enrollment tracks to component visibility dialog
 2017-04-05 12:10:56 -04:00
cahrens
dbae1e397d Add ability to set visibility by enrollment track. 
TNL-6744
 2017-04-05 11:05:31 -04:00
iivic
49c3f20a15 Fix getting xblock settings in studio edit modal 2017-04-05 14:44:41 +00:00
Robert Raposa
ad84b8d46e Refactor more tests to use course home page. 2017-04-05 10:28:26 -04:00