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

46882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bill Filler
df52ff0038 Merge pull request #18395 from edx/whitelabel/journal 
Add journals support in LMS
 2018-07-23 15:10:38 -04:00
Kevin Falcone
0516650591 Merge pull request #18625 from edx/jibsheet/bump-edx-django-oauth2-provider 
Come up to 1.3.4 - management command deletion tweaks
 2018-07-23 14:58:53 -04:00
Bill Filler
c746a4e630 Add Journals support 
Enable the journal app in LMS. Add support to display Journals on index
and courseware pages and dashboard.
 2018-07-23 13:11:26 -04:00
Kevin Falcone
7460affa2c Come up to 1.3.4 - management command deletion tweaks 2018-07-23 12:12:56 -04:00
Gregory Martin
df23616046 Merge pull request #18613 from edx/yro/LEARNER-5556 
Update entitlement ordering in dash
 2018-07-23 10:40:50 -04:00
irfanuddinahmad
d2c142cc87 Merge pull request #18621 from edx/iahmad/bump-enterprise-version 
Version bump for edx-enterprise to 0.71.1
 2018-07-23 18:50:29 +05:00
Waheed Ahmed
4f3d9e7a0c Merge pull request #18600 from edx/waheed/LEARNER-5620-fix-entitlement-unenroll 
Fix unenroll entitlement from instructor dashboard.
 2018-07-23 18:23:10 +05:00
irfanuddinahmad
1972aa44ae Version bump 2018-07-23 16:58:49 +05:00
Ayub-khan
cbd4aad6a1 Merge pull request #18619 from edx/git-clean-before-extracting-new-translations 
LEARNER-5473
 2018-07-23 15:29:01 +05:00
ayub-khan
3509d08706 - Ignored 3rd party libraries code from translations 
which is not present is repo. But is created when we directly
install requirements from git.
- Included git clean in i18n-roobot-push
To clean artifacts before extracting new translations.
 2018-07-23 12:42:11 +05:00
edX Transifex Bot
fd6ee1bc22 Update translations 2018-07-22 17:18:01 -04:00
Sahar Markovich
aa0e1c3786 Update AUTHORS 2018-07-20 15:09:02 -07:00
Sahar Markovich
9bfeebe01c Add port to activation link to keep it from failing on devstack. 
This value was defined in lms but not in cms. I discovered this when testing the user account activation link and finding it unable to activate my account on devstack. This change adds the port which fixes the user account activation link in Studio.
 2018-07-20 14:56:31 -07:00
Michael Youngstrom
404a11d8ed Merge pull request #18615 from edx/youngstrom/handle-multi-containers 
Xdist: Handle multiple containers per task definition
 2018-07-20 16:38:52 -04:00
Gregory Martin
0b7dbeb520 Update entitlement ordering in dash 2018-07-20 16:38:43 -04:00
Michael Youngstrom
ce2ad15c71 Handle multiple containers per task definition 2018-07-20 16:02:14 -04:00
Michael Roytman
b364cc56b1 Merge pull request #18614 from edx/mroytman/bump-studiofrontend-to-1.14.0 
bump studio-frontend to 1.14.0
 2018-07-20 15:31:55 -04:00
Michael Roytman
76931ebc85 bump studio-frontend to 1.14.0 2018-07-20 14:56:51 -04:00
Brian Mesick
04b2a2dfa6 Merge pull request #18591 from edx/bmedx/force_status_update 
PLAT-2186 - allow retirement states to be forced by driver script
 2018-07-20 14:40:22 -04:00
Christopher Lee
0b5ab880d5 Merge pull request #18612 from edx/clee/bump-versions 
Bump edx-ace version
 2018-07-20 13:44:47 -04:00
Rabia Iftikhar
9a70179a58 Merge pull request #18606 from edx/ri/EDUCATOR-3030-add-temperory-logs 
EDUCATOR-3030 add temporary logs
 2018-07-20 22:26:57 +05:00
rabiaiftikhar
0438c1b535 EDUCATOR-3030 add temperory logs 2018-07-20 21:51:05 +05:00
Christopher Lee
0616f93b86 Bump edx-ace version 2018-07-20 10:52:55 -04:00
Qubad786
2d24482cbf Add batching support 2018-07-20 17:31:47 +05:00
edX Transifex Bot
80e650d971 Update translations 2018-07-20 07:52:59 -04:00
bmedx
04fe4af9c0 Adding user_api call to get retirements by date range and current state 
- Also supports PLAT-2186
 2018-07-19 17:12:33 -04:00
Attiya Ishaque
7593863984 Merge pull request #18603 from edx/ai/fix-accessibility-issues 
Fix screen reader issue on profile page.
 2018-07-19 20:16:41 +05:00
Waheed Ahmed
2849d8f572 Fix unenroll entitlement from instructor dashboard. 
LEARNER-5620
 2018-07-19 14:52:23 +05:00
attiyaishaque
e0472a7a15 Fix screen reader issue on profile page. 2018-07-19 12:49:48 +05:00
Noraiz Anwar
2f12e0b4c4 Merge pull request #18581 from edx/noraiz/EDUCATOR-3016-fix 
add python getter in capa system
 2018-07-19 11:53:18 +05:00
Stu Young
99ceba9cae Merge pull request #18604 from edx/testeng/bokchoy_auto_cache_update_dac97b5a11b3446dab6cfcd6504059915d93e709 
Bokchoy db cache update
 2018-07-18 18:41:19 -04:00
edx-cache-uploader-bot
b890399257 Updating migrations 2018-07-18 17:03:03 -04:00