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

343 Commits (Bug519-Hui)

Author SHA1 Message Date
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
Hui Lan c2cee17c0a Course.php: show missed courses properly. This is bug fix commit. 2021-04-04 20:03:05 +08:00
Software Project Management b501fcdcf4
Merge pull request #67 from lanlab-org/Ferguson-Trim-CourseCode-Before-Search-For-Courses 
Courses.php: trim course code before search for it.
 2021-02-17 22:17:13 +08:00
Hui Lan e49b047a93 Courses.php: trim course code before search for it. 2021-02-17 22:15:26 +08:00
Software Project Management e947b97016
Merge pull request #66 from lanlab-org/Hui-Reformat-Code 
index.php: make the code look cleaner.
 2021-01-29 17:35:36 +08:00
Hui Lan 019a832c0b index.php: resolve merge conflict. 2021-01-29 17:34:48 +08:00
Hui Lan 56c249390e index.php: make the code look cleaner. 2021-01-29 17:25:59 +08:00
Samantha 0dd3abefdb
Update index.php 
I  have removed the background and the "S" in the name on the footer too make it consistent  with the rest as we renamed it to LRR only.
 2021-01-05 11:26:12 +08:00
Software Project Management 6e5eff11de
Merge pull request #53 from lanlab-org/Mabasaa 
Mabasa Nyasha Mutyambizi 202025800045-Fixed Bug 51:
 2020-12-29 12:00:46 +08:00
Software Project Management 5177327de0
Merge pull request #51 from lanlab-org/lrr-enockkays/Samantha 
Enock Khondowe 202025800044 & Samantha Rusike 202025800046: Mark Subm…
 2020-12-29 10:56:02 +08:00
enockkays cd124ed0f9
Update Header.php 
Removed the letter S from the "LRRS" to "LRR".
 2020-12-25 22:43:14 +08:00
enockkays 1d2192e22e
Update Script.php 
Removed the passport number entries from the code.
 2020-12-25 22:41:35 +08:00
Samantha 088ab3d0fa
Update Script.php 
When a student enters a student number without the email he/she can not recover their password unless the enter both details and if not all details are correct the following error messages will be displayed; "Invalid student number" or "Invalid email address". These error messages will be displayed on the same page without navigating to the next page as before.
Line 222 - 224 and 230 - 232.

On Line 246 - 247 after resetting your password the recover buttons navigates direct to the signup.php where you can create a new account.
 2020-12-25 22:36:45 +08:00