Code

chore: merge 'develop' into 'main'#1036

Code

Merged

pateljannat merged 22 commits intomainfrappe/lms:mainfrom developfrappe/lms:developCopy head branch name to clipboardOct 2, 2024

+3,063-1,880

Commits

Commits on Sep 19, 2024

• feat: payment through payments app

  pateljannat

  committed
  cef4b70

  Copy full SHA for cef4b70

Commits on Sep 24, 2024

• Merge branch 'develop' of https://github.com/frappe/lms into payments

  pateljannat

  committed
  d8ab88b

  Copy full SHA for d8ab88b

• feat: payment flow with payments app

  pateljannat

  committed
  e0f569c

  Copy full SHA for e0f569c

Commits on Sep 25, 2024

• feat: payment gateway settings

  pateljannat

  committed
  35a7cce

  Copy full SHA for 35a7cce

Commits on Sep 26, 2024

• feat: brand settings

  pateljannat

  committed
  e18f0c9

  Copy full SHA for e18f0c9

• fix: dirty form for branding section

  pateljannat

  committed
  11a9bff

  Copy full SHA for 11a9bff

• Merge pull request #1031 from pateljannat/brand-settings

  Show description for bb9b179
  pateljannat

  authored
  bb9b179

  Copy full SHA for bb9b179

Commits on Sep 27, 2024

• fix: misc UI fixes

  pateljannat

  committed
  ad07f88

  Copy full SHA for ad07f88

• chore: resolved conflicts

  pateljannat

  committed
  01120fb

  Copy full SHA for 01120fb

• fix: pass options to setting fields

  pateljannat

  committed
  576258e

  Copy full SHA for 576258e

• refactor: billing page ui

  pateljannat

  committed
  60a3da2

  Copy full SHA for 60a3da2

• fix: telemetry capture issue

  pateljannat

  committed
  7c055af

  Copy full SHA for 7c055af

• chore: update POT file

  frappe-pr-bot

  committed
  4fdca46

  Copy full SHA for 4fdca46

• Merge pull request #1033 from pateljannat/issues-35

  Show description for d295898
  pateljannat

  authored
  d295898

  Copy full SHA for d295898

Commits on Sep 30, 2024

• Merge branch 'develop' of https://github.com/frappe/lms into payments

  pateljannat

  committed
  b6bf9c0

  Copy full SHA for b6bf9c0

• chore: refactor payment settings

  pateljannat

  committed
  008cc66

  Copy full SHA for 008cc66

Commits on Oct 1, 2024

• Merge pull request #1032 from frappe/pot_develop_2024-09-27

  Show description for 1c9f636
  pateljannat

  authored
  1c9f636

  Copy full SHA for 1c9f636

• fix: minor ui changes

  pateljannat

  committed
  8a17dca

  Copy full SHA for 8a17dca

• fix: payment gateway fields

  pateljannat

  committed
  be870e8

  Copy full SHA for be870e8

• fix: removed help article from course lesson

  pateljannat

  committed
  a067695

  Copy full SHA for a067695

Commits on Oct 2, 2024

• Merge pull request #1035 from pateljannat/payments

  Show description for 59d8848
  pateljannat

  authored
  59d8848

  Copy full SHA for 59d8848

• chore(release): Bumped to Version 2.7.0

  frappe-bot

  committed
  fc81f1a

  Copy full SHA for fc81f1a