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

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Diana Huang
124e4c2ca1 Create new djangoapp and a new blank tab view. 2018-02-05 11:35:42 -05:00
Tyler Hallada
c959ebce01 Add Jira ticket number to TODO comment 2018-02-05 11:27:43 -05:00
Tyler Hallada
45f9b88298 Fix modulestore mongo tests 2018-02-05 11:27:43 -05:00
Tyler Hallada
df5671927f Handle no assets results case properly 2018-02-05 11:27:43 -05:00
Tyler Hallada
1710021c0d Don't sort when sort is None 2018-02-05 11:27:43 -05:00
Tyler Hallada
b55aeb4798 Use Mongo aggregate hack to sort case-insensitive 2018-02-05 11:27:43 -05:00
Tyler Hallada
32e5679d7f Also fix displayname typo in ensure_index comment 2018-02-05 10:35:38 -05:00
Tyler Hallada
fbb65c22c8 Fix typos in contentstore's mongo index keys 
"display_name" was specified as a key to two indexes, but items in the collection have the key "displayname" without an underscore.
 2018-02-05 10:35:38 -05:00
Bill DeRusha
f4a5a68568 Merge pull request #17379 from proversity-org/proversity/edx-pr-fix-layout-in-learner-profile 
Fix layout in learner profile
 2018-02-05 09:02:56 -05:00
Peter Pinch
bca4aedcb4 restoring tests to demonstrate correct library is loaded 2018-02-04 22:04:50 -05:00
Peter Pinch
061cbc8c0c remove uncessary tests 2018-02-04 20:39:41 -05:00
Peter Pinch
2b373a1384 update functions to work in complex plane 2018-02-04 20:39:41 -05:00
Nimisha Asthagiri
2418480997 Merge pull request #17400 from edx/arch/fix-oauth-docs 
OAuth docs: minor fixes
 2018-02-04 19:36:27 -05:00
Nimisha Asthagiri
b99d0a3495 OAuth docs: minor fixes 2018-02-04 18:29:22 -05:00
Nimisha Asthagiri
df4221e531 Merge pull request #17266 from edx/arch/oauth-how-to 
OAuth docs, including proposal to roll out Scopes
 2018-02-03 15:18:11 -05:00
Jose Antonio Gonzalez
356734715b fix layout in learner profile 2018-02-03 21:24:58 +02:00
Nimisha Asthagiri
293e4f895a OAuth docs, including decisions 2018-02-03 14:15:29 -05:00
Jeremy Bowman
2bd0c3d9a1 PLAT-1917 Stop using deprecated Location and AssetLocation 2018-02-03 00:31:59 -05:00
Jeremy Bowman
53a6358523 Merge pull request #17389 from edx/jmbowman/PLAT-1916 
PLAT-1916 Ignore existing usage of deprecated field_data
 2018-02-02 17:13:11 -05:00
Jeremy Bowman
11e134c552 PLAT-1916 Ignore existing usage of deprecated field_data 2018-02-02 16:12:00 -05:00
David Ormsbee
e6e91806f4 Merge pull request #17219 from mitodl/add_aq_print 
Added print media in css
 2018-02-02 11:42:04 -05:00
Gregory Martin
7d67583bb9 Merge pull request #17310 from edx/yro/EDUCATOR-2088 
Yro/EDUCATOR 2088
 2018-02-02 08:40:44 -05:00