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

45006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ayub khan
3d82980767 Merge pull request #17410 from edx/update-translations-6-fed 
update translations
 2018-02-06 17:34:50 +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
710287412d Merge pull request #17401 from edx/yro/EDUCATOR-2088_clean 
Update query for flag.
 2018-02-05 15:49:16 -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
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
Awais Jibran
5ddcfc5607 Merge pull request #17343 from edx/aj/validate-course-team-user 
Course team Validation
 2018-02-02 14:32:39 +05:00
Noraiz Anwar
612fb259e6 Merge pull request #17381 from edx/noraiz/EDUCATOR-2228 
Clean grade sevice
 2018-02-02 13:02:20 +05:00
noraiz-anwar
d56bd58063 clean grades service 2018-02-02 11:52:12 +05:00
Gregory Martin
a79f899b4b Update resume button functionality 2018-02-01 22:26:46 -05:00
Albert (AJ) St. Aubin
0b9cf78355 Merge pull request #17388 from edx/aj/entitlement_leave_session 
Updates to allow leaving a session on entitlements with only 1 run
 2018-02-01 14:19:37 -05:00
Gregory Martin
61306c8f10 Merge pull request #17377 from edx/fysheets/EDUCATOR-2230 
Update video record handling defensiveness
 2018-02-01 14:10:36 -05:00
Albert St. Aubin
97165d3460 Updates to allow leaving a session on entitlements with only 1 run 
available

[LEARNER-4050]
 2018-02-01 13:05:05 -05:00
Feanil Patel
bc790400a9 Merge pull request #17374 from edx/feanil/hackathon_logging 
Make the logging config easier to read.
 2018-02-01 11:14:16 -05:00
Jeremy Bowman
938c9670cc Merge pull request #17376 from edx/jmbowman/PLAT-1915 
PLAT-1915 Stop using deprecated BaseException.message
 2018-02-01 10:24:06 -05:00
Feanil Patel
0d8c30e58d Fix pep8 violation. 2018-02-01 10:08:40 -05:00
Feanil Patel
41879e0087 Update comment. 2018-02-01 10:08:40 -05:00
Feanil Patel
14b57f14ff Remove unnecessary var. 
Previously it was useful because we updated it conditionally but now
it's just reducing information locality.
 2018-02-01 10:08:40 -05:00
Feanil Patel
8d84e8b4a2 Consolidate overrides into base config. 
They used to be in a conditional but aren't anymore so we don't need to have
them be separate.
 2018-02-01 10:08:40 -05:00
Feanil Patel
caff4b5720 console_loglevel never used, remove it. 2018-02-01 10:08:40 -05:00
Feanil Patel
3d6fe85703 syslog_addr config never used. 2018-02-01 10:08:40 -05:00
Feanil Patel
bc08698592 Remove dev_env specific settings. 
Since we never used dev_env and have removed it.
 2018-02-01 10:08:40 -05:00
Feanil Patel
49cbd581e9 Remove tracking_filename override. 
The override value is the same as the default value.
 2018-02-01 10:08:40 -05:00
Feanil Patel
779bc1d772 The dev_env parameter is never used in any of our configs. 2018-02-01 10:08:40 -05:00
Feanil Patel
147ea0c12c Remove un-necessary conditional. 2018-02-01 10:08:40 -05:00