Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
124 commits
Select commit Hold shift + click to select a range
605abde
Adding some extra messaging to the lti sso error messaging
CptTony Mar 7, 2023
80def94
Merge pull request #1623 from ActiveLearningStudio/change/cur4693-sso…
mohsin-tkxel Mar 7, 2023
778cbb3
fix explore search lib bugs
aqibnawaaz Mar 8, 2023
8b9e2a3
Merge pull request #1626 from ActiveLearningStudio/feature/CUR-4679
muhammadqamar Mar 8, 2023
4cb5e3f
more changes
muhammadqamar Mar 8, 2023
1bf4d36
Merge pull request #1629 from ActiveLearningStudio/bug/fixversion
aqibnwaz Mar 8, 2023
ac9962e
update newly lti structure
aqibnawaaz Mar 9, 2023
3450aa3
playlist screen in projects reponsive fix for msteams
mohsin-tkxel Mar 10, 2023
8874fa0
playlist screen in projects, toggle sidebar animate style for msteams
mohsin-tkxel Mar 10, 2023
018863e
Merge pull request #1631 from ActiveLearningStudio/feature/CUR-4697-t…
muhammadqamar Mar 10, 2023
f4b1100
add updated lti feature
aqibnawaaz Mar 13, 2023
6784d58
accept incoming changes
aqibnawaaz Mar 13, 2023
1070240
Merge pull request #1632 from ActiveLearningStudio/feature/CUR-4701
muhammadqamar Mar 13, 2023
48d0b90
fix xapi response text
aqibnawaaz Mar 13, 2023
8258dfb
Teams pages responsive issue fix
mohsin-tkxel Mar 14, 2023
8b53340
Merge pull request #1633 from ActiveLearningStudio/feature/CUR-4697-t…
aqibnwaz Mar 14, 2023
44d4987
Merge pull request #1634 from ActiveLearningStudio/feature/CUR-4701
muhammadqamar Mar 15, 2023
4cd06be
fix ms team feedback
aqibnawaaz Mar 15, 2023
c8beb8b
Merge pull request #1635 from ActiveLearningStudio/feature/CUR-4719
muhammadqamar Mar 15, 2023
ce391fa
Bugfix to aspect ratio scaling during pdf import for course presentation
CptTony Mar 15, 2023
ed57dde
Merge pull request #1637 from ActiveLearningStudio/CUR4149-course_pre…
aqibnwaz Mar 15, 2023
2f32bf1
admin search query filter issue fixed
AqibYounasAtTkxel Mar 16, 2023
ef6c790
Merge pull request #1638 from ActiveLearningStudio/CUR-4698-admin-fil…
aqibnwaz Mar 16, 2023
361646c
fix lti issue on media updation
aqibnawaaz Mar 16, 2023
0f02ddd
Merge pull request #1639 from ActiveLearningStudio/feature/CUR-4722
muhammadqamar Mar 17, 2023
faf0507
Bringing back the screen size warning
CptTony Mar 20, 2023
0c244a4
Merge pull request #1640 from ActiveLearningStudio/change/CUR4726-scr…
mohsin-tkxel Mar 20, 2023
4a4f327
Remove the size warning when viewing deeplinking search and activitie…
CptTony Mar 20, 2023
802b75e
Merge pull request #1641 from ActiveLearningStudio/change/CUR4726-scr…
mohsin-tkxel Mar 20, 2023
1fa65b7
Share playlist preview activity id undefined issue fix
mohsin-tkxel Mar 22, 2023
a348d7f
Merge pull request #1644 from ActiveLearningStudio/feature/CUR-4720-f…
aqibnwaz Mar 22, 2023
1006475
Next/previous button hide in case no activity found
mohsin-tkxel Mar 24, 2023
accedb8
Refactoring of msteams code to work properly outside the msteams embe…
CptTony Mar 24, 2023
ed9aedc
Merge pull request #1646 from ActiveLearningStudio/bugfix/cur4731-mst…
muhammadqamar Mar 24, 2023
725a9b1
Changes to the size warning messaging
CptTony Mar 24, 2023
b98b2f0
Merge pull request #1647 from ActiveLearningStudio/bugfix/cur4731-mst…
CurrikiMike Mar 24, 2023
5cae4ea
add search enhancment
aqibnawaaz Mar 24, 2023
940a2ac
accept incoming changes
aqibnawaaz Mar 24, 2023
4c80229
fix search collapse
aqibnawaaz Mar 25, 2023
9d5e5e9
fix permission for search module
aqibnawaaz Mar 27, 2023
e7f6263
Merge pull request #1648 from ActiveLearningStudio/feature/search-enh…
muhammadqamar Mar 27, 2023
9893fcb
fix lti tool type for child org
aqibnawaaz Mar 27, 2023
9791862
Merge pull request #1649 from ActiveLearningStudio/feature/search-enh…
muhammadqamar Mar 27, 2023
67f6491
display activity
muhammadqamar Mar 27, 2023
e1ff2ec
Merge branch 'develop' of https://github.com/ActiveLearningStudio/Act…
muhammadqamar Mar 27, 2023
7691208
fix to summary routing
CptTony Mar 27, 2023
c42ed7f
Merge branch 'develop' into bugfix/msteams-summary
CptTony Mar 27, 2023
24774cd
Merge pull request #1650 from ActiveLearningStudio/bugfix/msteams-sum…
muhammadqamar Mar 27, 2023
ae679c1
bugfix missing prop
CptTony Mar 27, 2023
dc7735b
Merge pull request #1651 from ActiveLearningStudio/bugfix/msteams-sum…
CptTony Mar 27, 2023
8829cec
add redirect link for curriki help
aqibnawaaz Mar 27, 2023
4cc2333
Next/previous buttons on shared project enable/disable
mohsin-tkxel Mar 28, 2023
aaf68fb
Merge pull request #1645 from ActiveLearningStudio/feature/CUR-4720-f…
muhammadqamar Mar 28, 2023
0c1d2e6
change select steps
muhammadqamar Mar 28, 2023
6ceb745
Merge branch 'develop' of https://github.com/ActiveLearningStudio/Act…
muhammadqamar Mar 28, 2023
689df04
Merge pull request #1652 from ActiveLearningStudio/feature/cur-4734
aqibnwaz Mar 28, 2023
041eb2d
Changing min size messaging
CptTony Mar 28, 2023
afcd9b6
Merge pull request #1653 from ActiveLearningStudio/bugfix/msteams-sum…
CptTony Mar 28, 2023
7fb96ef
added footer links modal
muhammadqamar Mar 29, 2023
1f428eb
Merge pull request #1654 from ActiveLearningStudio/feature/add_footer…
aqibnwaz Mar 29, 2023
89e4f29
fix error
muhammadqamar Mar 29, 2023
81742cb
Merge branch 'develop' of https://github.com/ActiveLearningStudio/Act…
muhammadqamar Mar 29, 2023
a8b71f8
Merge pull request #1655 from ActiveLearningStudio/feature/cur-4734
aqibnwaz Mar 29, 2023
3c99511
Fixing reported regressions
CptTony Mar 31, 2023
e836900
Merge pull request #1657 from ActiveLearningStudio/bugfix/msteams_reg…
aqibnwaz Mar 31, 2023
3f985d6
Issue fix for filter projects & activities
mohsin-tkxel Apr 4, 2023
104a50b
Library preference filter added into admin panel projects/independent…
mohsin-tkxel Apr 5, 2023
cb2f25c
Merge pull request #1659 from ActiveLearningStudio/feature/CUR-4745-a…
aqibnwaz Apr 5, 2023
9e88df4
Project link on search fix, filters for projects and independent acti…
mohsin-tkxel Apr 7, 2023
a171d69
UI- Replace lti_tool_type_id with media_source_id inside LTI Tool Set…
aqibnawaaz Apr 7, 2023
0eecdb1
Merge pull request #1661 from ActiveLearningStudio/feature/CUR-4754
muhammadqamar Apr 7, 2023
75e33e2
Merge pull request #1660 from ActiveLearningStudio/feature/CUR-4745-a…
aqibnwaz Apr 7, 2023
edf4239
Changed team details edit ui
CptTony Apr 10, 2023
7c9f968
Merge pull request #1662 from ActiveLearningStudio/change/cur4715-tea…
mohsin-tkxel Apr 10, 2023
ba57a59
Admin panel Clear filter in projects and independent activities fix
mohsin-tkxel Apr 10, 2023
4ab59f3
Merge branch 'develop' of github.com:ActiveLearningStudio/ActiveLearn…
mohsin-tkxel Apr 10, 2023
113ce1e
Merge pull request #1663 from ActiveLearningStudio/feature/CUR-4745-a…
CptTony Apr 10, 2023
fbd3b23
Changing team details edit button alignment
CptTony Apr 11, 2023
5049955
Merge pull request #1664 from ActiveLearningStudio/change/cur4715-tea…
muhammadqamar Apr 11, 2023
e35a32c
Now hiding profile dropdown in currikistudio when opened through mste…
CptTony Apr 12, 2023
2fb83c1
Merge pull request #1665 from ActiveLearningStudio/changes/cur4764-ms…
CptTony Apr 12, 2023
b11f1f0
Fixing path matching for size warning message
CptTony Apr 12, 2023
35ab55f
Merge pull request #1666 from ActiveLearningStudio/changes/cur4764-ms…
CptTony Apr 12, 2023
c3ab4d8
Changing deeplinking warning messages
CptTony Apr 13, 2023
88be691
Merge pull request #1667 from ActiveLearningStudio/changes/cur4764-ms…
CptTony Apr 13, 2023
2d2caef
Changed deeplinking messaging
CptTony Apr 13, 2023
c2fd629
Merge pull request #1668 from ActiveLearningStudio/changes/cur4764-ms…
CptTony Apr 13, 2023
4af4e35
more changes
muhammadqamar Apr 17, 2023
905d8ca
Merge pull request #1670 from ActiveLearningStudio/feature/frmo_vide
aqibnwaz Apr 17, 2023
2d1dac0
dev to satge
muhammadqamar Apr 17, 2023
72c76cf
Clear all in library applied
mohsin-tkxel Apr 17, 2023
92f7528
Merge pull request #1671 from ActiveLearningStudio/feature/CUR-4755-c…
muhammadqamar Apr 17, 2023
7a07970
Merge pull request #1672 from ActiveLearningStudio/develop
aqibnwaz Apr 18, 2023
348611f
updated charts
yesidevelop Apr 19, 2023
4c00169
updated charts
yesidevelop Apr 19, 2023
78a2b10
updated image
yesidevelop Apr 19, 2023
9bd2655
Next/preview in Preview projet and inde-activities special char i nam…
mohsin-tkxel Apr 19, 2023
322f120
Merge pull request #1673 from ActiveLearningStudio/feature/CUR-4727-s…
aqibnwaz Apr 19, 2023
2db74bb
fix edit activity
muhammadqamar Apr 20, 2023
87bce50
Merge pull request #1674 from ActiveLearningStudio/feature/fix-my-pro…
mohsin-tkxel Apr 20, 2023
b081eab
Special chracter issue in activity creation fix
mohsin-tkxel Apr 26, 2023
749e2a2
Merge pull request #1675 from ActiveLearningStudio/feature/CUR-4727-s…
muhammadqamar Apr 26, 2023
1925339
Edit activity special chracter issue solve
mohsin-tkxel Apr 27, 2023
e683578
Changing authentication scheme for msteams
CptTony Apr 27, 2023
9733a38
Merge pull request #1678 from ActiveLearningStudio/feature/msteams-in…
CptTony Apr 27, 2023
4ac0512
Merge pull request #1677 from ActiveLearningStudio/feature/CUR-4727-s…
muhammadqamar Apr 27, 2023
6bae893
Changing authentication scheme to SSO/OBO flow
CptTony May 1, 2023
05db7e0
Merge pull request #1679 from ActiveLearningStudio/feature/msteams-in…
CptTony May 1, 2023
a0fd1ce
Auth flow now falls back to oauth method when obo is unavailable
CptTony May 8, 2023
ae7f346
Merge pull request #1681 from ActiveLearningStudio/feature/msteams-in…
CptTony May 8, 2023
9280691
Removing testing code
CptTony May 8, 2023
16e9d8e
Merge pull request #1682 from ActiveLearningStudio/feature/msteams-in…
CptTony May 8, 2023
c87974d
resolve conflicts
muhammadqamar May 17, 2023
ae0675f
added select btn
muhammadqamar May 18, 2023
7f4e2fc
Merge pull request #1684 from ActiveLearningStudio/feature/added-sele…
CptTony May 18, 2023
8cef023
Merge pull request #1685 from ActiveLearningStudio/develop
muhammadqamar May 18, 2023
0a74b57
change select btn position
muhammadqamar May 18, 2023
a925d8a
Merge pull request #1686 from ActiveLearningStudio/feature/added-sele…
CptTony May 18, 2023
379069c
added select btn (#1687)
muhammadqamar May 20, 2023
1fbf24e
Merge pull request #1688 from ActiveLearningStudio/develop
muhammadqamar May 22, 2023
2fa7392
Merge pull request #1689 from ActiveLearningStudio/feature/msteams-in…
CptTony May 23, 2023
335b4a1
Merge pull request #1690 from ActiveLearningStudio/bugfix/activity_lo…
CptTony May 23, 2023
5c1f1c4
Merge pull request #1691 from ActiveLearningStudio/msteams-staging-re…
CptTony May 23, 2023
4abdf8b
Merge branch 'staging' into may-release
CptTony May 26, 2023
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
59 changes: 26 additions & 33 deletions jenkins/Jenkinsfile.k8s
Original file line number Diff line number Diff line change
Expand Up @@ -3,49 +3,42 @@ node("currikidev") {
def tests

env.TAG = 'stage'
env.H5P_BRANCH = ''
if(env.BRANCH_NAME == "develop") {
env.H5P_BRANCH = 'develop'
} else if(env.BRANCH_NAME == "staging") {
env.H5P_BRANCH = 'staging'
} else if(env.BRANCH_NAME == "master") {
env.H5P_BRANCH = 'master'
}

stage('Clone repository') {


stage('Clone repository') {
sh "echo ${env.BRANCH_NAME}"
checkout scm
}
stage('Build image') {
app = docker.build("quay.io/curriki/api:${env.BUILD_NUMBER}", "-f Dockerfile.kube .")
}

stage('Test image') {
app.inside {
sh 'echo "Api Tests passed"'
}
}
stage('Push image') {
docker.withRegistry('https://quay.io', 'docker-private-credentials') {
app.push("${env.BUILD_NUMBER}")

checkout scm
}
stage('Build image') {
app = docker.build("quay.io/curriki/client:${env.BUILD_NUMBER}", "-f Dockerfile.kube .")
}

stage('Test image') {
app.inside {
sh 'echo "Client Tests passed"'
}
}
stage('Push image') {
docker.withRegistry('https://quay.io', 'docker-private-credentials') {
app.push("${env.BUILD_NUMBER}")
app.push("${env.TAG}")
}
}
stage('Deploy Helm') {
stage('Deploy Helm') {
echo 'Copy'

withCredentials([file(credentialsId: 'kubeconfig', variable: 'mySecretFile')]) {
sh "cp \$mySecretFile kconfig"

}
sh 'curl https://raw.githubusercontent.com/helm/helm/v3.7.0/scripts/get-helm-3 | DESIRED_VERSION="v3.7.0" bash'

sh 'helm upgrade --install curriki-client charts/curriki -f charts/staging.yaml --namespace staging --kubeconfig $(pwd)/kconfig'


}



}
Loading