Pull Request - Push LHUB Staging 280421 - #4

Open

yasir1brahim wants to merge 162 commits into

grid-synergy:gs/koa.masterfrom

yasir1brahim:gs/koa.master

Commits on Apr 13, 2021

certificate configuration
nez2021
committed
b5fb62a
Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
bc2e2d4
Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
1dd2198

Commits on Apr 14, 2021

Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
cf5bf61
Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
de2cded

Commits on Apr 15, 2021

Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
d7157b1

Commits on Apr 19, 2021

Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
e6ec817
display certificate menu in studio
nez2021
committed
e7de009

Commits on Apr 21, 2021

Implement new notification types and change API format
Vladyslav Zherebkin
committed
3e775a8
Merged in features/LMA-751 (pull request #9)

Vladyslav Zherebkin
authored and
oksanaslusarenko-cmyk
committed
8188adc
LMA-752 Banner related
thiruvalluvan
committed
889c2ec

Commits on Apr 22, 2021

config changes
nez2021
committed
0c0bc5c
Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
8166b74
LMA-752: Front end bootstrap changes for full screen
thiruvalluvan
committed
55f89c8
Implemented unread feature for notification
Vladyslav Zherebkin
committed
3cc4a5d
Merged in features/LMA-767 (pull request #10)

Vladyslav Zherebkin
authored and
oksanaslusarenko-cmyk
committed
1571d77

Commits on Apr 23, 2021

LMA-752, Fixed the following
thiruvalluvan
committed
afbe5c0
Merge branch 'features/LMA-752' into develop
thiruvalluvan
committed
e0d100a
LMA-752: Fix for web image loading,
thiruvalluvan
committed
de702f7
Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
df93db8
Change notification API response format
Vladyslav Zherebkin
committed
44293d6
Merged in features/LMA-807 (pull request #11)

Vladyslav Zherebkin
authored and
oksanaslusarenko-cmyk
committed
0a7c486
LMA-752 : Fixes
thiruvalluvan
committed
f24510e
Merge branch 'develop' of bitbucket.org:ntuclink/lhubml into develop
thiruvalluvan
committed
11c47e5
local change for banner
nez2021
committed
dee926d
Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
c56ea7e
LMA-752: Studio import fix
thiruvalluvan
committed
e8c51c1
Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
f11115f
Completed LMA-638
arafay993
committed
7e0e9aa
LMA-752: url fix
thiruvalluvan
committed
6d874ac
Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
764d9a2

Commits on Apr 24, 2021

LMA-638 check button issue solved
arafay993
committed
e188d3a
Revert "LMA-638 check button issue solved. Removed unnecessary file"
arafay993
committed
8c95370

Commits on Apr 26, 2021

Commits on Apr 27, 2021

LMA-638: GST calculation on multiselect, append two decimal places in tax amount
arafay993
committed
4a49daa
LMA-638: Fixed: LMS Shopping cart multi select not working with tax
arafay993
committed
b76f95f
Change Order history API format and add extra field
Vladyslav Zherebkin
committed
74a9fdd
Merged in features/LMA-765-updated (pull request #13)

Vladyslav Zherebkin
authored and
oksanaslusarenko-cmyk
committed
d4cdbfb

Commits on Apr 28, 2021

footer changes & course detail own_review field merge
nez2021
committed
3eed815
Fixed order history API formating
Vladyslav Zherebkin
committed
b0d15bb
Merged in features/LMA-765-fix (pull request #14)

Vladyslav Zherebkin
authored and
oksanaslusarenko-cmyk
committed
1d39c47
Fixed: format discounted_price to two decimal places in mobile apis and course about page
arafay993
committed
3a3758a
Merge branch 'gs/koa.master' of github.com:yasir1brahim/edx-platform into gs/koa.master
arafay993
committed
91d7102

Commits on Apr 29, 2021

Implemented notification multiple actions and endpoints
Vladyslav Zherebkin
committed
dc9f0bf
Merged in features/LMA-766 (pull request #15)

Vladyslav Zherebkin
authored and
oksanaslusarenko-cmyk
committed
f7a8539
merge thiru discovery banner and GJ image hiding
nez2021
committed
239de60
Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
8823294
Modified response format for handouts API
Vladyslav Zherebkin
committed
88565bd
Merged in features/LMA-536 (pull request #16)

Vladyslav Zherebkin
authored and
oksanaslusarenko-cmyk
committed
0dfb196
Change notification format from form data into json
Vladyslav Zherebkin
committed
7be8da0
Merged in features/LMA-766-updated (pull request #17)

Vladyslav Zherebkin
authored and
oksanaslusarenko-cmyk
committed
badae00
LMA-723: Convert price values into string and roundoff in CourseDetail and CourseListing API
arafay993
committed
b2e2be8
Merge branch 'features/LMA-723' of github.com:yasir1brahim/edx-platform into gs/koa.master
arafay993
committed
8ca487d

Commits on Apr 30, 2021

thiru home api
nez2021
committed
b9b1cce
thiru home api change
nez2021
committed
bb3dd62
Merge branch 'develop' of https://bitbucket.org/ntuclink/lhubml into develop
nez2021
committed
713b0f7
Merged develop into gs/koa.master
nez2021
committed
5746036

Commits on May 3, 2021

Commits on May 4, 2021

Commits on May 5, 2021

Thiru LMA-769
nez2021
committed
ae4e561
Thiru LMA-769
nez2021
committed
37f6820
added missing comma
nez2021
committed
639c812

Commits on May 6, 2021

Added the fields of price_string and discounted_price_string
arafay993
committed
38977ed
LMA-643: Redirected to Basket page on click of Buy Now and Checkout buttons
arafay993
committed
c4b2219
Merge branch features/LMA-643 into gs/koa.master and resolved conflicts
arafay993
committed
2fd585a
Added extra course_id field for notification API
Vladyslav Zherebkin
committed
a310d19
Merged in features/LMA-39-extra-field (pull request #18)

Vladyslav Zherebkin
authored and
oksanaslusarenko-cmyk
committed
2a93193
LMA-723: Added field "discount_percentage_string" in course details api
Yasir Ibrahim
committed
94d9913
Merge branch 'features-LMA-723' of github.com:yasir1brahim/edx-platform into gs/koa.master
arafay993
committed
f3def63
Resolved issue related to merge conflicts
arafay993
committed
5ef9584
LMA-643: Disable checkout button when cart is empty
Yasir Ibrahim
committed
82d9c1b

Commits on May 7, 2021

Merge branch 'gs/koa.master' of https://bitbucket.org/ntuclink/lhubml into gs/koa.master
arafay993
committed
28294b7
Implemented certificate pdf generation
Vladyslav Zherebkin
committed
562da01
Merged in features/LMA-719 (pull request #19)

Vladyslav Zherebkin
authored and
oksanaslusarenko-cmyk
committed
4cafc20
Fixed user image on reviews tab
Vladyslav Zherebkin
committed
e1ba4f4
Merged in features/LMA-551-image (pull request #20)

Vladyslav Zherebkin
authored and
oksanaslusarenko-cmyk
committed
b2c23a5
Implemented detail order API
Vladyslav Zherebkin
committed
3ce9484
Merged in features/LMA-833 (pull request #21)

Vladyslav Zherebkin
authored and
oksanaslusarenko-cmyk
committed
903c067

Commits on May 10, 2021

Commits on May 11, 2021

Commits on May 12, 2021

LMA-535: Set discounted_price and discounted_percentage with respect to offer in lhub_ecommerce_offer model
arafay993
committed
5ceb089
LMA-535: Changed Delete API URL
arafay993
committed
1139b21
Merge branch 'features/LMA-535' of github.com:yasir1brahim/edx-platform into features/LMA-535
arafay993
committed
5f49e6d
LMA-364: Static slider
Yasir Ibrahim
committed
6e44e80

Commits on May 17, 2021

Commits on May 18, 2021

note tab for web
nez2021
committed
ca8c679
note web changes
nez2021
committed
1e30fc8
resolving conflicts
nez2021
committed
e8ff429
envs for server
nez2021
committed
d35681f
LMA-364: Dynamic slider for logged in user categorized views
Yasir Ibrahim
committed
520400b

Commits on May 19, 2021

LMA-535: Added Coupon model and made APIs for create/update/delete of Coupons from Ecommerce to LMS
arafay993
committed
33499b7
LMA-364: Make the slider operational for top rated courses
Yasir Ibrahim
committed
7bb891c

Commits on May 20, 2021

LMA-535: Added coupons on course card and set priority in offer in lms
arafay993
committed
59f3ebf
LMA-535: Set priority in offer lms and added blank value to True in offer model lms
arafay993
committed
da31d6b
LMA-535: Added name field in Coupon model and in Coupon API
arafay993
committed
b90a894
LMA-535: Refactored Available Vouchers field
arafay993
committed
225d99d
Add extra fields for order detail API
Vladyslav Zherebkin
committed
5d138cc
Merged in features/LMA-833-extra-fields (pull request #28)
Vladyslav Zherebkin
committed
e81c98f
LMA-535: Added 'discount_type' field in Course Listing API
arafay993
committed
5f087da
LMA-535: Added discount_type, voucher_applicable and available_vouchers field in Course Details API
arafay993
committed
e8e75e9
LMA-535: Fixed Course Detail API response
arafay993
committed
a6e6609
LMA-535: Showed vouchers on course card in lms
arafay993
committed
53c90ba
Merge branch 'features/LMA-535' of github.com:yasir1brahim/edx-platform into features/LMA-535
arafay993
committed
d51c21a
LMA-364: Dynamic Slider/ Non-logged and logged in user pages adjusted
Yasir Ibrahim
committed
79c4341
LMA-535: Added Voucher information in Recommended Courses API response
arafay993
committed
bcb2e1d
LMA-364: Made course categorization urls dynamic
arafay993
committed
fc9cf52
LMA 535 changes for coupon in shopping cart
arafay993
committed
c96adf0
Merge branch 'features/LMA-535' of github.com:yasir1brahim/edx-platform into features/LMA-535
arafay993
committed
815e21b
Resolved merge conflicts of LMA-535 and LMA-364
arafay993
committed
b9b91a9
Resolved merge conflicts of LMS-535 and LMA-364
arafay993
committed
34527e3
LMA-364: Course Recommendation for logged in and non-logged in user with horizontal sliders
Yasir Ibrahim
committed
e7d04b2
Merge branch 'features/LMA-364' of github.com:yasir1brahim/edx-platform into features/LMA-364
Yasir Ibrahim
committed
39de9fe
Resolve merge conflicts of LMA-364
arafay993
committed
56b8fc6

Commits on May 21, 2021

Fix email and twitter social sharing links
Vladyslav Zherebkin
committed
253f520
Merged in features/LMA-608-fix (pull request #30)
Vladyslav Zherebkin
committed
9c0e0a2
LMA-364: Resolved issues
Yasir Ibrahim
committed
2b9da25
LMA-535: Showed coupons on loggedin and not loggedin course pages in course categorization
arafay993
committed
1690b1d
Merge branch 'features/LMA-535' of github.com:yasir1brahim/edx-platform into features/LMA-535
arafay993
committed
a0ad0b8
LMA-364: Fix Banner position
Yasir Ibrahim
committed
b58e2f6
Merge branch 'features/LMA-535' of github.com:yasir1brahim/edx-platform into features/LMA-535
Yasir Ibrahim
committed
1bcc61f
Resolved merge conflicts
arafay993
committed
1d1af44
LMA-535: Showed coupon on recommended courses at shopping cart page.
arafay993
committed
651e177
Merge branch 'features/LMA-535' of github.com:yasir1brahim/edx-platform into features/LMA-535
arafay993
committed
75eecce
LMA-364: Added images on the course-card in courses categorization
Yasir Ibrahim
committed
ace046a
Merge branch 'features/LMA-535' of github.com:yasir1brahim/edx-platform into features/LMA-535
Yasir Ibrahim
committed
11ab6c1
LMA-535: Fixed redirecting url to /basket after checked out of shopping cart
arafay993
committed
90564c1
Merge branch 'features/LMA-535' of github.com:yasir1brahim/edx-platform into features/LMA-535
arafay993
committed
bb830b8
LMA-364: Made slider visible through script
Yasir Ibrahim
committed
afe15fc
Merge branch 'features/LMA-535' of github.com:yasir1brahim/edx-platform into features/LMA-535
Yasir Ibrahim
committed
06d791f
LMA-364: Resolved repeated courses on recommended course slider
Yasir Ibrahim
committed
4ec0f9b

Commits on May 22, 2021

Commits on May 24, 2021

Commits on May 25, 2021

LMA-364: Console-Error handled
Yasir Ibrahim
committed
ebbad76