mrlan
/
LRR
3
0
Fork 2
Code Issues Pull Requests 7 Projects Releases Wiki Activity
427 Commits
62 Branches
1 Tag
7.1 MiB
Commit Graph

427 Commits (6b1d41a02d695f311ea5ed5abef675392b88cfd8)

Author SHA1 Message Date
Lan Hui f004756f3d Merge branch 'niweicong-bug-458&459' of http://121.4.94.30:3000/mrlan/LRR into niweicong-bug-458 2022-06-17 22:30:50 +08:00
Lan Hui 69a2da76c7 Merge branch 'master' of http://121.4.94.30:3000/mrlan/LRR 2022-06-17 22:24:03 +08:00
mrlan b0f1f313d6 Merge pull request 'pull request from SPM-Zayid-468 , Adding Filters On Course Search' (#38) from SPM-Zayid-468 into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/38
 2022-06-17 22:22:57 +08:00
Lan Hui dd87db0c3c Merge branch 'master' of http://121.4.94.30:3000/mrlan/LRR 2022-06-17 22:13:20 +08:00
mrlan f0109db692 Merge pull request 'BUG23 FIXED' (#37) from Bug23-Haji into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/37
 2022-06-17 22:12:51 +08:00
Lan Hui 38d398a693 Merge branch 'Hui-NoEmail' 2022-06-17 22:08:29 +08:00
Lan Hui 1fc6061e19 nothing to say 2022-06-17 22:02:40 +08:00
Lan Hui 8ecab98e21 git reset HEAD^ twice. 2022-06-17 21:58:14 +08:00
倪伟聪 4624186f50 Merge branch 'master' into niweicong-bug-458&459 2022-06-14 13:58:05 +08:00
倪伟聪 5c34bde3ca 上传文件至 '' 2022-06-14 13:57:49 +08:00
倪伟聪 a9d9f4a345 上传文件至 '' 2022-06-14 13:55:47 +08:00
倪伟聪 1c479d525b 更新 'Courses.php' 2022-06-14 13:54:41 +08:00
倪伟聪 639695bfb9 Merge pull request '上传文件至 ''' (#39) from niweicong-bug-458&459 into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/39
 2022-06-14 13:47:32 +08:00
倪伟聪 3f302822e2 上传文件至 '' 2022-06-14 13:37:44 +08:00
SayidCali jamac bd8062502b show current academic courses and order them 
Implemented filters for the following:
Case 1: the user has entered something under "Find course by Code".
List the courses whose course code matches the entered course code, in reverse chronological order.

Case 2: the user has not entered something under "Find course by Code".
If there is a value for "List courses by faculty", list all courses that belong to the entered faulty, in reverse chronological order.

Otherwise, list the student's joined courses (already done), in reverse chronological order.
 2022-06-11 09:44:34 +03:00
SayidCali jamac ded10c1ff8 Revert "courses filter current year and ordering" 
This reverts commit eee1a5e8ad.
 2022-06-11 08:44:42 +03:00
SayidCali jamac eee1a5e8ad courses filter current year and ordering 2022-06-11 08:24:52 +03:00
hajigeek 035b92a053 cursor:auto 2022-06-09 19:46:47 +08:00
hajigeek 60471610a2 English typo is corrected 2022-06-06 17:40:31 +08:00
hajigeek ff1384f341 English typo is corrected 2022-06-03 09:19:10 +08:00
hajigeek a4dce34b92 English typo error is corrected 2022-06-03 09:09:51 +08:00
hajigeek 6860d7618f bug23-fixed 2022-05-28 11:01:19 +08:00
hajigeek c4f4dec22e BUG22 FIXED 2022-05-25 09:07:59 +08:00
梁立港 15a96c1b68 Merge pull request '“修改了部分bug”' (#36) from LiangLigang into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/36
 2022-05-23 14:54:09 +08:00
bmth eb532d10af “LiangLigang” 2022-05-19 12:35:27 +08:00
HAYATU UMAR FARUQ 5fa0c1e040 Set session duration to 2 hours (#33) 
This pull request is for extending the login session duration to 2 hours as reported in [Bug256](http://118.25.96.118/bugzilla/show_bug.cgi?id=256).

Co-authored-by: faruq <hufarouq01@gmail.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/33
Co-authored-by: HAYATU UMAR FARUQ <hufarouq01@gmail.com>
Co-committed-by: HAYATU UMAR FARUQ <hufarouq01@gmail.com>
 2022-04-20 20:14:02 +08:00
mrlan 8b91a8ed7f Merge pull request 'Fix the id number verification bug' (#31) from IDVerificationBug-Golden into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/31
 2021-12-14 12:46:18 +08:00
mrlan 3f81266852 Merge pull request 'Update 3: test cases 07-16' (#30) from SeleniumIbrahim-Ibrahim into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/30
 2021-12-14 12:45:51 +08:00
Goldenbwuoy dd75c24a30 Fix the id number verification bug 2021-12-13 12:00:06 +08:00
Ibrahim ef6e79f31c Update 3: test cases 07-16 2021-12-05 00:59:43 +08:00
mrlan f4ffcdd47b Merge pull request 'Update 1: test cases 00-04' (#29) from SeleniumIbrahimUpdate-Ibrahim into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/29
 2021-12-03 11:09:37 +08:00
Ibrahim cf11ed40ad Update 2.5: Replaced some ID names 2021-12-03 10:58:07 +08:00
Lan Hui 93a7661103 Repalce ex_acc with existing_accounts_tab. Why? Less vague. 2021-11-30 21:49:51 +08:00
Ibrahim 6c6e60aac2 Update 2: test cases 05-07 2021-11-29 02:19:37 +08:00
Ibrahim a64a4e1053 Update 1: test cases 00-04 2021-11-27 23:02:44 +08:00
AL BOROM WARD eea3e14c8f Added the line that have been deleted 
in the last pull request, I made there was a line of code that have been accidentally deleted from script.php page, I added it back to there.
 2021-11-24 02:55:08 +08:00
AL BOROM WARD 54ac24b073 Merge pull request 'Updated Script.php' (#27) from Bug200-Ward into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/27
 2021-11-16 06:24:19 +08:00
AL BOROM WARD 5fcc897c55 Updated Script.php 
In this commit, I fixed the bug200 which was the incorrect encoding of Chinese characters in the uploaded assignment files
 2021-11-16 06:21:39 +08:00
mrlan 4b51cd7fdf Merge pull request 'Course creation portal removed from Admin.php' (#26) from bug231-Ibrahim into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/26
 2021-11-14 09:35:45 +08:00
Ibrahim fae269d963 Merge branch 'master' of http://121.4.94.30:3000/mrlan/LRR into bug231-Ibrahim 
To update Script.php
 2021-11-13 21:38:04 +08:00
mrlan efb2f68472 Merge pull request 'Add the student ID to session variables when a student signs up' (#25) from bug312-Golden into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/25
 2021-11-12 08:33:28 +08:00
Ibrahim 8863de3714 Course creation portal removed from Admin.php 2021-11-11 23:03:03 +08:00
Goldenbwuoy 29ba316188 Add the student ID to session variable when a student signs up 2021-11-11 12:03:33 +08:00
mrlan 7b1b36253c Merge pull request 'Bug203-Hui' (#24) from Bug203-Hui into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/24
 2021-11-09 11:38:59 +08:00
Lan Hui 2efe708c52 Merge branch 'master' of http://121.4.94.30:3000/mrlan/LRR into Bug203-Hui 2021-11-08 21:53:05 +08:00
Lan Hui 7a5084ca4e Submissions.php: fix Bug 203 Unable to download an attachment from a student's submission (http://118.25.96.118/bugzilla/show_bug.cgi?id=203) 2021-11-08 21:51:07 +08:00
mrlan 38379c5e22 Merge pull request 'Hui-improve-README.md' (#23) from Hui-improve-README.md into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/23
 2021-10-26 12:49:34 +08:00
Lan Hui 5974b568ec Merge branch 'master' of http://121.4.94.30:3000/mrlan/LRR into Hui-improve-README.md 2021-10-26 12:46:13 +08:00
Lan Hui 11497c4718 Correct repository URL 2021-10-26 12:45:42 +08:00
mrlan 6d81402989 Merge pull request 'Correct github account name' (#22) from Hui-improve-README.md into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/22
 2021-10-25 09:09:35 +08:00