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

46917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
attiyaishaque
6ada0ca76d Fix forums threads load issue in the user view. 2018-07-30 14:42:24 +05:00
Ayub
a54066e9e6 Merge pull request #18669 from edx/i18n-fix 
i18n-fix
 2018-07-30 14:33:22 +05:00
Saleem Latif
65454c8133 Merge pull request #18415 from edx/saleem-latif/ENT-1018 
ENT-876: Added XAPI to installed apps
 2018-07-30 13:55:38 +05:00
Saleem Latif
3f5c5c0460 Added XAPI to installed apps 2018-07-30 12:49:52 +05:00
muhammad-ammar
c360b4effb fix poster display issue with hls 
EDUCATOR-2606

another approach
 2018-07-30 12:11:00 +05:00
Ayub
be29d73cd5 Merge pull request #18668 from edx/revert-18667-transifex-bot-update-translations2018-07-29 
Revert "Update translations"
 2018-07-30 10:38:56 +05:00
ayub-khan
264304e45d src ignore sub directries with same name 2018-07-30 09:50:52 +05:00
Ayub
19a22234da Revert "Update translations" 
This reverts commit 5f2be814aa.
 2018-07-30 09:34:06 +05:00
edX Transifex Bot
5f2be814aa Update translations 2018-07-29 17:23:04 -04:00
Brittney Exline
ada4d4bf33 Merge pull request #18663 from edx/bexline/enterprise_version_bump 
ENT-1125 Upgrade edx-enterprise to 0.71.2
 2018-07-27 14:35:57 -06:00
Brittney Exline
dee145b0d5 ENT-1125 Upgrade edx-enterprise to 0.71.2 2018-07-27 15:28:52 -04:00
Christopher Lee
06417b81bb Merge pull request #18655 from edx/clee/add-details-in-log 
Added more details to logs in a program certificate exception
 2018-07-27 14:10:39 -04:00
sanfordstudent
302d82710f Merge pull request #18611 from edx/sstudent/ora_date_validation 
add validation of ORAs
 2018-07-27 13:28:46 -04:00
Agha Awais
a4547183da Merge pull request #18497 from edx/awais/lett_2_bc_course_create 
TE-2622: Course Create bokchoy tests
 2018-07-27 14:56:55 +05:00
Christopher Lee
3c6a62edd0 Added more details to logs in a program certificate exception 
LEARNER-5332
 2018-07-26 16:18:48 -04:00
Sanford Student
5f96420dd3 add validation of ORAs 2018-07-26 15:24:23 -04:00
Brandon Baker
f279e56b75 Merge pull request #18645 from edx/bbaker/LEARNER-5923 
Add program record section to program detail sidebar
 2018-07-26 14:04:11 -04:00
Brandon Baker
7a3a228c69 Add program record section to program detail sidebar 
LEARNER-5923
 2018-07-26 12:51:08 -04:00
Jeremy Bowman
1beb1c95fa Merge pull request #18430 from openfun/allow-using-development-settings-other-than-devstack 
Allow using dev settings other than DEVSTACK
 2018-07-26 11:08:08 -04:00
Waheed Ahmed
35c5ad91d1 Merge pull request #18653 from edx/revert-18285-waheed/LEARNER-4520-fix-pdf-certificates 
Revert "Fix PDF cert gereration/regeneration and URLs."
 2018-07-26 19:24:27 +05:00
Simon Chen
8f52509bbd Merge pull request #18640 from edx/private_to_public_09dcd04 
Mergeback PR from private to public.
 2018-07-26 09:55:13 -04:00
Waheed Ahmed
c2ad6f4002 Revert "Fix PDF cert gereration/regeneration and URLs." 2018-07-26 18:20:27 +05:00
maiazadhun1
7faf59ff7a course create bokchoy tests 2018-07-26 11:45:06 +00:00
Agha Awais
8b9048bf8c Merge pull request #18498 from edx/awais/lett_2_bc_grading 
TE-2624: Grading bokchoy tests
 2018-07-26 12:50:39 +05:00
Agha Awais
442a0f510a Merge pull request #18515 from edx/awais/lett_2_bc_advanced_settings_II 
TE-2621: Advanced settings bokchoy tests 2
 2018-07-26 11:34:22 +05:00
Michael Roytman
41848b8ff3 Merge pull request #18626 from edx/mroytman/course-outline-status-alignment 
mroytman/course outline status alignment
 2018-07-25 17:22:30 -04:00
Simon Chen
a5054cff0e Upgrade recommender xblock to patch the xss risk 2018-07-25 17:04:31 -04:00
Michael Roytman
d502a75efb improve alignment between studio-frontend outlines status blocks and course highlights block and bump studio-frontend version to 1.16.0 2018-07-25 16:27:04 -04:00
Troy Sankey
ed0b130046 Merge pull request #18637 from edx/pwnage101/add-mgmt-command-to-rehash-emails 
Add one-off management command to rehash retired emails
 2018-07-25 15:48:03 -04:00
David Ormsbee
f275ae609d Merge pull request #18646 from edx/ormsbee/remove_unused_config_settings 
Remove ENABLE_MANUAL_GIT_RELOAD, DEBUG_LEVEL, USE_YOUTUBE_OBJECT_API
 2018-07-25 15:36:02 -04:00
Troy Sankey
71597e790a Add one-off management command to rehash retired emails 
PLAT-2254
 2018-07-25 14:49:42 -04:00
David Ormsbee
698f2b17b9 Remove ENABLE_MANUAL_GIT_RELOAD, DEBUG_LEVEL, USE_YOUTUBE_OBJECT_API 
These are old feature flags that are no longer used:

ENABLE_MANUAL_GIT_RELOAD was to allow instructors to reload an XML
Modulestore course directly from a git checkout. That Modulestore
backend hasn't existed for a while.

DEBUG_LEVEL was an early flag for how debug log verbosity.

USE_YOUTUBE_OBJECT_API was created in reaction to YouTube breaking
their iframe API. They have long since addressed those issues.
 2018-07-25 14:40:34 -04:00
Feanil Patel
d29ffce4df Merge pull request #18639 from edx/private_to_public_02d5477 
Mergeback PR from private to public.
 2018-07-25 14:37:57 -04:00
Robert Raposa
edf1c8922e Fix quality errors. 2018-07-25 11:34:10 -04:00
Robert Raposa
02d5477aaa Merge pull request #138 from edx/robrap/EDUCATOR-3206 
EDUCATOR-3206: Fix chemical equations.
 2018-07-25 10:22:50 -04:00
Jeremy Bowman
c158a31b44 Merge pull request #18636 from edx/jmbowman/TE-2659 
TE-2659 Fix coverage with remote xdist workers
 2018-07-24 18:04:42 -04:00
Feanil Patel
18edbf605f Merge pull request #18616 from saharm1/fix-activation-link 
Add port to activation link to keep it from failing on devstack.
 2018-07-24 16:51:04 -04:00
Jeremy Bowman
2580e08b8c TE-2659 Fix coverage with remote xdist workers 2018-07-24 16:37:34 -04:00
Michael Roytman
bdabe18159 Merge pull request #18635 from edx/mroytman/bump-studio-frontend-to-1.15.0 
bump studio-frontend version to 1.15.0
 2018-07-24 14:32:21 -04:00
Michael Roytman
62980b3e5f bump studio-frontend version to 1.15.0 2018-07-24 14:06:15 -04:00
J Eskew
8fa28b2f0d Merge pull request #18630 from edx/jeskew/fix_retirement_report_cleanup 
Change DELETE to POST to deal with slumber limitations.
 2018-07-24 13:34:00 -04:00
Troy Sankey
64cda2769d Merge pull request #18631 from edx/pwnage101/bump-user-util 
bump user-util to 0.1.4
 2018-07-24 13:27:59 -04:00
Troy Sankey
09f4cd89a2 bump user-util to 0.1.4 
PLAT-2254
 2018-07-24 12:16:06 -04:00
John Eskew
8daf7e7812 Change DELETE to POST to deal with slumber limitations. 2018-07-24 10:00:48 -04:00
Michael Roytman
d6517c1e35 Merge pull request #18628 from edx/mroytman/bump-studio-frontend-to.1.14.1 
bump studio-frontend package to 1.14.1
 2018-07-23 17:28:27 -04:00
Jeremy Bowman
84dc5c6c2a Merge pull request #18617 from edx/jmbowman/TE-2635 
TE-2635 Upgrade bok-choy
 2018-07-23 16:13:11 -04:00
Michael Roytman
3eb95b0754 bump studio-frontend package to 1.14.1 2018-07-23 16:01:12 -04:00
Stu Young
bace18baa7 Merge pull request #18627 from edx/testeng/bokchoy_auto_cache_update_b28d5405ce2ffb838559cd5e0664bb9e742ad03d 
Bokchoy db cache update
 2018-07-23 15:52:42 -04:00
Jeremy Bowman
41a49f5f07 TE-2635 Upgrade bok-choy 2018-07-23 15:25:01 -04:00
edx-cache-uploader-bot
80d9bec5a4 Updating migrations 2018-07-23 15:12:10 -04:00