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

40767 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
noraiz-anwar
8fa31a80ca Fix firefox issue for email field with extra whitespaces 2017-04-13 19:07:10 +05:00
Matthew Piatetsky
be5c4fad8b Merge pull request #14833 from edx/remainingnotification 
ECOM-7385 Add notification when a course is moved from in progress to remaining
 2017-04-12 17:57:01 -04:00
Andy Armstrong
eb1ec84ecf Merge pull request #14815 from edx/andya/course-redirects-2 
Implement common redirect logic for all course tabs
 2017-04-12 17:05:58 -04:00
Matthew Piatetsky
7330ff99b6 Add notification to program detail view 
ECOM-7385
 2017-04-12 16:59:22 -04:00
Andy Armstrong
da1ac4664e Implement common redirect logic for all course tabs 
LEARNER-76
 2017-04-12 16:05:32 -04:00
Nimisha Asthagiri
dc036af8f3 Merge pull request #14866 from edx/neem/tests-for-grade-only-for-engaged 
Missing grades tests and don't persist when creating grades unless policy changed
 2017-04-12 14:14:32 -04:00
Nimisha Asthagiri
d852aa8b75 Missing grades tests and 
Don't persist when creating grades unless policy changed.
 2017-04-12 11:05:44 -04:00
Douglas Hall
52fa400a35 Merge pull request #14864 from edx/douglashall/WL-1033 
Fix bulk_change_enrollment command bug
 2017-04-12 10:42:08 -04:00
Douglas Hall
9bb4ca5525 Fix bulk_change_enrollment command bug 
When using the `org` option with the bulk_change_enrollment command,
the command should not exit if it encounters a course which does not
have the given `to_mode`.

WL-1033
 2017-04-12 07:35:17 -04:00
Eric Fischer
53bf4ef38a Merge pull request #14856 from edx/efischer/waffle_util_cleanup 
Waffle Utils Touchup
 2017-04-11 16:48:13 -04:00
Ben Patterson
252515e487 Merge pull request #14855 from edx/benp/enable-crawler-on-prs 
Enable pa11ycrawler on pull requests. It will only fail the build if …
 2017-04-11 14:43:15 -04:00
Carol Tong
cd60e6270c Merge pull request #14851 from edx/carol/FixHelpLinks 
Fix Studio help links affected by guide reorg
 2017-04-11 14:23:18 -04:00
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
Eric Fischer
7d2dbf4b76 Waffle Utils cleanup 
Turn override into a sensible default that calls both of the
for_request and in_model submethods, which are themselves still
avaiable if needed.
 2017-04-11 13:31:30 -04:00
Andy Armstrong
8ddb5cf87b Disabled BokChoy help tests 
These tests have been disabled temporarily as as edx.org help
links are now different than Open edX, and the tests are incorrectly
expecting them to be the same.

Please check with @catong if you have questions.
 2017-04-11 13:30:32 -04:00
Carol Tong
6e19cc4928 Fix Studio help links affected by guide reorg 2017-04-11 13:13:39 -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
Ben Patterson
1bed4bed75 Enable pa11ycrawler on pull requests. It will only fail the build if it totally breaks. 2017-04-11 10:09:27 -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