Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

5629 Commits

Author SHA1 Message Date
Simon Chen
db81dfa424 Surface vertical units in the course outline 2018-02-12 14:27:52 -05:00
Diana Huang
eab84c9a0f Use the same ordering for LA dashboard as progress page. 2018-02-12 10:18:07 -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
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
jaebradley
345302c7dc portfolio project readme 2018-02-07 08:45:41 -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
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
27f023f34a add video pipeline integration management command 2018-02-07 15:14:14 +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
Hasnain
943ac4096b Changing the service users for default clients. 2018-02-06 16:37:40 +05:00
Jeremy Bowman
9682e00f4c PLAT-1943 Fix more naive datetime warnings 2018-02-05 17:58:35 -05:00
Jeremy Bowman
bf86b3da98 PLAT-1942 Handle xmodule_django field deprecations 2018-02-05 15:05:54 -05:00
Gregory Martin
ae56b5a9c9 Update query for flag. 2018-02-05 14:32:26 -05:00
Diana Huang
124e4c2ca1 Create new djangoapp and a new blank tab view. 2018-02-05 11:35:42 -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
b99d0a3495 OAuth docs: minor fixes 2018-02-04 18:29:22 -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
11e134c552 PLAT-1916 Ignore existing usage of deprecated field_data 2018-02-02 16:12:00 -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
Gregory Martin
a79f899b4b Update resume button functionality 2018-02-01 22:26:46 -05:00
Gavin Sidebottom
7f3ffcc047 Changed 'bookmarks' django app to follow plugin pattern 2018-02-01 15:30:06 -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
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
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
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
Feanil Patel
de80ab751a Remove the debug override. 2018-02-01 10:08:40 -05:00
Jeremy Bowman
5289c7e828 PLAT-1915 Stop using deprecated BaseException.message 2018-01-31 17:22:01 -05:00
Bill DeRusha
2eff15b22f Revert "Fix layout in learner profile" 2018-01-31 11:16:40 -05:00
Bill DeRusha
fd8cd2ffbe Merge pull request #17348 from proversity-org/proversity/edx-pr-fix-layout-in-learner-profile 
Fix layout in learner profile
 2018-01-31 09:21:06 -05:00
Robert Raposa
093fefaf74 Merge pull request #17360 from edx/robrap/fix-la-waffle 
Add new waffle for modals.
 2018-01-31 09:05:21 -05:00
Albert (AJ) St. Aubin
55c6387db6 Merge pull request #17349 from edx/aj/LEARNER-3800 
Aj/learner 3800
 2018-01-31 07:03:34 -05:00
Robert Raposa
d6c15ffdbf Add new waffle for modals. 2018-01-30 15:27:12 -05:00
jaebradley
070b6ce414 more complete catch 2018-01-30 13:57:54 -05:00
Albert St. Aubin
b0e670e0de Used the incorrect version of the Course Key when building Course 
Entitlements list
 2018-01-30 09:55:31 -05:00
Albert St. Aubin
ddab8123c1 Updates to the Course Entitlement API to block Learners from enrolling 
in runs that are not available.

[LEARNER-3800]
 2018-01-30 09:52:06 -05:00