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

40855 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlasdairSwan
a466b437f6 ECOM-7386 Added a program progress circle to program details page 2017-04-21 14:45:55 -04:00
Adam
64372dd53e Merge pull request #13038 from OmarIthawi/edraak/bulk-email-from-addr 
Translatable bulk_email from Address based on platform`s default lang
 2017-04-20 10:29:59 -04:00
Noraiz Anwar
c1b148dd74 Merge pull request #14916 from edx/noraiz/TNL-6837 
TNL-6837 ORAs and Drag and Drop not supported in libraries, remove both from problem types in studio
 2017-04-20 19:20:55 +05:00
AlasdairSwan
7f09919cf6 Merge pull request #14926 from edx/alasdair/LEARNER-602-program-card-tet-update 
LEARNER-602 Updated program card text for states
 2017-04-20 10:03:05 -04:00
Ivan Ivic
9ef91591fc Merge pull request #14906 from edx/iivic/LEARNER-381 
Update Order History page to reflect bundled purchase
 2017-04-20 15:47:05 +02:00
sanfordstudent
205f0723bc Merge pull request #14922 from edx/sstudent/grade_reports 
additional logging for grade reports investigation
 2017-04-20 09:37:04 -04:00
John Eskew
1791d141a7 Merge pull request #14894 from edx/jeskew/fix_more_django_19_warnings 
Fix Django 1.9 deprecation warnings by adding app_label.
 2017-04-20 09:29:44 -04:00
noraiz-anwar
074900632a ORAs and Drag and Drop not supported in libraries, remove both from problem types in studio 2017-04-20 18:27:13 +05:00
Matt Drayer
561646699c Merge pull request #14762 from edx/mattdrayer/add-enterprise-aws-config 
Add environment overrides for Enterprise settings
 2017-04-20 09:12:05 -04:00
AlasdairSwan
3c1f61c9db LEARNER-602 Updated program card text for states 2017-04-20 09:05:59 -04:00
Ivan Ivic
b682c43d48 Update Order History page to reflect bundled purchase 
LEARNER-381
 2017-04-20 12:24:34 +00:00
Ahsan Ulhaq
1a31f251f8 Merge pull request #14875 from edx/ahsan/ECOM-7688-users-seeing-500-error-Financial-assistance-application 
Financial aid for courses with no course overview
 2017-04-20 16:30:38 +05:00
Ahsan Ulhaq
650695845e Financial aid for courses with no course overview 
ECOM-7688
 2017-04-20 13:55:22 +05:00
Marko Jevtić
d9f17435ae Merge pull request #14909 from edx/mjevtic/LEARNER-314 
[LEARNER-314] Determine client/learner eligibility
 2017-04-20 09:00:51 +02:00
Marko Jevtic
3d37635ffa [LEARNER-314] Determine client/learner eligibility 2017-04-20 05:53:13 +00:00
Eric Fischer
7e368e10f7 Merge pull request #14913 from edx/efischer/rekill 
Re-kill ICRV block
 2017-04-19 16:48:33 -04:00
edx-pipeline-bot
602b737b87 Merge pull request #14923 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-19 16:41:15 -04:00
Eric Fischer
5c26acc115 Re-kill ICRV block 
This reverts commit 1224e341de. I've also added
NotImplementedPartitionScheme, which allows deprecated partition types to have
a valid entry point despite being unusable.

TNL-6675
 2017-04-19 15:55:13 -04:00
Christina Roberts
7e99daacbc Merge pull request #14921 from edx/christina/choose-one 
Change "Choose one" to "Select a group type".
 2017-04-19 15:48:09 -04:00
Sanford Student
edee55d3f2 additional logging 2017-04-19 15:29:23 -04:00
John Eskew
3aa061d4eb Add model migration files for crawlers/programs. 2017-04-19 15:15:54 -04:00
cahrens
5e14a35607 Change "Choose one" to "Select a group type". 2017-04-19 14:32:44 -04:00
sanfordstudent
bd2025d60d Merge pull request #14912 from edx/sstudent/TNL-6833 
use higher of two available grades
 2017-04-19 14:27:51 -04:00
Christina Roberts
5599a4513d Merge pull request #14803 from edx/aj/TNL-6743_GroupConfigEnrollmentPartition 
Aj/tnl 6743 group config enrollment partition
 2017-04-19 14:27:06 -04:00
Jesse Shapiro
3f05d2e64d Merge pull request #14900 from open-craft/haikuginger/sso-provider-session-expiry 
[ENT-327] Allow per-SSO-provider session expiration limits
 2017-04-19 13:52:41 -04:00
Albert St. Aubin
59c6218885 Show Enrollment Tracks in Group Configurations. 
TNL-6743
 2017-04-19 12:35:15 -04:00
Clinton Blackburn
3f215df6d7 Updated program credential back-population command to account for no-id-professional 
This command has been updated to treat professional and no-id-professional
enrollments in the same manner.

ECOM-7442
 2017-04-19 11:51:53 -04:00
Sanford Student
a1a8023b4e use higher of two available grades for TNL-6833 2017-04-19 11:39:55 -04:00
Clinton Blackburn
be02fdb4ae Updated program credential back-population command to account for no-id-professional 
This command has been updated to treat professional and no-id-professional
enrollments in the same manner.

ECOM-7442
 2017-04-19 11:32:19 -04:00
Cliff Dyer
28d36b5276 Merge pull request #14813 from edx/neem/backfill-problem-completion 
Estimate first_attempted for grades.
 2017-04-19 09:36:10 -04:00
Rabia Iftikhar
1cecded31f Merge pull request #14908 from edx/ri/TNL-6666-500-error-courseware 
TNL-6666 Fix 500 error when entering courseware.
 2017-04-19 17:00:59 +05:00
rabia23
59d84e5b77 TNL-6666 Fix 500 error when entering courseware. 2017-04-19 10:45:08 +00:00
Zubair Afzal
2d4a564a4a Merge pull request #14905 from edx/zub/ENT-316-enterprise-version-bump-to-33.2 
update enterprise version from 0.33.0 to 0.33.2
 2017-04-19 13:59:27 +05:00
Eugeny Kolpakov
e03b3914f8 Merge pull request #14737 from open-craft/mit-capa-hide-correct 
MIT CAPA improvements: Add show_correctness field
 2017-04-19 07:03:46 +08:00
J. Cliff Dyer
4f6d5d9ce9 Estimate creation time for subsections grades based on timestamp of 
incoming scores.

TNL-6697
 2017-04-18 16:51:17 -04:00
Christina Roberts
529df7c6d9 Merge pull request #14863 from edx/christina/tnl-6746 
Show messages about component visibility.
 2017-04-18 14:53:58 -04:00
Christina Roberts
8d14deb854 Merge pull request #14879 from OmarIthawi/omar/translate-discussion-question 
Translate "discussion" in "discussion posted 2 minutes ago by X"
 2017-04-18 14:30:32 -04:00
Brandon DeRosier
bed65b2a91 Merge pull request #14904 from open-craft/bdero/ent-320 
ENT-320: Fix OAuth2ProviderConfig to be keyed by `provider_slug`
 2017-04-18 14:05:30 -04:00
Brian Jacobel
447f5c2b99 Merge pull request #14859 from edx/bjacobel/outline-details 
Implement minor UI/A11Y fixes for outline
 2017-04-18 10:20:09 -04:00
Clinton Blackburn
792d134de5 Added Studio test settings for Docker devstack 2017-04-18 10:11:35 -04:00
Clinton Blackburn
ba9035238c Updated edx-organizations package 2017-04-18 10:11:35 -04:00
Clinton Blackburn
1edfd795fb Cloning additional data when re-running a course 
Re-running a course now clones the OrganizationCourse and RestrictedCourse data from the old run to the new run. This will allow administrators to avoid the tedium of manually recreating this data.
 2017-04-18 10:11:35 -04:00
Brandon DeRosier
d8e1b917ef ENT-320: Fix OAuth2ProviderConfig to be keyed by provider_slug 
This change fixes a bug where OAuth2 Provider Configs only show
up on logistration if the provider's `provider_slug` matches a
valid OAuth2 backend name.

Closes ENT-320.
 2017-04-18 09:21:04 -04:00
Jesse Shapiro
ee9f632a3d Allow per-SSO-provider session expiration limits 2017-04-18 09:07:53 -04:00
zubair-arbi
db8324254f update enterprise version from 0.33.0 to 0.33.2 2017-04-18 14:39:57 +05:00
Marko Jevtić
23ca6e8053 Merge pull request #14865 from edx/mjevtic/LEARNER-493 
[LEARNER-493] Add feature flag for Bundled Purchase - WL
 2017-04-18 10:12:12 +02:00
Marko Jevtic
885d54239f [LEARNER-493] Add feature flag for Bundled Purchase - WL 2017-04-18 05:35:06 +00:00
Jesse Shapiro
07683f9c4c Merge pull request #14896 from open-craft/haikuginger/block-existing-session-decorator 
[ENT-326] Logout SSO users arriving at course modes view who already have session
 2017-04-18 01:08:40 -04:00
Jesse Shapiro
3f6e690827 When visiting track selection page with a TPA hint, logout the existing session 2017-04-17 23:09:01 -04:00
Attiya Ishaque
d9f87ad219 Merge pull request #14882 from edx/ai/TNL-5515-discussion-sorting 
TNL-5515. Fix discussion topic navigation and sorting option.
 2017-04-17 17:56:58 +05:00