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

7445 Commits

Author SHA1 Message Date
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
Matt Drayer
a7f6e6a56b Consider waffle switch when selecting ecommerce workflow 2017-05-22 12:25:05 -04: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
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
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
30eba50b79 Success Message for Account Activation for logged in users 2017-05-19 20:42:40 +05:00
Gregory Martin
b4f265ade2 Refactor CMS Signal Handling 
https://openedx.atlassian.net/browse/EDUCATOR-389
 2017-05-18 15:29:12 -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
Robert Raposa
de2b47ca58 Move and rename help_tokens.ini files. 2017-05-18 09:50:59 -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
cahrens
33b2549155 Styling and a11y cleanup. 
EDUCATOR-61
 2017-05-16 15:40:04 -04:00
Gregory Martin
70b83f9f20 elim datetime 2017-05-15 16:49:59 -04:00
Gregory Martin
0a4931ec5d Implement GPC signal 2017-05-15 16:13:00 -04:00
Nimisha Asthagiri
b16e75bcd3 Middleware for Monitoring Memory 
EDUCATOR-274
 2017-05-15 13:17:01 -04:00
Gregory Martin
70905c8aab compute grades task register 
https://openedx.atlassian.net/browse/EDUCATOR-388
 2017-05-12 16:25:14 -04:00
J. Cliff Dyer
c61f2ddc69 Update xblock requirement to 1.0.0. 2017-05-12 14:51:02 -04:00
Brian Jacobel
9c6d94ada0 Require and Webpack can eat the same files 2017-05-12 14:40:31 -04:00
Brian Jacobel
480a3ca60b Move course import JS to Webpack 2017-05-12 14:40:31 -04:00
Ned Batchelder
25aa711ec8 Update translations (autogenerated message) 2017-05-12 06:28:34 -04:00
Matt Drayer
5e94c63da6 mattdrayer/ENT-318: Update activation email subject and message text 2017-05-06 00:16:43 -04:00
Matt Drayer
5097bd6e54 mattdrayer/ENT-328: Update account activation message on sign-in form. 2017-05-04 10:58:42 -04:00
Ned Batchelder
6be4337c7d Merge pull request #14898 from edx/nedbat/help-tokens-app 
Use a new external app for help tokens
 2017-05-03 18:08:27 -04:00
attiyaishaque
a5ab60aa53 EDUCATOR-146 Move button will not be shown on Pages page. 2017-05-03 18:38:34 +05:00
Omar Al-Ithawi
ad4e3d50a5 Allow uploading subtitles with unicode filenames 2017-05-02 10:53:58 +03:00
Brian Jacobel
a2323797f5 Work on sandbox bundling for webpack 2017-05-01 17:09:32 -04:00
Calen Pennington
3deb3a3c1b Merge pull request #14977 from cpennington/cale/fix-learner-542 
Cale/fix learner 542
 2017-05-01 12:18:03 -04:00
Ned Batchelder
ecce0f1513 Merge pull request #14996 from edx/nedbat/remove-useless-super-delegation 
Remove a number of unneeded super()-delegation methods
 2017-04-28 13:04:43 -04:00
Qubad786
4b2488b5ee Add config models and a configuration service to configure LTI Consumer. 2017-04-28 15:59:23 +05:00
Ned Batchelder
4a568476fd Remove a number of unneeded super()-delegation methods 2017-04-27 14:12:56 -04:00
Ned Batchelder
2f1936ce73 Replace context processor with new help-tokens app 
This makes it possible to refer to multiple book from a single app.

This also means that Open edX branches will be able to pass bok-choy
tests (at least if the books have already been built.)
 2017-04-27 10:34:09 -04:00
Calen Pennington
33fee20c3a Reapply "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 65f13ddec4.
 2017-04-27 09:25:02 -04:00
Ned Batchelder
44dd7be5b6 Update translations (autogenerated message) 2017-04-27 12:16:29 +00:00
edx-pipeline-bot
38c0fbd638 Merge pull request #14975 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-26 15:29:32 -04:00
Calen Pennington
65f13ddec4 Revert "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 88dd85caec, reversing
changes made to bf8aef33fc.
 2017-04-26 11:29:56 -04:00
Albert (AJ) St. Aubin
0df079a9c6 Merge pull request #13026 from OmarIthawi/edraak/goup-config-rtl 
Major RTL refactor for the group configuration in Studio
 2017-04-26 09:19:31 -04:00
Calen Pennington
f8b050a5d8 Put LANGUAGE_COOKIE into settings 2017-04-24 13:03:17 -04:00
Omar Al-Ithawi
94efb3792f Major RTL refactor for the group configuration in Studio 2017-04-22 11:53:39 +03:00
Asad Iqbal
7493c11ec2 Merge pull request #14890 from edx/asadiqbal08/ENT-188 
ENT-188 Enterprise Learner support requests from LMS to Zendesk queue
 2017-04-21 17:22:42 +05:00
asadiqbal
8cea65b2d7 ENT-188 2017-04-21 16:30:23 +05:00
Muhammad Ammar
c3d0a50d42 Merge pull request #14514 from edx/ammar/tnl-6513-frontend-hls-support 
HLS playback support in video player
 2017-04-21 12:38:11 +05:00
Clinton Blackburn
163c71e8c4 Updated CREDENTIALS_SERVICE_USERNAME setting for Docker-based devstack 2017-04-20 14:57:22 -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
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
Qubad786
b2cfad1650 Add Configuration Models for HLS Playback Feature. 2017-04-20 16:35:46 +05:00
Eric Fischer
7e368e10f7 Merge pull request #14913 from edx/efischer/rekill 
Re-kill ICRV block
 2017-04-19 16:48:33 -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
cahrens
5e14a35607 Change "Choose one" to "Select a group type". 2017-04-19 14:32:44 -04:00