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

41278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rabiaiftikhar
d71be1efcb Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-05-30 14:07:54 +05:00
rabiaiftikhar
59b0d80dce modify doc strings and method names. 2017-05-30 13:58:45 +05:00
Attiya Ishaque
bbf10c11d1 Merge pull request #15189 from edx/ai/EDUCATOR-3-resolve-NoneType-object 
EDUCATOR-3 Check for course before using it.
 2017-05-30 13:44:42 +05:00
attiyaishaque
7f3e4cb810 EDUCATOR-3 Check for course before using it. 2017-05-29 17:43:44 +05:00
rabia23
d10be68166 fix bokchoy test 2017-05-28 15:15:23 +00:00
Rabia Iftikhar
bdd5c5631f Merge branch 'master' into ri/EDUCATOR-394-disable-self-generation-certificates 2017-05-28 20:08:49 +05:00
Clinton Blackburn
74f9858b77 Optimized all imports in common.test.acceptance 
- Removed unused imports
- Ran isort to properly order/style imports
 2017-05-28 00:59:22 -04:00
Douglas Hall
6894dafa61 Merge pull request #15161 from open-craft/uman/OC-2663 
ENT-392 Refactoring
 2017-05-26 15:18:43 -04:00
Uman Shahzad
a41195377c Allow configurable activation email support link. 
This also serves as a slight refactor of ENT-392.
 2017-05-26 14:25:15 -04:00
Matt Drayer
ea195ff28a Merge pull request #15118 from edx/mattdrayer/hide-audit-enterprise 
ENT-405: Hide the audit option from track selection for certain enterprise scenarios
 2017-05-26 09:20:01 -04:00
rabia23
c4823c5ed6 EDUCATOR-394 Disable self generation certificates when course is reset to instructor-paced. 2017-05-26 12:12:26 +05:00
John Eskew
31912ac1a9 Merge pull request #15176 from edx/jeskew/move_license_mixin 
Move LicenseMixin and accompanying code to openedx/core/lib.
 2017-05-25 17:30:39 -04:00
John Eskew
e30e44cb9a Run isort on files touched in LicenseMixin move. 2017-05-25 16:24:57 -04:00
John Eskew
f1369b912e Move LicenseMixin and accompanying code to openedx/core/lib. 2017-05-25 16:17:31 -04:00
Andy Armstrong
643d9eda7d Merge pull request #15191 from edx/andya/use-isort 
Add isort to edx-platform
 2017-05-25 14:51:52 -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
Andy Armstrong
f81c21902e Add isort to edx-platform 
LEARNER-1168
 2017-05-25 11:39:43 -04:00
Cliff Dyer
8a4bb2e670 Merge pull request #15184 from edx/neem/cms-dash-inefficiencies 
Cleanup inefficiencies in Studio dashboard
 2017-05-25 11:12:21 -04:00
Anthony Mangano
8bb56fa448 Merge pull request #15133 from edx/LEARNER-842-show-language-selector-in-lms-footer 
Learner 842 Add ability to show language selector in LMS footer
 2017-05-25 10:42:01 -04:00
J. Cliff Dyer
6c6f271e0e Comment out broken speed test. 2017-05-25 10:18:43 -04:00
Douglas Hall
fa981e84f4 Merge pull request #15186 from edx/douglashall/WL-1052 
Allow for SiteConfiguration override of SOCIAL_SHARING_SETTINGS setting.
 2017-05-24 21:32:38 -04:00
Douglas Hall
8f95f799ac Allow for SiteConfiguration override of SOCIAL_SHARING_SETTINGS setting. 
WL-1052
 2017-05-24 20:24:14 -04:00
Anthony Mangano
0172ff315a add ability to show footer language selector on LMS 2017-05-24 16:41:45 -04:00
J. Cliff Dyer
61d247d4bb Prefer iters and sets to lists 2017-05-24 15:49: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
Adam
f0f09ce6c9 Merge pull request #15171 from edx/adam/fix-unicode-error 
make translated string unicode (EDUCATOR-460)
 2017-05-24 07:26:55 -04:00
Adam Palay
3b803085db make translated string unicode (EDUCATOR-460) 2017-05-23 13:13:56 -04:00
Saleem Latif
df01a55cbc Merge pull request #15169 from edx/saleem-latif/ENT-329-updates 
ENT-329: Update account activation message on login page
 2017-05-23 19:13:50 +05:00
Alex Dusenbery
30fc3a55d0 EDUCATOR-390 and EDUCATOR-391 | Send GRADING_POLICY_CHANGED signal when something changes the grading policy. 2017-05-23 08:57:06 -04:00
Saleem Latif
937f979327 Update account activation message on login page 2017-05-23 17:34:46 +05:00
Matt Drayer
5f5a44e062 Hide the audit option from track selection for certain enterprise use cases 2017-05-22 17:14:27 -04:00
Renzo Lucioni
2955a6e639 Remove credential listing from program list view 
The new design for the program detail page introduced a sidebar which includes a program-specific listing of credentials. This is an improvement over the old list of credentials found on the program list page and is meant to replace it. The new detail page is stable, so the credential listing on the program list page can be removed.

LEARNER-492
 2017-05-22 16:07:37 -04:00
sanfordstudent
78d8895880 Merge pull request #15138 from edx/sstudent/recalculate_for_date_range 
recalculate for date range mgmt command
 2017-05-22 15:01:53 -04:00
Douglas Hall
52fbe6f1c7 Merge pull request #15144 from edx/saleem-latif/ENT-329 
ENT-329: Success Message for Account Activation for logged out users.
 2017-05-22 14:48:04 -04:00
Douglas Hall
95964a0ac7 Merge pull request #15162 from edx/zub/ENT-347-enterprise-version-bump-to-0.33.19 
bump enterprise version from 0.33.16 to 0.33.19
 2017-05-22 14:29:23 -04:00
Matt Drayer
9b4ac5ab4f Merge pull request #15142 from edx/mattdrayer/ENT-307-commerce 
ENT-307: Consider waffle switch when selecting ecommerce workflow
 2017-05-22 14:02:00 -04:00
Adam
4785b2694c Merge pull request #15153 from edx/send-emails-to-expired-tracks 
allow sending emails to course modes even if they've expired (EDUCATO…
 2017-05-22 13:21:31 -04:00
Matt Drayer
a7f6e6a56b Consider waffle switch when selecting ecommerce workflow 2017-05-22 12:25:05 -04:00
Renzo Lucioni
a29a118cd1 Only allow enrollment in published runs on the program detail page 
Course runs indicated to be upcoming are also restricted to those runs that are published.

LEARNER-942
 2017-05-22 11:18:53 -04:00
Robert Raposa
cfc0dc1a5e Merge pull request #15164 from edx/robrap/lower-thresholds 
Lower safelint thresholds.
 2017-05-22 10:50:31 -04:00
Sanford Student
78edd8522d add command 2017-05-22 10:30:37 -04:00
Robert Raposa
8032813238 Lower safelint thresholds. 2017-05-22 09:38:28 -04:00
AlasdairSwan
f5ad3a7aab Merge pull request #15149 from edx/alasdair/LEARNER-1040-program-details-undeserved-congratulations 
LEARNER-1040 Only show congratulations message on the program details…
 2017-05-22 09:05:08 -04:00
Saleem Latif
727dd9f90b Success Message for Account Activation for logged out users. 2017-05-22 16:38:47 +05:00
zubair-arbi
d2eea88b98 bump enterprise version from 0.33.16 to 0.33.19 
ENT-347
 2017-05-22 16:22:04 +05:00
Clinton Blackburn
eeac30e197 Disable Forums for Docker devstack 
This service is not currently available in Docker devstack.
 2017-05-21 11:57:55 -04:00
Cliff Dyer
1dd2530deb Merge pull request #15129 from edx/cdyer/compute_grades_seqid 
Use a stable ordering for shuffled tasks.
 2017-05-20 21:24:36 -04:00