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

41257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Adam
b017229e6e Merge pull request #15141 from edx/adam/clear-tasks-old-queueing-state 
write management command to fail old tasks stuck in queueing state
 2017-05-19 18:39:32 -04:00
Adam Palay
aee4b332db write management command to fail old tasks stuck in queueing state 2017-05-19 16:12:43 -04:00
Douglas Hall
95510487d7 Merge pull request #15154 from edx/douglashall/ENT-392 
ENT-392 Use PLATFORM_NAME in the account activation sidebar message on the da…
 2017-05-19 15:01:55 -04:00
Simon Chen
885a7df65b Merge pull request #15155 from edx/schen/learner-490 
Update CMS jquery config to remove script evaluation from ajax call
 2017-05-19 14:21:08 -04:00
Robert Raposa
79300c00d7 Merge pull request #15107 from edx/rraposa/docs-cleanup 
LEARNER-909: Clean-up the edx-platform repo documentation
 2017-05-19 14:05:11 -04:00
Simon Chen
0271b4479c Update CMS jquery config to remove script evaluation from ajax call 2017-05-19 13:26:53 -04:00
Simon Chen
9380b6b594 Merge pull request #15151 from edx/schen/learner-490 
LEARNER-490 Disable script auto-eval on lms
 2017-05-19 13:03:41 -04:00
Douglas Hall
c1561f63a7 Use PLATFORM_NAME in the account activation sidebar message on the dashboard. 
ENT-392
 2017-05-19 12:58:16 -04:00
Gregory Martin
a39dfbb2bb Merge pull request #15127 from edx/yro_refactorCMSsignalhandling 
Refactor CMS Signal Handling
 2017-05-19 09:57:18 -07:00
Saleem Latif
95add48b45 Merge pull request #15102 from edx/saleem-latif/ENT-344 
ENT-344: Success Message for Account Activation for logged in users
 2017-05-19 21:39:41 +05:00
AlasdairSwan
a929f09013 LEARNER-1040 Only show congratulations message on the program details page once the program certificate has been earned. 2017-05-19 12:31:14 -04:00
Adam Palay
1ad643acc5 allow sending emails to course modes even if they've expired (EDUCATOR-364) 2017-05-19 12:10:37 -04:00
Saleem Latif
30eba50b79 Success Message for Account Activation for logged in users 2017-05-19 20:42:40 +05:00
Simon Chen
9135e7286d Disable script auto-eval on lms 2017-05-19 11:15:36 -04:00
Jesse Shapiro
73c41388ce Merge pull request #15025 from open-craft/haikuginger/enterprise-branded-logistration 
[ENT-336][ENT-337][ENT-338] Enterprise registration/login form updates
 2017-05-18 17:20:56 -04:00
Braden MacDonald
466ceb9912 Merge pull request #15137 from open-craft/uman/EDUCATOR-338 
Fix [EDUCATOR-338]: Errors: "'float' object is not callable"
 2017-05-18 14:12:02 -07:00
Gregory Martin
b4f265ade2 Refactor CMS Signal Handling 
https://openedx.atlassian.net/browse/EDUCATOR-389
 2017-05-18 15:29:12 -04:00
edx-pipeline-bot
42be67078c Merge pull request #15146 from edx/release-mergeback-to-master 
Merge release back to master
 2017-05-18 14:26:35 -04:00
Christina Roberts
816ba4e6f7 Merge pull request #15134 from edx/christina/ed-61 
Christina/ed 61
 2017-05-18 11:09:18 -04:00
Diana Huang
8f6203f1ac Merge pull request #15119 from edx/diana/masquerade-issues 
Only show preview bar if student can view it.
 2017-05-18 10:37:38 -04:00
Robert Raposa
6bd64c4a61 Clean up docs directory. 
- Remove old docs
- Move testing.rst
- Update READMEs and index.rst for docs.
 2017-05-18 09:50:59 -04:00