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

41241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Robert Raposa
de2b47ca58 Move and rename help_tokens.ini files. 2017-05-18 09:50:59 -04:00
Diana Huang
3e71a45349 Only show preview bar if student can view it. 2017-05-18 09:16:28 -04:00
Jesse Shapiro
65dafe9fe5 Add Enterprise sidebar to login and registration views; remove unneeded fields; make registration form more narrow 2017-05-17 20:49:05 -04:00
Cliff Dyer
31e00d5821 Merge pull request #15116 from edx/neem/memory-middleware 
Middleware for Monitoring Memory
 2017-05-17 16:46:42 -04:00
Adam
c9189d73d7 Merge pull request #15140 from edx/adam/up-course-overviews-version 
up course overviews version to force refresh of table
 2017-05-17 16:12:34 -04:00
Anthony Mangano
c6c5958056 Merge pull request #15097 from edx/LEARNER-264-footer-language-selector-api 
Update branding api to add support for footer language selector
 2017-05-17 15:17:25 -04:00
Adam Palay
f5a3df6e20 up course overviews version to force refresh of table 2017-05-17 15:04:18 -04:00
Diana Huang
6f326f7245 Merge pull request #15136 from edx/diana/replace-welcome-message-urls 
Replace urls in the welcome message.
 2017-05-17 14:02:04 -04:00
Anthony Mangano
70d8c5c22c update footer endpoint in branding api to support inclusion of language selector 2017-05-17 12:33:00 -04:00
Diana Huang
9ecbc9bf48 Replace urls in the welcome message. 2017-05-17 12:26:30 -04:00
UmanShahzad
0eb6b2a6be Rename ActiveTable max_score to maximum_score to avoid conflicts. 
See https://openedx.atlassian.net/browse/EDUCATOR-338
We defined max_score as a Float XBlock field, while
a method max_score exists that was getting conflicts
with it.
 2017-05-17 10:48:53 -04:00
cahrens
33b2549155 Styling and a11y cleanup. 
EDUCATOR-61
 2017-05-16 15:40:04 -04:00
J. Cliff Dyer
1b94666c70 Use mock's ANY 2017-05-16 14:18:19 -04:00
Douglas Hall
aa4eba337e Merge pull request #15130 from edx/douglashall/ENT-388 
ENT-388 Fix formatting issues with LMS account activation email.
 2017-05-16 13:54:37 -04:00
Douglas Hall
d22afb8c92 Fix formatting issues with LMS account activation email. 
This removes extra whitespace in the body of the LMS account activation email.

ENT-388
 2017-05-16 12:53:43 -04:00
Renzo Lucioni
ef80a84574 Add README for catalog app 2017-05-16 12:51:48 -04:00