Commit Graph

  • 60a4e6d864 Merge pull request #17339 from caesar2164/make-studio-sock-links-themable Ned Batchelder 2018-02-08 15:20:22 -05:00
  • 200dd4d86c Merge pull request #17432 from edx/feanil/update_paver Feanil Patel 2018-02-08 13:00:07 -05:00
  • 618146e415 addressing comments Matthew Piatetsky 2018-02-08 11:24:26 -05:00
  • 1248d7b058 Stop using our fork of paver and use PyPI Feanil Patel 2018-02-08 10:47:11 -05:00
  • 826ef28b4d handle exceptions and create the necessary html in optimizely Matthew Piatetsky 2018-02-08 10:25:52 -05:00
  • 13f85b9e7c update edxval to 0.1.10 muhammad-ammar 2018-02-08 18:51:17 +05:00
  • 3ee811d6e1 Merge pull request #17382 from edx/ai/EDUCATOR-2224-discussion-post Attiya Ishaque 2018-02-08 15:56:57 +05:00
  • 9704146e40 EDUCATOR-2224 Discussion Topic with no posts have message. attiyaishaque 2018-02-01 17:42:57 +05:00
  • 4cdff4518f Merge pull request #17425 from edx/jmbowman/PLAT-1949 Jeremy Bowman 2018-02-07 16:26:39 -05:00
  • 86d077ac3d Merge pull request #17413 from edx/bmedx/upgrade_nltk Brian Mesick 2018-02-07 15:39:22 -05:00
  • 4e7a602e67 Merge pull request #17406 from edx/yro/EDUCATOR-2230_code Gregory Martin 2018-02-07 15:14:35 -05:00
  • a19bc8c30d Merge pull request #17408 from edx/LEARNER-3926-portfolio-project-test-upsell Jae Bradley 2018-02-07 14:57:08 -05:00
  • 26cdc5a424 Merge pull request #17421 from edx/jmbowman/PLAT-1945 Jeremy Bowman 2018-02-07 14:36:05 -05:00
  • 88cb9f8c77 PLAT-1949 Less cluttered management command output Jeremy Bowman 2018-02-07 13:44:08 -05:00
  • 1a67819ce4 PLAT-1945 Better management command ergonomics Jeremy Bowman 2018-02-06 17:01:39 -05:00
  • ccef8f371a Merge pull request #17422 from edx/LEARNER-3515-portfolio-project-readme Jae Bradley 2018-02-07 11:23:27 -05:00
  • 1aaeb309a2 Merge pull request #17424 from edx/jmbowman/PLAT-1947 Jeremy Bowman 2018-02-07 11:20:56 -05:00
  • 6a22de454f Upgrade NLTK to 3.2.5, fixup usage and tests bmedx 2018-02-06 09:49:06 -05:00
  • 4c40f106e8 PLAT-1947 Fix bok-choy test that failed under Django 1.11 Jeremy Bowman 2018-02-07 09:57:10 -05:00
  • 345302c7dc portfolio project readme jaebradley 2018-02-07 08:45:41 -05:00
  • 6c7521867b Merge pull request #17416 from edx/mattdrayer/edx-enterprise-0.65.3 Matt Drayer 2018-02-07 08:21:02 -05:00
  • 93ed28b6fa Merge pull request #17411 from edx/hasnain-naveed/management_command_changes Hasnain Naveed 2018-02-07 18:11:39 +05:00
  • 51b3949d79 Merge pull request #17394 from edx/hasnain-naveed/create_course_change Hasnain Naveed 2018-02-07 18:10:01 +05:00
  • 47b36c6acd implement portfolio project test upsell modal jaebradley 2018-02-05 17:21:21 -05:00
  • f9b3c8430d Merge pull request #17378 from edx/ammar/add-video-pipeline-integration-management-command Muhammad Ammar 2018-02-07 17:25:04 +05:00
  • 4d7c9113a1 Merge pull request #17412 from edx/ammar/edxval-release Muhammad Ammar 2018-02-07 17:18:19 +05:00
  • 27f023f34a add video pipeline integration management command muhammad-ammar 2018-01-31 18:34:35 +05:00
  • ea2a9330c8 Merge pull request #17061 from edx/ormsbee/pipeline_plans_doc David Ormsbee 2018-02-06 22:16:15 -05:00
  • 231becdc2f Merge pull request #17420 from edx/youngstrom/timing_logs Michael Youngstrom 2018-02-06 21:58:51 -05:00
  • b7f2ddf620 WIP stab at the plan for static assets in edx-platform David Ormsbee 2017-12-29 12:00:47 -05:00
  • 363249908a Merge pull request #17419 from edx/diana/new-portfolio-page Diana Huang 2018-02-06 16:43:05 -05:00
  • e2d8e751a0 Force bootstrap on for this page. Diana Huang 2018-02-06 12:36:12 -05:00
  • 51dcb5a536 Merge pull request #17392 from mitodl/hack18_bookmarks_django_plugin Nimisha Asthagiri 2018-02-06 14:21:38 -05:00
  • 378287fbc0 Merge pull request #17404 from edx/jmbowman/PLAT-1942 Jeremy Bowman 2018-02-06 13:23:04 -05:00
  • 7fdee1fae9 Give paver timing logs a unique name always Michael Youngstrom 2018-02-06 13:06:22 -05:00
  • 8a57cbf4bb Merge pull request #17409 from edx/jmbowman/PLAT-1943 Jeremy Bowman 2018-02-06 11:18:52 -05:00
  • 1498a28d51 Version bump edx-enterprise to 0.65.3 Matt Drayer 2018-02-06 10:21:15 -05:00
  • ad7005792b Merge pull request #17402 from edx/astankiewicz/enterprise-version-bump Adam Stankiewicz 2018-02-06 09:40:31 -05:00
  • 507bacd8d8 update edxval to 0.1.9 muhammad-ammar 2018-02-06 18:59:39 +05:00
  • 3d82980767 Merge pull request #17410 from edx/update-translations-6-fed Ayub khan 2018-02-06 17:34:50 +05:00
  • 62969bc317 Adding the new argument "name" (course_display_name) in create_course management command. Hasnain 2018-02-02 17:41:47 +05:00
  • 943ac4096b Changing the service users for default clients. Hasnain 2018-02-06 16:37:40 +05:00
  • 36a6240472 translations-6-feb ayub-khan 2018-02-06 14:13:05 +05:00
  • 9682e00f4c PLAT-1943 Fix more naive datetime warnings Jeremy Bowman 2018-02-05 17:58:35 -05:00
  • c1a4184acd Swap out exception class Gregory Martin 2018-02-05 16:45:17 -05:00
  • 710287412d Merge pull request #17401 from edx/yro/EDUCATOR-2088_clean Gregory Martin 2018-02-05 15:49:16 -05:00
  • bf86b3da98 PLAT-1942 Handle xmodule_django field deprecations Jeremy Bowman 2018-02-05 15:05:54 -05:00
  • 9247979226 Version bump for edx-enterprise Adam Stankiewicz 2018-02-05 14:43:02 -05:00
  • ae56b5a9c9 Update query for flag. Gregory Martin 2018-02-05 11:22:34 -05:00
  • ffbb0c16ef Merge pull request #17322 from edx/thallada/assets-case-insensitive-sort Tyler Hallada 2018-02-05 14:05:32 -05:00
  • be474b5d61 Merge pull request #17117 from edx/thallada/contentstore-index-displayname-fix Tyler Hallada 2018-02-05 14:03:54 -05:00
  • a8f9a5f350 Merge pull request #17398 from edx/diana/new-portfolio-page Diana Huang 2018-02-05 13:06:22 -05:00
  • caf47be13f Merge pull request #17399 from edx/jmbowman/PLAT-1917 Jeremy Bowman 2018-02-05 12:53:52 -05:00
  • 124e4c2ca1 Create new djangoapp and a new blank tab view. Diana Huang 2018-01-31 10:01:19 -05:00
  • c959ebce01 Add Jira ticket number to TODO comment Tyler Hallada 2018-02-05 11:27:10 -05:00
  • 45f9b88298 Fix modulestore mongo tests Tyler Hallada 2018-01-29 13:24:05 -05:00
  • df5671927f Handle no assets results case properly Tyler Hallada 2018-01-26 15:49:50 -05:00
  • 1710021c0d Don't sort when sort is None Tyler Hallada 2018-01-26 14:57:26 -05:00
  • b55aeb4798 Use Mongo aggregate hack to sort case-insensitive Tyler Hallada 2018-01-26 11:48:57 -05:00
  • 32e5679d7f Also fix displayname typo in ensure_index comment Tyler Hallada 2018-01-05 16:59:18 -05:00
  • fbb65c22c8 Fix typos in contentstore's mongo index keys Tyler Hallada 2018-01-05 16:41:20 -05:00
  • f4a5a68568 Merge pull request #17379 from proversity-org/proversity/edx-pr-fix-layout-in-learner-profile Bill DeRusha 2018-02-05 09:02:56 -05:00
  • bca4aedcb4 restoring tests to demonstrate correct library is loaded Peter Pinch 2018-02-04 22:04:50 -05:00
  • 061cbc8c0c remove uncessary tests Peter Pinch 2018-01-31 11:21:15 -05:00
  • 2b373a1384 update functions to work in complex plane Peter Pinch 2018-01-31 09:43:01 -05:00
  • 2418480997 Merge pull request #17400 from edx/arch/fix-oauth-docs Nimisha Asthagiri 2018-02-04 19:36:27 -05:00
  • b99d0a3495 OAuth docs: minor fixes Nimisha Asthagiri 2018-02-04 18:26:26 -05:00
  • df4221e531 Merge pull request #17266 from edx/arch/oauth-how-to Nimisha Asthagiri 2018-02-03 15:18:11 -05:00
  • 356734715b fix layout in learner profile Jose Antonio Gonzalez 2018-02-01 08:28:30 +02:00
  • 293e4f895a OAuth docs, including decisions Nimisha Asthagiri 2018-01-20 17:13:03 -05:00
  • 2bd0c3d9a1 PLAT-1917 Stop using deprecated Location and AssetLocation Jeremy Bowman 2018-02-02 17:50:21 -05:00
  • 53a6358523 Merge pull request #17389 from edx/jmbowman/PLAT-1916 Jeremy Bowman 2018-02-02 17:13:11 -05:00
  • 11e134c552 PLAT-1916 Ignore existing usage of deprecated field_data Jeremy Bowman 2018-02-01 13:00:28 -05:00
  • e6e91806f4 Merge pull request #17219 from mitodl/add_aq_print David Ormsbee 2018-02-02 11:42:04 -05:00
  • 7d67583bb9 Merge pull request #17310 from edx/yro/EDUCATOR-2088 Gregory Martin 2018-02-02 08:40:44 -05:00
  • 5ddcfc5607 Merge pull request #17343 from edx/aj/validate-course-team-user Awais Jibran 2018-02-02 14:32:39 +05:00
  • 612fb259e6 Merge pull request #17381 from edx/noraiz/EDUCATOR-2228 Noraiz Anwar 2018-02-02 13:02:20 +05:00
  • d56bd58063 clean grades service noraiz-anwar 2018-02-01 00:16:55 +05:00
  • a79f899b4b Update resume button functionality Gregory Martin 2018-01-22 11:41:10 -05:00
  • 7f3ffcc047 Changed 'bookmarks' django app to follow plugin pattern Gavin Sidebottom 2018-02-01 15:30:06 -05:00
  • 0b9cf78355 Merge pull request #17388 from edx/aj/entitlement_leave_session Albert (AJ) St. Aubin 2018-02-01 14:19:37 -05:00
  • 61306c8f10 Merge pull request #17377 from edx/fysheets/EDUCATOR-2230 Gregory Martin 2018-02-01 14:10:36 -05:00
  • 97165d3460 Updates to allow leaving a session on entitlements with only 1 run available Albert St. Aubin 2018-02-01 12:36:19 -05:00
  • bc790400a9 Merge pull request #17374 from edx/feanil/hackathon_logging Feanil Patel 2018-02-01 11:14:16 -05:00
  • 938c9670cc Merge pull request #17376 from edx/jmbowman/PLAT-1915 Jeremy Bowman 2018-02-01 10:24:06 -05:00
  • 0d8c30e58d Fix pep8 violation. Feanil Patel 2018-01-31 14:48:30 -05:00
  • 41879e0087 Update comment. Feanil Patel 2018-01-31 14:43:27 -05:00
  • 14b57f14ff Remove unnecessary var. Feanil Patel 2018-01-31 12:00:30 -05:00
  • 8d84e8b4a2 Consolidate overrides into base config. Feanil Patel 2018-01-31 11:51:47 -05:00
  • caff4b5720 console_loglevel never used, remove it. Feanil Patel 2018-01-31 11:14:06 -05:00
  • 3d6fe85703 syslog_addr config never used. Feanil Patel 2018-01-31 11:12:27 -05:00
  • bc08698592 Remove dev_env specific settings. Feanil Patel 2018-01-31 11:08:36 -05:00
  • 49cbd581e9 Remove tracking_filename override. Feanil Patel 2018-01-31 11:06:41 -05:00
  • 779bc1d772 The dev_env parameter is never used in any of our configs. Feanil Patel 2018-01-31 11:04:21 -05:00
  • 147ea0c12c Remove un-necessary conditional. Feanil Patel 2018-01-31 10:51:01 -05:00
  • 37ae5e5218 Move LOG_DIR setting next to LOGGING setting. Feanil Patel 2018-01-31 10:48:02 -05:00
  • de80ab751a Remove the debug override. Feanil Patel 2018-01-31 10:47:31 -05:00
  • 7dd16638bd Merge pull request #17358 from edx/feanil/flaky_html5_test Feanil Patel 2018-02-01 09:41:23 -05:00
  • 1e16bfd936 On course run create request, validate course team user and raise validation error Awais Jibran 2018-01-30 14:10:35 +05:00
  • c00c245005 Merge pull request #17364 from edx/tasawer/learner-4041/link-new-support-form-from-lms-footer Tasawer Nawaz 2018-02-01 12:29:52 +05:00