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

53520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
maiazadhun1
c7c38863dc Grading bokchoy tests 2018-07-23 12:12:33 +00:00
irfanuddinahmad
1972aa44ae Version bump 2018-07-23 16:58:49 +05:00
Agha Awais
51a2679333 Advanced settings bokchoy tests II 2018-07-23 10:45:08 +00: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
Usman Khalid
36b3316ebc Fixes to sequence module for anonymous courseware access. 2018-07-20 14:26:22 +05: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
Amir Qayyum Khan
5ae5a531f4 Fixed override due date by limiting scope to selected users 
Added selected user tests

updated my email
 2018-07-19 14:25:34 +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
Robert Raposa
d4b5fe136b Merge pull request #18595 from edx/robrap/ARCH-164-enhance-metrics 
ARCH-164: Allow metrics for failed responses.
 2018-07-18 16:06:30 -04:00
Robert Raposa
86ce4e2b3a Allow metrics for failed responses. 
- Move metrics out from 200 status check.
- Add value for token type not supplied.
- Add tests.

ARCH-164
 2018-07-18 15:21:09 -04:00
Michael Youngstrom
9337963c59 Merge pull request #18562 from edx/youngstrom/xdist-container-setup 
Add prepare_xdist_nodes script and git ignore xdist txt files
 2018-07-18 12:17:06 -04:00
Michael Roytman
78fb0c1306 Merge pull request #18601 from edx/mroytman/enabled-launch-checklist-for-all 
enable course launch checklist for all staff
 2018-07-18 11:54:26 -04:00
Michael Youngstrom
28d0c4cb18 Add prepare_xdist_nodes script and git ignore xdist txt files 2018-07-18 11:40:42 -04:00
Michael Roytman
648d5cda3b enable course launch checklist for all staff 2018-07-18 10:00:00 -04:00
noraiz-anwar
593c2d1ae8 add python getter in capa system 2018-07-18 18:44:56 +05:00
Ayub-khan
7f1f3b0dad Merge pull request #18602 from edx/update-translations-18-july 
Updated Translations
 2018-07-18 15:51:45 +05:00
ayub-khan
3e47ade19e Updated Translations 2018-07-18 14:38:00 +05:00
Braden MacDonald
79af9c175f Merge PR #17824: UI to select a problem location for use in data download 2018-07-17 16:44:37 -04:00
Robert Raposa
0840fe8e5c Escape chemical equation in advanced problems. 
EDUCATOR-3206
 2018-07-17 16:01:41 -04:00
Kshitij Sobti
fcff921fdb Linting fixes to improve quality report 2018-07-18 00:37:31 +05:30
Kshitij Sobti
bf6af13ed1 Add UI to browse and browse course structure and select the course/chapter/section... to generate a report of 2018-07-18 00:37:29 +05:30
Eric Fischer
b7d16b90f8 Add jest snapshot testing 2018-07-18 00:37:25 +05:30