Commit Graph

305 Commits (c4f4dec22ee74fd91e47d5b20e43ba35be1f15d3)

Author SHA1 Message Date
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
Hui Lan 08e1955807 Submissions.php: fix bug# 177: Mark submission does not work (http://118.25.96.118/bugzilla/show_bug.cgi?id=177). 2020-12-22 18:22:35 +08:00
Software Project Management 88b2f22c03
Merge pull request #54 from lanlab-org/Hui-Refactoring
Hui refactoring
2020-12-22 17:49:54 +08:00
Hui Lan 69355029a8 Script.php: increase attachment size to 3MB. 2020-12-22 17:42:29 +08:00
Mabasa-elexma aa6401c5cd Mabasa Nyasha Mutyambizi 202025800045-Fixed Bug 51: Unable to find course after entering the course code. 2020-12-21 20:10:58 +08:00
enockkays a29a9053bd Enock Khondowe 202025800044 & Samantha Rusike 202025800046: Mark Submission error Bug No.177. 2020-12-15 20:20:38 +08:00
CODEwithZAKI 2778a9ed3b Removed leading space 2020-12-15 06:20:24 +03:00
CODEwithZAKI 2567a7fe21 Fixed Bug 25 2020-12-15 05:56:04 +03:00
CODEwithZAKI d4cb07ba1c increased the size of column_name Course_Name 2020-12-15 05:30:00 +03:00
Hui Lan 09e857bbf6 A better way to store mysql credentials. 2020-10-02 23:02:27 +08:00
Software Project Management bea6d94db7
Merge pull request #48 from lanlab-org/Hui-Refactoring
Hui refactoring
2020-10-02 17:05:20 +08:00
Hui Lan 46171fe780 Merge branch 'master' of https://github.com/lanlab-org/LRR into Hui-Refactoring 2020-10-02 17:02:57 +08:00
Hui Lan ada55d3394 [Refactoring] Particularly make the SQL statement that shows new assigmments in Coruse.php less messy. 2020-10-02 17:02:20 +08:00
Hui Lan 25a1431ba8 Remove file Connect.php. 2020-10-01 14:39:10 +08:00
Software Project Management 3abda541dd
Merge pull request #47 from lanlab-org/Hui-BugBatchFixesSeptember2020
Hui bug batch fixes September 2020
2020-09-29 17:42:24 +08:00
Hui Lan f01de2b618 Merge branch 'master' of https://github.com/lanlab-org/LRR into Hui-BugBatchFixesSeptember2020 2020-09-29 17:39:15 +08:00
Hui Lan 1abe47788c Bug fixes for bug reports from 2020-09-24 to 2020-09-29. 2020-09-29 17:38:14 +08:00
Software Project Management b37df84b72
Merge pull request #46 from lanlab-org/Hui-LoginWithStudentNumber
Script.php: allow people to log in when they give a valid student number.
2020-09-26 20:35:18 +08:00
Hui Lan df3b48553a Several fixes (sign up/sign in, recover password, etc). 2020-09-26 20:08:39 +08:00
Hui Lan f8995eec6f Script.php: allow people to log in when they give a valid student number. 2020-06-29 14:44:21 +08:00
xiaoyusoil 74704c1371
Merge branch 'master' into ZhengXiaoyu-201732120110-ContributorList 2020-06-15 14:19:47 +08:00
fish e504e83038 Update Overview.html 2020-06-15 14:10:37 +08:00
WARD cd0085b919
Merge pull request #41 from lanlab-org/201732120134--TanakaMichelleSandati--Adding-web-page-icon-and-web-page-title-to-LRR
Adding web page icon and web page title to LRR
2020-06-04 14:37:50 +03:00