Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
45,049 Commits 1 Branch 0 Tags
60a4e6d8644f75d488d45749eb3021222b6b0652
Commit Graph

45049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Muhammad Ammar
4d7c9113a1 Merge pull request #17412 from edx/ammar/edxval-release 
update edxval to 0.1.9
 2018-02-07 17:18:19 +05:00
muhammad-ammar
27f023f34a add video pipeline integration management command 2018-02-07 15:14:14 +05:00
David Ormsbee
ea2a9330c8 Merge pull request #17061 from edx/ormsbee/pipeline_plans_doc 
WIP stab at the plan for static assets in edx-platform

Merging this as an incremental step, even though there are still gaps.
 2018-02-06 22:16:15 -05:00
Michael Youngstrom
231becdc2f Merge pull request #17420 from edx/youngstrom/timing_logs 
Change paver timing log naming structure
 2018-02-06 21:58:51 -05:00
David Ormsbee
b7f2ddf620 WIP stab at the plan for static assets in edx-platform 2018-02-06 17:51:03 -05:00
Diana Huang
363249908a Merge pull request #17419 from edx/diana/new-portfolio-page 
Force bootstrap on for this page.
 2018-02-06 16:43:05 -05:00
Diana Huang
e2d8e751a0 Force bootstrap on for this page. 2018-02-06 14:30:57 -05:00
Nimisha Asthagiri
51dcb5a536 Merge pull request #17392 from mitodl/hack18_bookmarks_django_plugin 
Changed 'bookmarks' django app to follow plugin pattern
 2018-02-06 14:21:38 -05:00
Jeremy Bowman
378287fbc0 Merge pull request #17404 from edx/jmbowman/PLAT-1942 
PLAT-1942 Handle xmodule_django field deprecations
 2018-02-06 13:23:04 -05:00
Michael Youngstrom
7fdee1fae9 Give paver timing logs a unique name always 2018-02-06 13:17:20 -05:00
Jeremy Bowman
8a57cbf4bb Merge pull request #17409 from edx/jmbowman/PLAT-1943 
PLAT-1943 Fix more naive datetime warnings
 2018-02-06 11:18:52 -05:00
Matt Drayer
1498a28d51 Version bump edx-enterprise to 0.65.3 2018-02-06 10:21:15 -05:00
Adam Stankiewicz
ad7005792b Merge pull request #17402 from edx/astankiewicz/enterprise-version-bump 
Version bump edx-enterprise to 0.65.2
 2018-02-06 09:40:31 -05:00
muhammad-ammar
507bacd8d8 update edxval to 0.1.9 2018-02-06 18:59:39 +05:00
Ayub khan
3d82980767 Merge pull request #17410 from edx/update-translations-6-fed 
update translations
 2018-02-06 17:34:50 +05:00
Hasnain
62969bc317 Adding the new argument "name" (course_display_name) in create_course management command. 2018-02-06 16:55:29 +05:00
Hasnain
943ac4096b Changing the service users for default clients. 2018-02-06 16:37:40 +05:00
ayub-khan
36a6240472 translations-6-feb 2018-02-06 14:13:05 +05:00
Jeremy Bowman
9682e00f4c PLAT-1943 Fix more naive datetime warnings 2018-02-05 17:58:35 -05:00
Gregory Martin
c1a4184acd Swap out exception class 2018-02-05 16:45:17 -05:00
Gregory Martin
710287412d Merge pull request #17401 from edx/yro/EDUCATOR-2088_clean 
Update query for flag.
 2018-02-05 15:49:16 -05:00
Jeremy Bowman
bf86b3da98 PLAT-1942 Handle xmodule_django field deprecations 2018-02-05 15:05:54 -05:00
Adam Stankiewicz
9247979226 Version bump for edx-enterprise 2018-02-05 14:43:02 -05:00
Gregory Martin
ae56b5a9c9 Update query for flag. 2018-02-05 14:32:26 -05:00
Tyler Hallada
ffbb0c16ef Merge pull request #17322 from edx/thallada/assets-case-insensitive-sort 
EDUCATOR-2191 Use Mongo aggregate hack to sort case-insensitive
 2018-02-05 14:05:32 -05:00
Tyler Hallada
be474b5d61 Merge pull request #17117 from edx/thallada/contentstore-index-displayname-fix 
Fix typos in contentstore's mongo index keys
 2018-02-05 14:03:54 -05:00
Diana Huang
a8f9a5f350 Merge pull request #17398 from edx/diana/new-portfolio-page 
Create new djangoapp and a new blank tab view.
 2018-02-05 13:06:22 -05:00
Jeremy Bowman
caf47be13f Merge pull request #17399 from edx/jmbowman/PLAT-1917 
PLAT-1917 Stop using deprecated Location and AssetLocation
 2018-02-05 12:53:52 -05:00