Commit Graph

305 Commits (c4f4dec22ee74fd91e47d5b20e43ba35be1f15d3)

Author SHA1 Message Date
mrlan 80ff4d8286 Merge pull request 'Mabasa-readmefix' (#7) from Mabasa-readmefix into master
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/7
2021-07-22 10:29:36 +08:00
Lan Hui 37732ea1f0 Merge branch 'panda/readmefix' of https://github.com/lanlab-org/LRR into Mabasa-readmefix 2021-07-22 10:26:57 +08:00
mrlan b9b8ef2e11 Merge pull request 'Script.php: bugfix 21 http://118.25.96.118/bugzilla/show_bug.cgi?id=21' (#6) from Mvondo-bugfix-21 into master
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/6
2021-07-22 09:52:00 +08:00
Lan Hui 5a76e8fd4a Script.php: bugfix 21 http://118.25.96.118/bugzilla/show_bug.cgi?id=21 2021-07-22 09:43:36 +08:00
mrlan 9d9d6857df Merge pull request 'index.php: be more specific on email.' (#5) from Hui-LecturerEmail into master
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/5
2021-07-22 09:32:21 +08:00
Lan Hui 281ba8cc74 index.php: be more specific on email. 2021-07-22 09:31:14 +08:00
mrlan 405e95b36b Merge pull request 'Hui-improve-README.md' (#4) from Hui-improve-README.md into master
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/4
2021-07-21 21:59:27 +08:00
Lan Hui c733251474 README.md: FAQ (more info). 2021-07-21 21:58:19 +08:00
Lan Hui 1d8c98514c README.md: FAQ. 2021-07-21 21:55:04 +08:00
mrlan a5d9ac9400 Merge pull request 'Hui-improve-README.md' (#3) from Hui-improve-README.md into master
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/3
2021-07-21 21:49:21 +08:00
Lan Hui a7770dc7d4 README.md: deployment guide (small revision). 2021-07-21 21:45:23 +08:00
Lan Hui 2b78896c9b README.md: deployment guide. 2021-07-21 21:38:51 +08:00
mrlan 26f45e7c09 Merge pull request 'SIMPLICITY_Bug-189_Course_Delete_btn' (#2) from SIMPLICITY_Bug-189_Course_Delete_btn into master
Reviewed-on: http://121.4.94.30:3000/mrlan/LRR/pulls/2
2021-07-21 19:24:33 +08:00
Samrusike 22fcc67bd0 typo in readme 2021-07-06 01:32:17 +08:00
enockkays d5fc7c425e
Update Course.php 2021-06-12 19:09:43 +08:00
enockkays aa9f47e1db
Update Course.php 2021-06-12 19:07:54 +08:00
enockkays dd46a63611
Update Course.php
Changed the Mysql connection names because at first we used the local server and forgot to change the details when pushing to gitHub.
2021-06-12 17:26:06 +08:00
enockkays 8fb4c89329 Enock Jeanick & Omar Bug 189 - students should be able to drop a course. http://118.25.96.118/bugzilla/show_bug.cgi?id=189. We Implemented a button that will enable students to drop a course in case they join a wrong course or something else. 2021-05-21 20:14:43 +08:00
Software Project Management 709215df47
Merge pull request #79 from lanlab-org/Panda_download
Mabasa, Samantha, and Nafis - Fixed Bug 201 Unable to download an att…
2021-05-21 15:19:57 +08:00
Hui Lan 559b910e67 Merge branch 'master' of https://github.com/lanlab-org/LRR into BugFix-201-Mabasa-Samantha-Nafis 2021-05-21 14:56:14 +08:00
Hui Lan 8b40765c17 Download.php: remove the redundant space before the closing parenthesis ')'. 2021-05-21 14:55:55 +08:00
Hui Lan a2d80ffa6e Merge branch 'Panda_download' of https://github.com/lanlab-org/LRR into BugFix-201-Mabasa-Samantha-Nafis 2021-05-21 14:54:19 +08:00
Software Project Management e2c2c7c1cb
Merge pull request #80 from lanlab-org/SIMPLICITY_link
Enock Omar Jeannick bug 42: please add a link under assignments so t…
2021-05-13 21:47:44 +08:00
Hui Lan 1a2d2b0028 Merge with the latest Submissions.php. 2021-05-13 21:34:44 +08:00
Jeannick94 11cb05b31a Enock Omar Jeannick bug 42: please add a link under assignments so that we can go bact to the list of assignments. 2021-05-06 11:59:00 +08:00
Jeannick94 aab5ce503a Mabasa, Samantha, and Nafis - Fixed Bug 201 Unable to download an attachment from a student's submission (file name containing commas) 2021-05-05 17:49:16 +08:00
Hui Lan ca69011032 Merge branch 'SIMPLICITY_submitted_by_who' of https://github.com/lanlab-org/LRR into Hui-IncorporateChangesMadeByEnock2 2021-04-29 17:22:07 +08:00
Jeannick94 cb0e4568ad
Update Submissions.php
We replace "$names $submitted_std <i>(GROUP)</i> $groupname " with "$names ($submitted_std) for group $groupname"?

We made variable names more descriptive by  replacing submitted_std with submitter_student_number and also names with student_name
2021-04-29 12:27:14 +08:00
Software Project Management 70bfb834f3
Merge pull request #76 from lanlab-org/Hui-IncorporateChangesMadeByEnock2
Script.php: fix typo happend
2021-04-29 09:38:18 +08:00
Hui Lan cdf5e84b12 Script.php: fix typo happend
This fix was made by Enock.  See the following link for more detail.

d8ea11fe17

-Hui
2021-04-29 08:53:17 +08:00
enockkays d8ea11fe17
Update Script.php
Corrected the wrong spelling which was spelt as "happend" instead of "Happened".
2021-04-21 20:11:09 +08:00
Software Project Management d4c3c98fed
Merge pull request #75 from lanlab-org/Hui-UpdateReadMeInMaster
Hui updated README.md in master
2021-04-17 22:03:38 +08:00
Hui Lan 9497809a1f README.md: the feature request is done (revision). 2021-04-17 21:54:57 +08:00
Hui Lan 5f25c14c9a README.md: the feature request is done. 2021-04-17 21:54:34 +08:00
Software Project Management 59eda326e9
Merge pull request #74 from lanlab-org/Hui-IncorporateChangesMadeByZhengXiaoyu
Hui incorporate changes made by zheng xiaoyu
2021-04-17 15:50:10 +08:00
Hui Lan a0025dc7b5 Incorporate changes made by Zheng Xiaoyu. This is mainly a bug fix for bug 57: http://118.25.96.118/bugzilla/show_bug.cgi?id=57 2021-04-17 15:31:41 +08:00
Software Project Management 6202c15c51
Merge pull request #73 from lanlab-org/Hui-improve-README.md
README.md: highlight important contributors.
2021-04-17 14:34:54 +08:00
Hui Lan f7124f393d README.md: highlight important contributors. 2021-04-17 14:31:43 +08:00
Jeannick94 4e66a3976c ENOCK JEANNICK OMAR bug41:need to be submitted by whom information. the system shows the information of the person that submit the assignement. 2021-04-17 13:02:29 +08:00
Software Project Management d5c40795a8
Merge pull request #71 from lanlab-org/Hui-IncorporateChangesMadeByEnock
recover_password.php: require that the two fields must not be empty.
2021-04-09 15:43:46 +08:00
Hui Lan 197e557963 recover_password.php: require that the two fields must not be empty. 2021-04-09 15:41:32 +08:00
Software Project Management 1e5505761b
Merge pull request #70 from lanlab-org/Hui-IncorporateChangesMadeByEnock
signup.php: use proper lowercases.
2021-04-09 15:37:13 +08:00
Hui Lan 99063b17f8 signup.php: use proper lowercases. 2021-04-09 15:33:37 +08:00
Software Project Management 95e3e92a60
Merge pull request #69 from lanlab-org/Hui-IncorporateChangesMadeByEnock
Hui incorporate changes made by Enock
2021-04-09 15:22:46 +08:00
Hui Lan 476aa87178 index.php, signup.php and recover_password.php: change button widths. 2021-04-09 15:17:01 +08:00
Hui Lan 43b9da8e90 index.php: change P to lowercase p. 2021-04-09 15:06:32 +08:00
Hui Lan 6971b0dc22 index.php: position the log in the right place. 2021-04-09 15:03:10 +08:00
Hui Lan a0f82ec8a5 index.php: resolve merge conflicts 2021-04-09 14:52:08 +08:00
Software Project Management 63c6f84207
Merge pull request #68 from lanlab-org/Hui-ShowMissedCourses
Course.php: show missed courses properly.  This is bug fix commit.
2021-04-04 20:48:38 +08:00
Hui Lan be61b8992f Merge branch 'master' of https://github.com/lanlab-org/LRR into Hui-ShowMissedCourses 2021-04-04 20:46:32 +08:00