Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,817 Commits 1 Branch 0 Tags
624bef547c66da17048e29ff5d80126a665f1a0d
Commit Graph

7419 Commits

Author SHA1 Message Date
Albert (AJ) St. Aubin
5553e7ddf1 Merge pull request #17172 from edx/aj/LEARNER-3708 
Changes the Program Details page to show the most recently purchased
 2018-01-16 08:28:37 -05:00
Nimisha Asthagiri
7286c64e18 Refactor Django App Plugins to allow for additional features 2018-01-15 12:16:53 -05:00
Daniel Clemente Laboreo
4a2e6e31a6 Allow customizing heartbeat checks 2018-01-15 16:50:42 +01:00
Jeremy Bowman
7d436a18ee PLAT-1858 Better capture of deprecation warnings 2018-01-12 18:04:32 -05:00
Jeremy Bowman
dba976fc16 Merge pull request #17180 from edx/jmbowman/PLAT-1885 
PLAT-1885 Stop using deprecated BlockUsageLocator properties
 2018-01-12 18:02:29 -05:00
Nimisha Asthagiri
f841d65b93 Merge pull request #17176 from edx/arch/oauth-scopes-ux 
OAuth: support for auto_even_if_expired REQUEST_APPROVAL_PROMPT
 2018-01-12 17:32:43 -05:00
Troy Sankey
e19f51dbff Merge pull request #16918 from edx/pwnage101/collectstatic_works_for_1.11 
LMS collectstatic now runs under Django 1.11
 2018-01-12 17:14:59 -05:00
Jeremy Bowman
113e8dde61 PLAT-1885 Stop using deprecated BlockUsageLocator properties 2018-01-12 16:40:21 -05:00
Nimisha Asthagiri
ea041700f6 OAuth: support for auto_even_if_expired REQUEST_APPROVAL_PROMPT 2018-01-12 16:15:09 -05:00
Troy Sankey
e9e786b9af LMS collectstatic now runs under Django 1.11 
* Avoid URL namespace collision for "wiki:*" by changing the
  course-specific django-wiki instance/app name to something we will
  never reverse.

* Update our custom implementation of the staticfiles app's
  CachedFilesMixin internal methods `url_converter()` and `_url()` to be
  compatible with Django 1.11.  This installs multiple shims in order to
  maintain compatibility with previous django versions.
 2018-01-12 15:54:21 -05:00
Albert St. Aubin
2e99ee0d7f Changes the Program Details page to show the most recently purchased 
entitlement data

[LEARNER-3708]
 2018-01-12 15:03:25 -05:00
Michael Youngstrom
fb387c9633 Revert "jaebradley/learner 3600 upsell modal" 2018-01-12 14:48:00 -05:00
Robert Raposa
3afa83c0c4 Merge pull request #15598 from edx/andya/developer-doc-cleanups 
Improve documentation for the Open edX features
 2018-01-12 13:40:08 -05:00
Andy Armstrong
7c09ebb794 Improve documentation for the Open edX features 2018-01-12 10:52:07 -05:00
Jae Bradley
725d354463 Merge pull request #17128 from edx/jaebradley/LEARNER-3600-Upsell-Modal 
jaebradley/learner 3600 upsell modal
 2018-01-12 09:57:09 -05:00
jaebradley
4573b63018 implement modal and carousel 
wip

upsell modal css

remove unnecessary newline

accidentally removed feature

update props

update modal component

update css

add additional slides

update styling

update copy
 2018-01-12 01:35:15 -05:00
Jeremy Bowman
c24d8c1b28 Merge pull request #17167 from edx/jmbowman/PLAT-1884 
PLAT-1884 Replace deprecated xblock.fragment usage
 2018-01-11 16:25:13 -05:00
Nimisha Asthagiri
bb738571ce Merge pull request #17093 from edx/arch/django-app-plugin 
Django App Plugins
 2018-01-11 15:49:45 -05:00
Harry Rein
f747493c33 Merge pull request #17168 from edx/HarryRein/LEARNER-3734-chronological-session-selection 
Sort available sessions by start date.
 2018-01-11 15:34:14 -05:00
Nimisha Asthagiri
306ec1f9f0 Update theming app to be a Django App Plugin 2018-01-11 14:35:08 -05:00
Nimisha Asthagiri
93c6a89bd6 Update schedules app to be a Django App Plugin 2018-01-11 14:35:08 -05:00
Nimisha Asthagiri
f16bfac88b Update ace_common app to be a Django App Plugin 2018-01-11 14:35:07 -05:00
Nimisha Asthagiri
c2fc546db9 Support for Django App Plugins 2018-01-11 14:35:06 -05:00
Nimisha Asthagiri
11794c8384 Rename schedules/docs/img to schedules/docs/images 2018-01-11 14:35:05 -05:00
Jeremy Bowman
f8e5e38cc4 PLAT-1884 Replace deprecated xblock.fragment usage 2018-01-11 14:20:12 -05:00
Harry Rein
287a00ee77 Sort available sessions by start date. 
LEARNER-3734
 2018-01-11 12:34:46 -05:00
Waheed Ahmed
69cd383402 Merge pull request #17145 from edx/waheed/LEARNER-3754-update-my-program-detail-url-for-mobile 
Update program detail fragment url for mobile apps.
 2018-01-11 12:42:23 +05:00
Jeremy Bowman
1a7753d775 PLAT-1881 Fix datetimes lacking timezone information 2018-01-10 14:33:01 -05:00
Jeremy Bowman
4026c25f7a Merge pull request #17133 from edx/jmbowman/PLAT-1873_2 
PLAT-1873 to_deprecated_string() cleanup part 2
 2018-01-10 13:45:15 -05:00
Matthew Piatetsky
c2094d4388 Merge pull request #17134 from edx/LEARNER-3058 
Fix course upsell styling when bootstrap is enabled
 2018-01-10 09:59:37 -05:00
Waheed Ahmed
2406812100 Update program detail fragment url for mobile apps. 
LEARNER-3754
 2018-01-10 19:01:04 +05:00
Hasnain
23a5ae3fcd Changed the secret key for ecommerce and discovery clients. 2018-01-10 15:55:05 +05:00
Matthew Piatetsky
222b356900 Fix course upsell styling when bootstrap is enabled 2018-01-09 16:09:26 -05:00
Harry Rein
042a854bd0 Merge pull request #17124 from edx/HarryRein/dashboard-entitlement-with-no-course-runs 
Show more sessions coming soon on course dashboard.
 2018-01-09 14:13:33 -05:00
Harry Rein
b404173046 Show more sessions coming soon on course dashboard. 
LEARNER-3808

Ensures that users can see their entitlement purchase whether there
are available sessions or not. Notifies them with a message stating that
more sessions are coming soon, as is currently implemented on the programs
dashboard.
 2018-01-09 13:04:36 -05:00
zubair-arbi
0b13d25b08 ENT-768 Display friendly error message for third party auth error 2018-01-09 16:57:14 +05:00
Nimisha Asthagiri
a37d09aefb Move PluginManager out of api folder 2018-01-08 19:15:23 -05:00
Jeremy Bowman
669aa13ad6 PLAT-1873 to_deprecated_string() cleanup part 2 2018-01-08 17:26:55 -05:00
Jeremy Bowman
d3d6272d8f PLAT-1873 to_deprecated_string() cleanup part 1 2018-01-08 13:51:42 -05:00
Gabe Mulley
2580a76016 Merge pull request #17102 from edx/mulby/fix-schedules-tracking-docs 
fix analytics docs for the schedules app
 2018-01-08 13:21:41 -05:00
Brian Mesick
e46c7fc516 Merge pull request #17096 from edx/bmedx/django111_lms_unit_1_failures 
Small fixes to LMS unit 1 failures in Django 1.11 tests
 2018-01-08 11:30:21 -05:00
Brian Mesick
9bb67e7f41 Merge pull request #17104 from edx/bmedx/django111_lms_unit_2_failures 
Small fixes to LMS unit 2 failures in Django 1.11 tests
 2018-01-08 10:47:52 -05:00
bmedx
95e76dcafe Small fixes to LMS unit 1 failures in Django 1.11 tests 2018-01-08 10:20:30 -05:00
Ahsan Ulhaq
1b2fdc058d Rate limited /oauth2/access_token/ 
There has been some reports about attack on /oauth2/access_token/.
This cause LMS to be down. This is being resolved by rate limiting the
endpoint.
LEARNER-3393
 2018-01-08 16:58:16 +05:00
Hasnain Naveed
c7743d41f9 Merge pull request #17071 from edx/hasnain-naveed/WL-1395 
WL-1395 | Added User profile for service users.
 2018-01-08 13:02:06 +05:00
Asad Iqbal
d894850513 Merge pull request #16950 from edx/asadiqbal08/ENT-772-Update-singin-UI 
ENT-772 - UI Updated to Support Ent Data Synchronization message
 2018-01-08 12:55:24 +05:00
bmedx
f7a36aae64 Small fixes to LMS unit 2 failures in Django 1.11 tests 2018-01-05 10:41:07 -05:00
Gabe Mulley
1a9434f967 fix analytics docs for the schedules app 2018-01-05 09:59:31 -05:00
asadiqbal
5d92b42fe3 UI Updates to Support Ent Data Synchronization 2018-01-05 17:16:02 +05:00
Matthew Piatetsky
57c45c6453 Merge pull request #16969 from edx/LEARNER-3058 
LEARNER-3058 Move hero upsell to sidebar
 2018-01-04 14:48:18 -05:00