3279308836
/
LRR
forked from mrlan/LRR
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
227 Commits
23 Branches
0 Tags
3.2 MiB
Commit Graph

227 Commits (d2509e8de589ad4339d8fa350e674b6da9452c00)

Author SHA1 Message Date
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
enockkays 3ab9c33e8b
Update Script.php 
Student can create the accounts on their own without the need for the Teacher to create the accounts for the students. 
Also removed the inputs for the passport.
 2020-12-25 22:21:40 +08:00
Samantha a238909f1a
Update Script.php 
Line 44, 53 - 60  we removed the passport portal not just from the form as our colleagues did but completely. Apart from the change above we also added a portal for inputting the student number on line 64.
 2020-12-25 22:09:36 +08:00
enockkays 6ba6ebe414
Update recover_password.php 
We added first increased the padding for the recover button and also added some CSS properties for the hover effect.
 2020-12-25 21:41:34 +08:00
Samantha a877d38e95
Add files via upload 
This is the new background image for the lrr sign in form.
 2020-12-25 21:34:52 +08:00
enockkays 3ca7a1efad
Update index.php 
Updated the Logo from "LRRS" to "LRR".
Removed the signup form from the index.php file (Index.php file had two forms now with only one form for signing in and a link that leads to the signup form).
On the signup form, we have removed the portal for putting the passport because I have realized that our colleagues from this repository "Ashik-Nafis_Bug 53" only removed the passport portal from the form. 
We also added a background and some CSS properties for the hovers effects on the new form.
 2020-12-25 21:30:34 +08:00
Samantha 8c42ebe4ee
Update signup.php 
For the LRR website, we don't need to display both the sign-in and sign-up forms on one page. The best thing that we can do to have a clean and neat LRR website UI/UX we should only display the logo and sign in form. Then we are also going to put a signup link on the sign-in page that will lead to the signup form and on the signup form the top left corner lrr logo will lead us back to the sign-in form. 
On the sign-up form I have removed the portal for inputting the passport and added an if statement for inputting student number on the same form.
 2020-12-25 16:59:47 +08:00
enockkays d18feb9713
Update Submissions.php 
Removed a duplicated line that was done by mistake  on line 531
$('#submit-form').submit()
 2020-12-24 19:39:17 +08:00
Software Project Management af0f586396
Merge pull request #59 from lanlab-org/AshikRahman-NafisAnjum-Remove-PassportID-Input-Box 
index.php: remove the unused field 'Your Passport/National ID'
 2020-12-24 18:41:36 +08:00
Hui Lan f96fbf5447 index.php: remove the unused field 'Your Passport/National ID' in Sign up section. 2020-12-24 18:39:03 +08:00
Software Project Management 98a679b944
Merge pull request #58 from lanlab-org/Hui-CourseCode 
Courses.php: be more specific on 'Code'.
 2020-12-24 18:28:59 +08:00
Hui Lan 4318437b16 Courses.php: be more specific on 'Code'. 2020-12-24 18:27:14 +08:00
enockkays 511ff80ee1
Merge branch 'master' into lrr-enockkays/Samantha 2020-12-23 16:46:51 +08:00
Software Project Management 6dc845ed2c
Merge pull request #50 from lanlab-org/202025800041_Omar_Mohamud_Mohamed-fixed-Bug_25-SQL_insert_error_while_trying_to_create_a_new_course 
increased the size of column_name Course_Name
 2020-12-23 08:53:41 +08:00
CODEwithZAKI f31c7decfd Removed the Single Qoutes+1 2020-12-22 16:23:44 +03:00
CODEwithZAKI 3e4ee8958d Removed the single qoutes 2020-12-22 14:52:51 +03:00
Software Project Management 9523d5c2e4
Merge pull request #55 from lanlab-org/EnockKhondowe-and-SamanthaRusike-bugfix-for-bug177 
Submissions.php: fix bug# 177: Mark submission does not work
 2020-12-22 18:24:30 +08:00