Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 44 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
4d18580
feat: batch student progress modal
pateljannat Dec 19, 2024
43cf7d0
feat: batch dashboard for instructors
pateljannat Dec 20, 2024
de0dea7
ci: container image for production setup
pateljannat Dec 20, 2024
7fcbe85
Merge pull request #1202 from pateljannat/docker-production-image
pateljannat Dec 20, 2024
c8aa44d
chore: update POT file
frappe-pr-bot Dec 20, 2024
9d03a52
chore: Swedish translations
pateljannat Dec 21, 2024
65b2199
chore: French translations
pateljannat Dec 23, 2024
fca2061
chore: Spanish translations
pateljannat Dec 23, 2024
4a2fae0
chore: Arabic translations
pateljannat Dec 23, 2024
5517033
chore: German translations
pateljannat Dec 23, 2024
4095916
chore: Hungarian translations
pateljannat Dec 23, 2024
f2c28eb
chore: Polish translations
pateljannat Dec 23, 2024
fdc0bef
chore: Russian translations
pateljannat Dec 23, 2024
6384eea
chore: Turkish translations
pateljannat Dec 23, 2024
776d46f
chore: Chinese Simplified translations
pateljannat Dec 23, 2024
1677a4a
chore: Persian translations
pateljannat Dec 23, 2024
a85c81a
chore: Bosnian translations
pateljannat Dec 23, 2024
b625d9b
fix: markdown embed and paste issue
pateljannat Dec 23, 2024
7dbbe9d
Merge pull request #1206 from pateljannat/issues-57
pateljannat Dec 23, 2024
f28f37f
ci: added back arch for building docker image
pateljannat Dec 23, 2024
c6853cc
Merge pull request #1208 from pateljannat/issues-58
pateljannat Dec 23, 2024
d0189b0
ci: updated the credentials for building docker image
pateljannat Dec 23, 2024
8a9725c
ci: updated the credentials for building docker image
pateljannat Dec 23, 2024
0fae11d
docs: updated self hosting steps in README
pateljannat Dec 23, 2024
7a6f5a8
Merge branch 'develop' of https://github.com/frappe/lms into batch-da…
pateljannat Dec 23, 2024
4ccd3ba
fix: legends
pateljannat Dec 23, 2024
9d0b100
fix: show dashboard to evaluators too
pateljannat Dec 23, 2024
f331c48
Merge pull request #1201 from pateljannat/batch-dashboard-2
pateljannat Dec 23, 2024
97d6c51
Merge pull request #1203 from frappe/pot_develop_2024-12-20
pateljannat Dec 24, 2024
8d372fc
Merge pull request #1204 from frappe/l10n_develop2
pateljannat Dec 24, 2024
10cd44c
chore: French translations
pateljannat Dec 25, 2024
81a714b
chore: Spanish translations
pateljannat Dec 25, 2024
bae75cd
chore: Arabic translations
pateljannat Dec 25, 2024
aa074ef
chore: German translations
pateljannat Dec 25, 2024
2752d3e
chore: Hungarian translations
pateljannat Dec 25, 2024
1d028e8
chore: Polish translations
pateljannat Dec 25, 2024
8752243
chore: Russian translations
pateljannat Dec 25, 2024
aa083c8
chore: Swedish translations
pateljannat Dec 25, 2024
4018116
chore: Turkish translations
pateljannat Dec 25, 2024
a96f883
chore: Chinese Simplified translations
pateljannat Dec 25, 2024
059ac27
chore: Persian translations
pateljannat Dec 25, 2024
8468d0e
chore: Bosnian translations
pateljannat Dec 25, 2024
0a7ce3c
chore: Esperanto translations
pateljannat Dec 25, 2024
aa1460e
Merge pull request #1211 from frappe/l10n_develop2
pateljannat Dec 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Build Container Image
on:
workflow_dispatch:
push:
branches:
- main
tags:
- "*"
jobs:
build:
name: Build
runs-on: ubuntu-latest

strategy:
matrix:
arch: [amd64, arm64]

permissions:
packages: write

steps:
- name: Checkout Entire Repository
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
platforms: linux/${{ matrix.arch }}
- name: Login to GitHub Container Registry
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set Branch
run: |
export APPS_JSON='[{"url": "https://github.com/frappe/lms","branch": "main"}]'
echo "APPS_JSON_BASE64=$(echo $APPS_JSON | base64 -w 0)" >> $GITHUB_ENV
echo "FRAPPE_BRANCH=version-15" >> $GITHUB_ENV

- name: Set Image Tag
run: |
echo "IMAGE_TAG=stable" >> $GITHUB_ENV
- uses: actions/checkout@v4
with:
repository: frappe/frappe_docker
path: builds

- name: Build and push
uses: docker/build-push-action@v6
with:
push: true
context: builds
file: builds/images/layered/Containerfile
tags: >
ghcr.io/${{ github.repository }}:${{ github.ref_name }},
ghcr.io/${{ github.repository }}:${{ env.IMAGE_TAG }}
build-args: |
"FRAPPE_BRANCH=${{ env.FRAPPE_BRANCH }}"
"APPS_JSON_BASE64=${{ env.APPS_JSON_BASE64 }}"
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ wget https://frappe.io/easy-install.py
python3 ./easy-install.py deploy \
--project=learning_prod_setup \
--email=your_email.example.com \
--image=ghcr.io/frappe/learning \
--image=ghcr.io/frappe/lms \
--version=stable \
--app=learning \
--app=lms \
--sitename subdomain.domain.tld
```

Expand Down
2 changes: 2 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"@editorjs/simple-image": "^1.6.0",
"@editorjs/table": "^2.4.2",
"ace-builds": "^1.36.2",
"apexcharts": "^4.3.0",
"chart.js": "^4.4.1",
"codemirror-editor-vue3": "^2.8.0",
"dayjs": "^1.11.6",
Expand All @@ -35,6 +36,7 @@
"vue-chartjs": "^5.3.0",
"vue-draggable-next": "^2.2.1",
"vue-router": "^4.0.12",
"vue3-apexcharts": "^1.8.0",
"vuedraggable": "4.1.0"
},
"devDependencies": {
Expand Down
Loading
Loading