Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5081 commits
Select commit Hold shift + click to select a range
05e9854
Merge pull request #2668 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 24, 2024
9a4f435
Merge pull request #2669 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 24, 2024
e4d915b
Merge branch 'Release-2024.29' into Release-2024.32
rshrirohit May 24, 2024
ac76edd
TD-3671 Implementing the new business rule
sherif-olaboye May 24, 2024
46866cd
TD-3897-DataService reference removed from the controller class. Serv…
Auldrin-Possa May 24, 2024
7c347db
TD-3901 Remove model email reference
sherif-olaboye May 28, 2024
7f94d89
Merge pull request #2662 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit May 28, 2024
db44c3e
Merge pull request #2665 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit May 28, 2024
6e077ec
Merge pull request #2671 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 28, 2024
482d16d
TD-3671 Changing the enrollment method id to 2 from 3 in group service
sherif-olaboye May 28, 2024
db05572
TD-3899-DataService reference removed from controller. Removed commen…
Auldrin-Possa May 28, 2024
d21547c
TD-3671 Reverting the earlier changes
sherif-olaboye May 28, 2024
0b46af1
TD-3902-Refactor controller - DataService reference removed from cont…
Auldrin-Possa May 28, 2024
c75419f
Merge pull request #2676 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 29, 2024
8062c30
Merge pull request #2677 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 29, 2024
4edea6f
TD-3900 LoginController - refactor
rshrirohit May 29, 2024
1cbdd65
TD-3904-Contrller refactor -DataService reference removed from the co…
Auldrin-Possa May 29, 2024
0032b3b
Merge pull request #2670 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 29, 2024
5e6e468
Merge branch 'Release-2024.29' into Release-2024.32
rshrirohit May 29, 2024
435aea8
TD-3903 RegisterAdminController - refactor (Controller-Service-Reposi…
sherif-olaboye May 29, 2024
4a12a69
Merge branch 'Release-2024.32' into Develop/Features/TD-3903-Register…
sherif-olaboye May 29, 2024
b087e5d
TD-3903 Resolving the error from creating PR
sherif-olaboye May 29, 2024
c715058
TD-3903 Remove reference that is not needed in User service
sherif-olaboye May 30, 2024
f4bb6d4
TD-3909 - Contrller refactor -DataService reference removed from the …
Auldrin-Possa May 30, 2024
a299f69
TD-3942 ViewDelegate Controller Refactor
rshrirohit May 30, 2024
90f0c2d
TD-3930 AllDelegatesController - refactor
rshrirohit May 30, 2024
f0e440c
Merge pull request #2678 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 31, 2024
5a7a07a
Merge pull request #2679 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 31, 2024
e3eaac2
Merge pull request #2681 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit May 31, 2024
b94b362
Merge pull request #2682 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit May 31, 2024
3f246f8
TD-3940 - Contrller refactor -DataService reference removed from the …
Auldrin-Possa May 31, 2024
9825051
TD-3939-Contrller refactor -DataService reference removed from the co…
Auldrin-Possa May 31, 2024
8e88148
TD-3937-Contrller refactor -DataService reference removed from the co…
Auldrin-Possa May 31, 2024
0998b17
TD-3671 Changing of enrolment date when the delegate re-enrol
sherif-olaboye May 31, 2024
c7a512a
Merge pull request #2685 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 3, 2024
6c55611
Merge pull request #2686 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 3, 2024
ad90f3b
Merge pull request #2687 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 3, 2024
c427e6d
Merge branch 'Release-2024.32' into Develop/Features/TD-3903-Register…
sherif-olaboye Jun 3, 2024
70ff0cb
TD-3903 Resolving branch conflict
sherif-olaboye Jun 3, 2024
91041f4
TD-3903 Resolving the test fail
sherif-olaboye Jun 3, 2024
8b50e50
TD-3903 Refactor the branch
sherif-olaboye Jun 3, 2024
7d48aaa
Merge pull request #2688 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 3, 2024
89903c5
Merge branch 'UAT' into Release-2024.32
rshrirohit Jun 3, 2024
51acdc8
TD-3938-Contrller refactor -DataService reference removed from the co…
Auldrin-Possa Jun 3, 2024
9b7f13e
Merge pull request #2680 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Jun 4, 2024
633ceb0
Merge branch 'Release-2024.32' into Develop/Fixes/TD-3930-AllDelegate…
rshrirohit Jun 4, 2024
589cc3a
Merge pull request #2683 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 4, 2024
fa94dd6
TD-3941-Contrller refactor -DataService reference removed from the co…
Auldrin-Possa Jun 4, 2024
8fbc741
Removed Commented code
rshrirohit Jun 4, 2024
dedd4b3
Removed Commented code
rshrirohit Jun 4, 2024
2181a16
Merge pull request #2689 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 4, 2024
cd5c3fc
Merge pull request #2690 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 4, 2024
c25a84e
TD-4218 'Last access' date and time shouldn't show on the learner rec…
sherif-olaboye Jun 4, 2024
e2d1655
TD-4218 Resolving the test failed issue
sherif-olaboye Jun 4, 2024
09f048b
TD-4218 Resolving the test failed
sherif-olaboye Jun 4, 2024
39570ba
TD-4218 Changing the Enrolled by Admin
sherif-olaboye Jun 4, 2024
1fed42c
TD-3936-Contrller refactor -DataService reference removed from the co…
Auldrin-Possa Jun 4, 2024
d77f528
Merge pull request #2691 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 4, 2024
f6ac84d
Merge branch 'Release-2024.29' into Release-2024.32
rshrirohit Jun 4, 2024
91d66ec
TD-3905-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 4, 2024
b18eaef
TD-3931-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 4, 2024
b6fb19a
Merge pull request #2693 from TechnologyEnhancedLearning/Release-2024.29
rshrirohit Jun 5, 2024
e7b4175
Merge branch 'Release-2024.29' into Release-2024.32
rshrirohit Jun 5, 2024
a168d2a
Merge pull request #2692 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 5, 2024
b72e356
Merge pull request #2694 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 5, 2024
b37b51b
Merge pull request #2695 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 5, 2024
ff08a98
TD-3906 RegisterDelegateByCentreController - refactor (Controller-Ser…
sherif-olaboye Jun 5, 2024
d0d101b
TD-3929-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 5, 2024
7d74e30
TD-3926-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 5, 2024
370605a
Merge pull request #2696 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Jun 6, 2024
e60209c
Merge pull request #2697 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 6, 2024
8813e05
Merge pull request #2698 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 6, 2024
c954d0d
TD-3925-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 6, 2024
33cc39a
TD-3924-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 6, 2024
658f085
TD-3922-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 6, 2024
5d4c8ee
Merge pull request #2700 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 6, 2024
a1705f8
TD-3923 DashboardController - refactor
rshrirohit Jun 6, 2024
e25fbf2
TD-4221 'Confirm results' link is not showing for few accounts on 'Su…
sherif-olaboye Jun 6, 2024
6f2f49a
TD-3907 RegisterInternalAdminController - refactor
rshrirohit Jun 6, 2024
e6a5757
TD-4221 'Confirm results' link is not showing for few accounts on 'Su…
sherif-olaboye Jun 6, 2024
d066df3
TD-4221 'Confirm results' link is not showing for few accounts on 'Su…
sherif-olaboye Jun 6, 2024
84fb660
TD-3921-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 6, 2024
0342c01
Merge pull request #2701 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 10, 2024
9913802
Merge pull request #2702 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 10, 2024
ce36bf4
TD-3920-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 10, 2024
7cc39fb
TD-3914-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 10, 2024
def0fa3
Removed commented code
Auldrin-Possa Jun 10, 2024
2a75dc7
TD-4224- The asp-action is updated with the correct controller name
Auldrin-Possa Jun 10, 2024
b12e913
Merge pull request #2705 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 11, 2024
5078651
TD-4222-SupervisorEmail property added to hold supervisor email address
Auldrin-Possa Jun 11, 2024
0e0c241
Merge branch 'Release-2024.29-Hotfix' into Release-2024.32
rshrirohit Jun 11, 2024
1d51d82
Merge branch 'Release-2024.32' into Develop/Fixes/TD-3923-DashboardCo…
Auldrin-Possa Jun 11, 2024
0a382e5
Merge branch 'Release-2024.32' into Develop/Fixes/TD-3907-RegisterInt…
rshrirohit Jun 11, 2024
5d97543
Merge branch 'Release-2024.32' into Develop/feature/TD-3921-Registrat…
Auldrin-Possa Jun 11, 2024
45abf36
Merge branch 'Release-2024.32' into Develop/feature/TD-3920-Configura…
Auldrin-Possa Jun 11, 2024
abcf7b9
Merge branch 'Release-2024.32' into Develop/feature/TD-3914-CentresCo…
Auldrin-Possa Jun 11, 2024
0a70e41
Merge branch 'Release-2024.32' into Develop/Fix/TD-4224-Add-AllFramew…
Auldrin-Possa Jun 11, 2024
e1c4167
Merge pull request #2703 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 12, 2024
5c44e74
Merge pull request #2706 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 12, 2024
f1bc3f4
Merge pull request #2708 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 12, 2024
ce6e2b2
Merge pull request #2710 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jun 12, 2024
52444ae
Merge branch 'Release-2024.32' into Develop/feature/TD-3914-CentresCo…
Auldrin-Possa Jun 12, 2024
a4d19de
Supervisor name formatting
Auldrin-Possa Jun 12, 2024
8f30980
Merge branch 'Release-2024.32' into Develop/Fixes/TD-3907-RegisterInt…
rshrirohit Jun 12, 2024
5ccb6e1
Merge pull request #2709 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 12, 2024
72e8140
Merge pull request #2713 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jun 12, 2024
971facc
TD-3946 Helper/Service filter/View component/View model - refactor (S…
sherif-olaboye Jun 12, 2024
a5d9895
TD-3918 RequestSupportTicketController - refactor (Controller-Service…
sherif-olaboye Jun 12, 2024
7364819
Merge pull request #2704 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 13, 2024
2e722eb
Merge pull request #2714 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Jun 13, 2024
3148933
Merge remote-tracking branch 'origin/Release-2024.32' into Develop/Fe…
sherif-olaboye Jun 13, 2024
1180c43
Merge branch 'Release-2024.32' into Develop/Features/TD-3918-RequestS…
sherif-olaboye Jun 13, 2024
6ebf69c
Merge branch 'Develop/Features/TD-3918-RequestSupportTicketController…
sherif-olaboye Jun 13, 2024
4abfcad
TD-3918 Resolving merge conflict
sherif-olaboye Jun 13, 2024
f10ea1c
Merge pull request #2715 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Jun 13, 2024
02cde02
TD-3919-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 13, 2024
a085ed8
Merge branch 'Release-2024.29-Hotfix' into Release-2024.32
rshrirohit Jun 13, 2024
b450a43
TD-3913-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 13, 2024
ce7da95
TD-3915-Controller refactor -DataService reference removed from the c…
Auldrin-Possa Jun 13, 2024
708d14e
TD-3917 SupervisorController - refactor (Controller-Service-Repositor…
sherif-olaboye Jun 14, 2024
c59cba8
TD-3916 UsersController - refactor (Controller-Service-Repository pat…
sherif-olaboye Jun 14, 2024
1f1e2bf
Merge pull request #2716 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 14, 2024
5b346aa
Merge branch 'Release-2024.32' into Develop/feature/TD-3913-AdminAcco…
Auldrin-Possa Jun 14, 2024
c2f181f
Merge pull request #2719 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Jun 14, 2024
855cca2
Merge pull request #2717 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 14, 2024
1f3e655
Merge branch 'Release-2024.32' into Develop/feature/TD-3915-Delegates…
Auldrin-Possa Jun 14, 2024
25bffe8
Merge pull request #2718 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jun 14, 2024
90aed62
TD-4223-LastAccessDateSetToNullForNewCourses
rshrirohit Jun 14, 2024
fc4c3ca
Merge branch 'Release-2024.32' into Develop/Features/TD-3916-UsersCon…
sherif-olaboye Jun 14, 2024
018ed27
TD-3916 Resolving merge conflicts
sherif-olaboye Jun 17, 2024
ac826d2
TD-4227- DataService method call corrected
Auldrin-Possa Jun 17, 2024
ab84239
TD-4232- Javascript code removed from the view.
Auldrin-Possa Jun 17, 2024
7df95f9
Merge pull request #2720 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Jun 18, 2024
a189f47
Merge pull request #2721 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 18, 2024
29bbb61
Merge pull request #2722 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jun 18, 2024
31427b8
Merge branch 'Release-2024.29-Hotfix' into Release-2024.32
rshrirohit Jun 18, 2024
cfea661
TD-4238 Launching few courses from 'Current activities' or from 'Cour…
sherif-olaboye Jun 18, 2024
0f25807
TD-4254 Groups Filter Added To View Model
rshrirohit Jun 18, 2024
d16c1ba
Merge pull request #2725 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 19, 2024
698ac7b
Merge branch 'Release-2024.29-Hotfix' into Release-2024.32
rshrirohit Jun 19, 2024
cb5d0ad
Merge branch 'Release-2024.32' into Develop/Fix/TD-4232-Course-Certif…
Auldrin-Possa Jun 20, 2024
a150940
Typescript code added to show/hide download button
Auldrin-Possa Jun 20, 2024
a44f73d
TD-4269 Issue with the 'Enrolment method' and 'Last access date' when…
sherif-olaboye Jun 21, 2024
1857cea
Merge pull request #2723 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jun 24, 2024
3dd2e02
Merge pull request #2728 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jun 24, 2024
f828fce
TD-4134 Issue adding 'Digital Learning Solutions-Page no longer avail…
sherif-olaboye Jun 24, 2024
4bd33c4
Merge branch 'Release-2024.29-Hotfix' into Release-2024.32
rshrirohit Jun 24, 2024
3d4257f
TD-4279- enrolment method id added to update statement.
Auldrin-Possa Jun 24, 2024
89289ea
TD-4277- Added restriction to add archived courses
Auldrin-Possa Jun 25, 2024
1f4430d
Test case updated.
Auldrin-Possa Jun 25, 2024
579645a
TD-4137 'Switch application' navigation link should be removed from '…
sherif-olaboye Jun 25, 2024
7a7f300
TD-4207 Clicking browser back button after deleting the 'Delegate Gro…
sherif-olaboye Jun 26, 2024
ce39364
TD-4223 Changes in Submitted time and last access date
rshrirohit Jun 27, 2024
037f9ef
TD-2364- Added VerifyLinkDlsAccount(+) action method to verify dls ac…
Auldrin-Possa Jun 27, 2024
5a7ef92
TD-4244 Added hidden in learning portal added for inactive courses as…
rshrirohit Jun 27, 2024
4fc773d
TD-4136 Removed Extra Text From Feedback Submit Page
rshrirohit Jun 27, 2024
66c20bd
Merge pull request #2729 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 1, 2024
a2522dc
Merge pull request #2730 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 1, 2024
7e0584f
Merge pull request #2731 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 1, 2024
ddba990
Merge pull request #2733 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 1, 2024
e4bcd8e
Merge pull request #2734 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 1, 2024
f499739
Merge pull request #2735 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 1, 2024
e07d496
Merge pull request #2736 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 1, 2024
0fbbe4c
Merge pull request #2737 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 1, 2024
22f3007
TD-3939- fixed sql query column alias space issue
Auldrin-Possa Jul 3, 2024
8c51508
Merge remote-tracking branch 'origin/Release-2024.32' into Develop/Fi…
sherif-olaboye Jul 5, 2024
a49090b
TD-4320-Supervisor email added to manage supervior list
Auldrin-Possa Jul 5, 2024
14b6583
Merge remote-tracking branch 'origin/Release-2024.32' into Develop/Fi…
sherif-olaboye Jul 5, 2024
0dec788
'Switch application' navigation link should be removed from 'Give pag…
sherif-olaboye Jul 8, 2024
6202973
TD-4238 Launching few courses from 'Current activities' or from 'Cour…
sherif-olaboye Jul 9, 2024
d63b952
TD-4233- competency flags added to optional competencies
Auldrin-Possa Jul 9, 2024
2faa41a
TD-4334 Issue with 'Complete by' date not showing on self assessment …
sherif-olaboye Jul 10, 2024
3b50338
Merge branch 'Release-2024.29-Hotfix' into Release-2024.32
rshrirohit Jul 11, 2024
2482ac7
Merge pull request #2732 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 11, 2024
db2b3bc
Merge pull request #2739 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 11, 2024
0942655
Merge pull request #2740 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 11, 2024
1c2886a
Merge pull request #2741 from TechnologyEnhancedLearning/Develop/feat…
rshrirohit Jul 11, 2024
a21da3e
Merge pull request #2742 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 11, 2024
69970db
Merge branch 'Release-2024.29-Hotfix' into Release-2024.32
rshrirohit Jul 11, 2024
d48dd4b
TD-4339- null/empty check added for centre name
Auldrin-Possa Jul 11, 2024
a27f116
TD-4223- stored proc, table constraint and code updated to use GetDate()
Auldrin-Possa Jul 15, 2024
538ec14
TD-4334 Resolving enroling course from supervisor failing sometimes
sherif-olaboye Jul 15, 2024
d99e78a
TD-4269 Changing Text To Enrolled By Supervisor
rshrirohit Jul 16, 2024
9f8636c
Merge pull request #2744 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 17, 2024
ec45563
Merge pull request #2745 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 17, 2024
1239067
Merge pull request #2746 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 17, 2024
5c2939e
TD-4206 Mismatch of count of courses seeing on 'Centre Dashboard' whe…
sherif-olaboye Jul 17, 2024
2492e72
TD-4136 Removing Label For Guest User
rshrirohit Jul 17, 2024
f2b39c2
TD-4370-Email format validation added in sql query
Auldrin-Possa Jul 17, 2024
5663316
Email format validation added with Coalesce() in the sql query
Auldrin-Possa Jul 18, 2024
484237b
TD-4269 Enrolment method changed to Enrolled by Admin/Supervisor ever…
rshrirohit Jul 19, 2024
33570c6
TD-4223- passed blank last access date when a new delegate enrolled o…
Auldrin-Possa Jul 22, 2024
b3c4a45
TD-4223- test cases updated for enrol delegate on group courses.
Auldrin-Possa Jul 22, 2024
8dcea75
Merge branch 'Release-2024.29-Hotfix' into Release-2024.32
rshrirohit Jul 22, 2024
277aa11
Merge pull request #2751 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 22, 2024
2d700ed
Merge pull request #2750 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 22, 2024
882a811
TD-4243 Few 'add on' courses showing on 'Learning Portal' not showing…
sherif-olaboye Jul 22, 2024
f426116
TD-4376 Issue with not trimming of the trailing/leading end spaces on…
sherif-olaboye Jul 23, 2024
38132f1
TD-4354 Converting Bytes To GB and MB on manage centre screens
rshrirohit Jul 24, 2024
909abb0
Merge branch 'Release-2024.29-Hotfix' into Release-2024.32
rshrirohit Jul 24, 2024
9e1fbe7
Merge pull request #2743 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 24, 2024
3e1cf87
Merge pull request #2747 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 24, 2024
0d9fc74
Merge pull request #2748 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 24, 2024
790276d
Merge pull request #2749 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Jul 24, 2024
cf20e9c
Merge pull request #2754 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 24, 2024
e6e21e5
Merge pull request #2755 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Jul 24, 2024
6060d13
Merge pull request #2756 from TechnologyEnhancedLearning/Release-2024…
rshrirohit Jul 25, 2024
a22510d
Merge branch 'master' into Release-2024.32
rshrirohit Jul 25, 2024
858894d
TD-4436 - removed FirstSubmittedTime from UpdateProgressSupervisorAnd…
Auldrin-Possa Jul 26, 2024
d950288
TD-4354 Converting MB into GB for per delegate upload space
rshrirohit Aug 1, 2024
a3df63f
TD-4467 Reverting the changes made in ClockUtility
rshrirohit Aug 2, 2024
b93bc6d
Merge pull request #2758 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Aug 5, 2024
3997d37
Merge pull request #2765 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 5, 2024
6c54f88
Merge pull request #2763 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 5, 2024
e15940e
Merge branch 'Release-2024.29-Hotfix-2.0' into Release-2024.32
rshrirohit Aug 5, 2024
93ee220
TD-4445-customisation validation added for self enrolment
Auldrin-Possa Aug 5, 2024
8c6196c
Merge pull request #2769 from TechnologyEnhancedLearning/Release-2024…
rshrirohit Aug 7, 2024
60bc596
Merge branch 'master' into Release-2024.32
rshrirohit Aug 7, 2024
515f0ce
Merge pull request #2724 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 13, 2024
827693c
Merge pull request #2767 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Aug 13, 2024
1dd34d0
Merge pull request #2753 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 16, 2024
b15f627
TD-4436- Date saved as utc DateTime and retrived date as local (time …
Auldrin-Possa Aug 16, 2024
a2c5481
TD-4535 Changed the column for storing email in centres table
rshrirohit Aug 19, 2024
53c570f
Merge pull request #2781 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 19, 2024
3217477
TD-4238 Resolving current activities showing back link as ‘Completed …
sherif-olaboye Aug 19, 2024
21f2fe1
TD-4436- Removed folder references
Auldrin-Possa Aug 21, 2024
eb85659
Merge pull request #2783 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 21, 2024
572af95
Merge pull request #2780 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Aug 21, 2024
4f6847a
Merge remote-tracking branch 'origin/Release-2024.32' into Develop/Fe…
sherif-olaboye Aug 21, 2024
74fab62
TD-4436-DateTime convertion removed.
Auldrin-Possa Aug 21, 2024
f1e2b05
TD-4092 Changing 404 code to 401
sherif-olaboye Aug 21, 2024
d9faf16
Merge pull request #2657 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Aug 21, 2024
b31623d
Merge pull request #2789 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Aug 21, 2024
3ad42ef
TD-4436- converted utc date to local date time using NodaTime package
Auldrin-Possa Aug 22, 2024
c373338
Merge pull request #2792 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Aug 22, 2024
27fc65d
TD-4240 Changing Privacy Data Link
rshrirohit Aug 23, 2024
3d2c41e
TD-4601 AppSettings Changes For SSO and Freshdesk
rshrirohit Aug 23, 2024
690c64b
TD-4243 Few 'add on' courses showing on 'Learning Portal' not showing…
sherif-olaboye Aug 28, 2024
7464148
Merge pull request #2793 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 29, 2024
913c148
Merge pull request #2794 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Aug 29, 2024
fa929ea
TD-4436 -stored proc modified to update completeby date and superviso…
Auldrin-Possa Aug 29, 2024
d82983b
Merge pull request #2798 from TechnologyEnhancedLearning/Develop/Fix/…
rshrirohit Aug 30, 2024
131eebf
Merge branch 'Release-2024.32' into Develop/Fixes/TD-4243-Few'addon'c…
rshrirohit Sep 2, 2024
b10beb2
Update Resources.resx
rshrirohit Sep 2, 2024
335495b
Merge pull request #2797 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Sep 2, 2024
5e5ccec
TD-4243 Resolving duplication of courses in enrol activity, available…
sherif-olaboye Sep 3, 2024
429a2ea
Merge pull request #2809 from TechnologyEnhancedLearning/Develop/Fixe…
rshrirohit Sep 4, 2024
b1b4473
TD-4092 Resolving certificate showing 403 forbidden error
sherif-olaboye Sep 4, 2024
7df765c
Merge pull request #2815 from TechnologyEnhancedLearning/Develop/Feat…
rshrirohit Sep 5, 2024
59d481c
Merge pull request #2824 from TechnologyEnhancedLearning/Release-2024.32
rshrirohit Sep 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .gitguardian.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
secret:
ignored-matches:
- match: 2cd876d916d5d06984da35b99466857b4e9b19ab643b0e2eb15d4faf29f3ba44
name: Generic High Entropy Secret - DigitalLearningSolutions.Data.Migrations/202310131115_AddFreshdeskApikeyConfigValue.cs
version: 2
40 changes: 40 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# To get started with Dependabot version updates, you'll need to specify which
# package ecosystems to update and where the package manifests are located.
# Please see the documentation for all configuration options:
# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates

version: 2
updates:
- package-ecosystem: "nuget"
directory: "/" # Location of package manifests
schedule:
interval: "daily"
open-pull-requests-limit: 10
target-branch: "Automatic_version_update_dependabot"
ignore:
# Ignore updates to packages that start with 'Wildcards'
- dependency-name: "Microsoft.FeatureManagement.AspNetCore*"
# Ignore some updates to the package
- dependency-name: "Microsoft.VisualStudio.Web.CodeGeneration.Design"
versions: [">7.0.0"]
- dependency-name: "Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation"
versions: [">7.0.0"]
- dependency-name: "Microsoft.AspNetCore.Mvc.Testing"
versions: [">7.0.0"]
- dependency-name: "Selenium.WebDriver.ChromeDriver"
versions: ">=113.0.5672.1278" # Recommended version
# For all packages, ignore all patch updates
#- dependency-name: "*"
# update-types: ["version-update:semver-patch"]

# Configuration for npm
- package-ecosystem: "npm"
directory: "/DigitalLearningSolutions.Web/" # Location of package manifests
schedule:
interval: "daily"
target-branch: "Automatic_version_update_dependabot"
# - "dependencies"
open-pull-requests-limit: 7
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]
13 changes: 7 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
### JIRA link
_HEEDLS-XXXX_
_DLSV2-XXXX_

### Description
_Describe what has changed and how that will affect the app. If relevant, add references to the resources you used. Use this as your opportunity to highlight anything odd and give people context around particular decisions._
Expand All @@ -12,10 +12,11 @@ _Attach screenshots on mobile, tablet and desktop._
(Leave tasks unticked if they haven't been appropriate for your ticket.)

I have:
- [ ] Run the formatter and made sure there are no IDE errors.
- [ ] Run the formatter and made sure there are no IDE errors (see [info on Text Editor settings](https://hee-tis.atlassian.net/wiki/spaces/TP/pages/3546185813/DLS+Dev+Process) to avoid whitespace changes)
- [ ] Written tests for the changes (accessibility tests, unit tests for controller, data services, services, view models, etc)
- [ ] Manually tested my work with and without JavaScript. Full manual testing guidelines can be found here: https://softwiretech.atlassian.net/wiki/spaces/HEE/pages/6703648740/Testing
- [ ] Updated/added documentation in Swiki and/or Readme. Links (if any) are below:
- [ ] Manually tested my work with and without JavaScript
- [ ] Tested any Views or partials created or changed with [Wave Chrome plugin](https://chrome.google.com/webstore/detail/wave-evaluation-tool/jbbplnpkjmmeebjpijfedlgcdilocofh/related) and addressed any valid accessibility issues
- [ ] Updated/added documentation in [Confluence](https://hee-tis.atlassian.net/wiki/spaces/TP/pages/3546939432/DLS+Code) and/or [GitHub Readme](https://github.com/TechnologyEnhancedLearning/DLSV2/blob/master/README.md). List of documentation links added/changed:
- [doc_1_here](link_1_here)
- [ ] Updated my Jira ticket with information about other parts of the system that were touched as part of the MR and have to be sanity tested to ensure nothing’s broken.
- [ ] Scanned over my own MR to ensure everything is as expected.
- [ ] Updated my Jira ticket with information about other parts of the system that were touched as part of the MR and have to be sanity tested to ensure nothing’s broken
- [ ] Scanned over my pull request in GitHub and addressed any warnings from the GitHub Build and Test checks.
141 changes: 141 additions & 0 deletions .github/workflows/build-and-deploy-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
name: Deploy DLS DEV to IIS

env:
# set apppool and site name from IIS
AppPoolName : dlsweb-dev
SiteName : 'dls-dev'
# set to site files. In this case, the part of the path after E:/web/
SitePath : dls-dev
DOTNET_INSTALL_DIR: '~/AppData/Local/Microsoft/dotnet'
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
on:
push:
branches:
- 'DEV'
workflow_dispatch:

jobs:
deploy-to-dev:

runs-on: self-hosted

steps:
- uses: actions/checkout@v4

- name: Setup .NET Core SDK 6.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 20

- name: Add TechnologyEnhancedLearning as nuget package source
run: |
$nugetSources = dotnet nuget list source | Out-String;
if($nugetSources -like "*TechnologyEnhancedLearning*")
{
# Update the source (in case PAT has been updated)
dotnet nuget update source TechnologyEnhancedLearning --source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
}
else
{
# Add the source
dotnet nuget add source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --name TechnologyEnhancedLearning --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
}
- name: Dotnet publish
run: |
dotnet publish DigitalLearningSolutions.sln -c Release -o E:/web/${{env.SitePath}}-NEW

- name: Copy app_offline and web config to publish folder
run: |
Copy-Item E:/web/Offline/app_offline.htm E:/web/${{env.SitePath}}-NEW -Recurse -Force;
Copy-Item E:/web/Offline/app_offline.htm E:/web/${{env.SitePath}} -Recurse -Force;
if (Test-Path -Path E:/web/${{env.SitePath}})
{
Remove-Item -Path 'E:/web/${{env.SitePath}}-NEW/web.config' -Force;
Copy-Item E:/web/${{env.SitePath}}/web.config E:/web/${{env.SitePath}}-NEW -Recurse -Force;
}
if (Test-Path -Path E:/web/${{env.SitePath}}-PREVIOUS){
Remove-Item -LiteralPath 'E:/web/${{env.SitePath}}-PREVIOUS' -Force -Recurse
}

- name: Sleep for 5 seconds
run: Start-Sleep -s 5

- name: Switch deployment and published folders restarting apppool/webapp if necessary
run: |

Import-Module WebAdministration;
$currentRetry = 1;
$backupRetry = 1;
$success = $false;
$backupSuccess = $false;
do{
echo "Attempting folder rename $currentRetry"
try {
Rename-Item -Path 'E:/web/${{env.SitePath}}' -NewName '${{env.SitePath}}-PREVIOUS'
Rename-Item -Path 'E:/web/${{env.SitePath}}-NEW' -NewName '${{env.SitePath}}'
$success = $true;
}
catch {
echo "Rename failed due to following Catch error:`n"
echo $PSItem.Exception.Message
echo "`n"
Start-Sleep -s 2
$currentRetry = $currentRetry + 1;
}
finally {
if ($currentRetry -ge 10) {
echo "Rename keeps failing; restarting AppPool/Site as last resort`n"
echo "Attempting to restart AppPool`n"
do{
$status = Get-WebAppPoolState -name '${{env.AppPoolName}}'
if ($status.Value -eq "Stopped") {
start-WebAppPool ${{env.AppPoolName}}
echo "AppPool restarted`n---------`n"
$backupSuccess = $true;
}
else {
if ($backupRetry -ge 10) {
throw "AppPool restart keeps failing."
}
echo "AppPool not stopped yet; Re-attempt #$backupRetry"
Start-Sleep -s 10
$backupRetry = $backupRetry + 1;
}
}
while (!$backupSuccess -and $backupRetry -le 10)
$backupRetry = 1;
$backupSuccess = $false;
echo "Attempting to restart Website`n"
do{
$status = Get-WebsiteState -name '${{env.SiteName}}'
if ($status.Value -eq "Stopped") {
start-iissite ${{env.SiteName}}
echo "Website restarted`n---------`n"
$backupSuccess = $true;
}
else {
if ($backupRetry -ge 10) {
throw "Website restart keeps failing. Please look into Server"
}
echo "Website not stopped yet; Re-attempt #$backupRetry"
Start-Sleep -s 10
$backupRetry = $backupRetry + 1;
}
}
while (!$backupSuccess -and $backupRetry -le 10)
}
}
}
while (!$success -and $currentRetry -le 10)

- name: Remove Offline and remove previous deployment folder
run: |
if (Test-Path -Path 'E:/web/${{env.SitePath}}-PREVIOUS')
{
Remove-Item -LiteralPath 'E:/web/${{env.SitePath}}-PREVIOUS' -Force -Recurse
}
Remove-Item 'E:/web/${{env.SitePath}}/app_offline.htm' -Force
135 changes: 135 additions & 0 deletions .github/workflows/build-and-deploy-production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
name: Deploy DLS Production to IIS

env:
# set apppool and site name from IIS
AppPoolName : dlsweb-v2
SiteName : 'v2'
# set to site files. In this case, the part of the path after E:/web/
SitePath : dlsweb-v2
DOTNET_INSTALL_DIR: '~/AppData/Local/Microsoft/dotnet'
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
on:
workflow_dispatch:

jobs:
deploy-to-production:

runs-on: self-hosted

steps:
- uses: actions/checkout@v4

- name: Setup .NET Core SDK 6.0
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
- name: Setup node
uses: actions/setup-node@v4
with:
node-version: 20

- name: Add TechnologyEnhancedLearning as nuget package source
run: |
$nugetSources = dotnet nuget list source | Out-String;
if($nugetSources -like "*TechnologyEnhancedLearning*")
{
# Update the source (in case PAT has been updated)
dotnet nuget update source TechnologyEnhancedLearning --source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
}
else
{
# Add the source
dotnet nuget add source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --name TechnologyEnhancedLearning --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text
}

- name: Dotnet publish
run: |
dotnet publish DigitalLearningSolutions.sln -c Release -o E:/web/${{env.SitePath}}-NEW

- name: Copy app_offline and web config to publish folder
run: |
Copy-Item E:/web/Offline/app_offline.htm E:/web/${{env.SitePath}}-NEW -Recurse -Force;
Copy-Item E:/web/Offline/app_offline.htm E:/web/${{env.SitePath}} -Recurse -Force;
if (Test-Path -Path E:/web/${{env.SitePath}})
{
Remove-Item -Path 'E:/web/${{env.SitePath}}-NEW/web.config' -Force;
Copy-Item E:/web/${{env.SitePath}}/web.config E:/web/${{env.SitePath}}-NEW -Recurse -Force;
}
if (Test-Path -Path E:/web/${{env.SitePath}}-PREVIOUS){
Remove-Item -LiteralPath 'E:/web/${{env.SitePath}}-PREVIOUS' -Force -Recurse
}

- name: Sleep for 5 seconds
run: Start-Sleep -s 5

- name: Switch deployment and published folders restarting apppool/webapp if necessary
run: |

Import-Module WebAdministration;
$currentRetry = 1;
$backupRetry = 1;
$success = $false;
$backupSuccess = $false;
do{
echo "Attempting folder rename $currentRetry"
try {
Rename-Item -Path 'E:/web/${{env.SitePath}}' -NewName '${{env.SitePath}}-PREVIOUS'
Rename-Item -Path 'E:/web/${{env.SitePath}}-NEW' -NewName '${{env.SitePath}}'
$success = $true;
}
catch {
echo "Rename failed due to following Catch error:`n"
echo $PSItem.Exception.Message
echo "`n"
Start-Sleep -s 2
$currentRetry = $currentRetry + 1;
}
finally {
if ($currentRetry -ge 10) {
echo "Rename keeps failing; restarting AppPool/Site as last resort`n"
echo "Attempting to restart AppPool`n"
do{
$status = Get-WebAppPoolState -name '${{env.AppPoolName}}'
if ($status.Value -eq "Stopped") {
start-WebAppPool ${{env.AppPoolName}}
echo "AppPool restarted`n---------`n"
$backupSuccess = $true;
}
else {
if ($backupRetry -ge 10) {
throw "AppPool restart keeps failing."
}
echo "AppPool not stopped yet; Re-attempt #$backupRetry"
Start-Sleep -s 10
$backupRetry = $backupRetry + 1;
}
}
while (!$backupSuccess -and $backupRetry -le 10)
$backupRetry = 1;
$backupSuccess = $false;
echo "Attempting to restart Website`n"
do{
$status = Get-WebsiteState -name '${{env.SiteName}}'
if ($status.Value -eq "Stopped") {
start-iissite ${{env.SiteName}}
echo "Website restarted`n---------`n"
$backupSuccess = $true;
}
else {
if ($backupRetry -ge 10) {
throw "Website restart keeps failing. Please look into Server"
}
echo "Website not stopped yet; Re-attempt #$backupRetry"
Start-Sleep -s 10
$backupRetry = $backupRetry + 1;
}
}
while (!$backupSuccess -and $backupRetry -le 10)
}
}
}
while (!$success -and $currentRetry -le 10)

- name: Remove Offline and remove previous deployment folder
run: |
Remove-Item 'E:/web/${{env.SitePath}}/app_offline.htm' -Force
Loading