Commit Graph

46855 Commits

Author SHA1 Message Date
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
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
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
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
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
Uzair Rasheed
4b4a8632bb Merge pull request #18598 from edx/refactor-code-of-LEARNER-5257
Refactor Code for LEARNER-5257
2018-07-17 20:24:27 +05:00
Fred Smith
f89da03922 Merge branch 'private_to_public_04030f5' 2018-07-17 10:26:09 -04:00
Feanil Patel
7eede09267 Merge pull request #18560 from edx/lduarte1991-annotations_deprecation
Lduarte1991 annotations deprecation
2018-07-17 10:20:49 -04:00
Uzair Rasheed
0c610749c9 Refactor Code for LEARNER-5257
Course key object was not serializable before sending to celery
task.
2018-07-17 18:20:39 +05:00
Tasawer Nawaz
9d29f07d2d Merge pull request #18594 from edx/tasawer/learner-4467/fix-exception-handling-in-award-program-certificate-task
Fix exception handling in award program certificate task
2018-07-17 10:38:27 +05:00
lduarte1991
a9b61c06d3 Remove the annotations feature introduced by Harvard.
There are other annotations features still in the platform but this one
is the one that works with an annotations server that was specialized
and not generally used by most instances of the platform.

The initial PR to remove this was made by 'lduarte1991' and can be found
here: https://github.com/edx/edx-platform/pull/17299

The work done based on the squashed commits:
removed advanced modules config for annotations
remove module files and config for annotations
remove js and css files related to annotations, under ova folders
removed js and css annotator file configs for cms and lms
remove template html files for annotations
removed annotations options from static html book
Added back some files that were originally marked "for OVA" but others used as per acceptance tests
Added back css file configs incorrectly marked as ova
Remove annotation related advanced settings from test.
Correct hls require.js pathing.
2018-07-16 16:55:08 -04:00
bmedx
74b07c3ff8 PLAT-2186 - allow retirement states to be forced by driver script
When the optional "force" param is sent in this skips the checks for moving from dead end state and moving to earlier state, allowing us to bulk reset errored users or run users through new states.
2018-07-16 13:59:22 -04:00
Jeremy Bowman
507d5e38de Merge pull request #18592 from edx/jmbowman/INCR-18
INCR-18 Upgrade django-config-models for Python 3 support
2018-07-16 12:55:45 -04:00
adeel khan
7b8567bef8 Merge pull request #18567 from edx/adeel/learner_5566_course_list_view_slow_transaction
Improve CourseListView end point latency by removing CourseWaffleFlag.
2018-07-16 21:37:46 +05:00
Robert Raposa
c1b921d700 Merge pull request #18589 from edx/robrap/ARCH-164-add-oauth-dispatch-metrics
ARCH-164: Add oauth_dispatch metrics.
2018-07-16 12:07:05 -04:00
Tasawer Nawaz
87ddb56bbb fix exception handling in award program certificate task
LEARNER-4467
2018-07-16 18:31:55 +05:00
edX Transifex Bot
46e40ac6f5 Update translations 2018-07-16 04:58:23 -04:00
Jeremy Bowman
9bd5f0f3e3 INCR-18 Upgrade django-config-models for Python 3 support 2018-07-13 17:19:17 -04:00