Commit Graph

45731 Commits

Author SHA1 Message Date
Diana Huang
eab84c9a0f Use the same ordering for LA dashboard as progress page. 2018-02-12 10:18:07 -05:00
Farhanah Sheets
e73b95f1c8 Update lti iframe in platform & xblock github version 2018-02-12 09:36:06 -05:00
Jeremy Bowman
a600ef4c25 Merge pull request #17444 from edx/jmbowman/PLAT-1948
PLAT-1948 Update the cached lettuce test databases
2018-02-12 08:25:37 -05:00
adeel khan
a8202c75be Merge pull request #17452 from edx/adeel/fix_xss_failing_test
Fix xss-linter.py failing test.
2018-02-12 14:05:25 +01:00
Adeel Khan
961bdce5fa Fix xss-linter.py failing test. 2018-02-12 17:05:02 +05:00
Tasawer Nawaz
ee2c983bf5 Merge pull request #17439 from edx/tasawer/learner-3342/fix-for-if-goal-key-is-none
update CourseGoalViewSet to return status=400 if no goal key is provided
2018-02-12 16:31:56 +05:00
Tasawer Nawaz
898db2e376 update CourseGoalViewSet to return status=400 if no goal key is provided LEARNER-3342 2018-02-12 15:07:32 +05:00
Ibrahim Ahmed
9bbeabaddb Merge pull request #17440 from edx/ibrahimahmed443/WL-1438-programs-page-typo
fix typo in program marketing page
2018-02-12 14:48:25 +05:00
Ibrahim
046871e072 fix typo in program marketing page 2018-02-12 12:39:09 +05:00
John Eskew
fb5ca89f4b Merge pull request #17445 from edx/jeskew/bump_edx_proctoring_version
Move to PyPI install of edx-proctoring.
2018-02-09 19:07:24 -05:00
Tyler Hallada
f99fb4f506 Merge pull request #17443 from edx/thallada/comment-bad-index
Temporarily comment bad index in ensure_indexes
2018-02-09 18:01:33 -05:00
Jeremy Bowman
b15882e277 PLAT-1948 Update the cached lettuce test databases 2018-02-09 16:07:35 -05:00
John Eskew
4e3e62b6d9 Move to PyPI install of edx-proctoring. 2018-02-09 15:59:55 -05:00
Tyler Hallada
523d479ce0 Temporarily comment bad index in ensure_indexes 2018-02-09 15:44:28 -05:00
Stu Young
350111b329 Merge pull request #17441 from edx/testeng/bokchoy_auto_cache_update_42faf22499804dcf29fc66e7c75fb7226d3ccf45
Bokchoy db cache update
2018-02-09 15:41:55 -05:00
Michael Youngstrom
6d67e83641 Merge pull request #17252 from edx/zoldak/TE-2396
Shard the quality tasks on jenkins TE-2396
2018-02-09 15:41:44 -05:00
Ned Batchelder
2be70b5d57 Merge pull request #17366 from mitodl/pdpinch/complex-calc
Update functions in calc.py to work in complex plane
2018-02-09 15:17:12 -05:00
Jesse Zoldak
31eeb16081 Shard the quality tasks on jenkins 2018-02-09 14:58:52 -05:00
edx-cache-uploader-bot
691e35f673 Updating migrations 2018-02-09 12:26:21 -05:00
Matthew Piatetsky
bb8f9ae915 Merge pull request #17431 from edx/bundling_test_handle_exceptions
handle exceptions and create the necessary html in optimizely
2018-02-09 08:59:40 -05:00
Muhammad Ammar
3fd91f3592 Merge pull request #17430 from edx/ammar/update-edxval
update edxval to 0.1.10
2018-02-09 18:27:58 +05:00
Ahsan Ul Haq
a42c1f6904 Merge pull request #17428 from edx/ahsan/LEARNER-4117-update-eligible-for-cert
Making honor code not eligible for Certificate
2018-02-09 15:13:05 +05:00
Ahsan Ulhaq
25130ae3c8 Making honor code not eligible for Certificate
LEARNER-4117
2018-02-09 13:53:50 +05:00
Brian Mesick
b005276f68 Merge pull request #17435 from edx/bmedx/bump_chem_version
Update chem version to force new nltk requirement to be picked up
2018-02-08 17:08:22 -05:00
bmedx
c8aca84619 Update chem version to force new nltk requirement to be picked up 2018-02-08 17:02:31 -05:00
Ned Batchelder
60a4e6d864 Merge pull request #17339 from caesar2164/make-studio-sock-links-themable
Define Studio sock links in separate themable file
2018-02-08 15:20:22 -05:00
Feanil Patel
200dd4d86c Merge pull request #17432 from edx/feanil/update_paver
Stop using our fork of paver and use PyPI
2018-02-08 13:00:07 -05:00
Matthew Piatetsky
618146e415 addressing comments 2018-02-08 11:29:56 -05:00
Feanil Patel
1248d7b058 Stop using our fork of paver and use PyPI
The problem we were having with paver 1.2.4 has been fixed and so we can go back to using the mainline paver now.
2018-02-08 10:47:11 -05:00
Matthew Piatetsky
826ef28b4d handle exceptions and create the necessary html in optimizely 2018-02-08 10:25:52 -05:00
muhammad-ammar
13f85b9e7c update edxval to 0.1.10 2018-02-08 18:51:17 +05:00
Attiya Ishaque
3ee811d6e1 Merge pull request #17382 from edx/ai/EDUCATOR-2224-discussion-post
EDUCATOR-2224 Discussion Topic with no posts have message.
2018-02-08 15:56:57 +05:00
attiyaishaque
9704146e40 EDUCATOR-2224 Discussion Topic with no posts have message. 2018-02-08 14:47:04 +05:00
Jeremy Bowman
4cdff4518f Merge pull request #17425 from edx/jmbowman/PLAT-1949
PLAT-1949 Less cluttered management command output
2018-02-07 16:26:39 -05:00
Brian Mesick
86d077ac3d Merge pull request #17413 from edx/bmedx/upgrade_nltk
Upgrade NLTK to 3.2.5, fixup usage and tests
2018-02-07 15:39:22 -05:00
Gregory Martin
4e7a602e67 Merge pull request #17406 from edx/yro/EDUCATOR-2230_code
Swap out exception class
2018-02-07 15:14:35 -05:00
Jae Bradley
a19bc8c30d Merge pull request #17408 from edx/LEARNER-3926-portfolio-project-test-upsell
LEARNER-3926 Portfolio Project Test Upsell Modal
2018-02-07 14:57:08 -05:00
Jeremy Bowman
26cdc5a424 Merge pull request #17421 from edx/jmbowman/PLAT-1945
PLAT-1945 Better management command ergonomics
2018-02-07 14:36:05 -05:00
Jeremy Bowman
88cb9f8c77 PLAT-1949 Less cluttered management command output 2018-02-07 13:44:08 -05:00
Jeremy Bowman
1a67819ce4 PLAT-1945 Better management command ergonomics 2018-02-07 13:24:04 -05:00
Jae Bradley
ccef8f371a Merge pull request #17422 from edx/LEARNER-3515-portfolio-project-readme
Portfolio Project README
2018-02-07 11:23:27 -05:00
Jeremy Bowman
1aaeb309a2 Merge pull request #17424 from edx/jmbowman/PLAT-1947
PLAT-1947 Fix bok-choy test that failed under Django 1.11
2018-02-07 11:20:56 -05:00
bmedx
6a22de454f Upgrade NLTK to 3.2.5, fixup usage and tests 2018-02-07 10:42:23 -05:00
Jeremy Bowman
4c40f106e8 PLAT-1947 Fix bok-choy test that failed under Django 1.11 2018-02-07 09:57:10 -05:00
jaebradley
345302c7dc portfolio project readme 2018-02-07 08:45:41 -05:00
Matt Drayer
6c7521867b Merge pull request #17416 from edx/mattdrayer/edx-enterprise-0.65.3
Version bump edx-enterprise to 0.65.3
2018-02-07 08:21:02 -05:00
Hasnain Naveed
93ed28b6fa Merge pull request #17411 from edx/hasnain-naveed/management_command_changes
Changing the service users for default clients.
2018-02-07 18:11:39 +05:00
Hasnain Naveed
51b3949d79 Merge pull request #17394 from edx/hasnain-naveed/create_course_change
Adding the new argument "name" (course_display_name) in create_course…
2018-02-07 18:10:01 +05:00
jaebradley
47b36c6acd implement portfolio project test upsell modal
update styles

html updates

add waffle flags

fix waffle flags
2018-02-07 07:41:33 -05:00
Muhammad Ammar
f9b3c8430d Merge pull request #17378 from edx/ammar/add-video-pipeline-integration-management-command
add video pipeline integration management command
2018-02-07 17:25:04 +05:00