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

184 Commits (8b40765c1751c310b89a58c261fbad270300b30a)

Author SHA1 Message Date
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
WARD 0bba3d2bb4
Merge pull request #40 from lanlab-org/Hui-UserDoc 
Create file UserDoc.md and add an entry about resetting password.
 2020-06-04 14:33:18 +03:00
Hui Lan e742e9f3fb UserDoc.md: add modification date information. 2020-06-01 16:08:59 +08:00
Hui Lan 4afe46141b Created a doc folder and move UserDoc.md to it. 2020-06-01 10:54:53 +08:00
Tanaka Sandati bfb6b15b6c Adding web page icon and web page title to LRR 2020-05-31 16:47:18 +08:00
Hui Lan 8d2cdbf858 UserDoc.md: add title for this document. 2020-05-30 23:21:11 +08:00
Hui Lan 42717bf38d Create file UserDoc.md and add an entry about resetting password. 2020-05-30 23:14:57 +08:00
fish 1dcbb9bb3f Update Script.php 
修改已添加成员后的提示
 2020-05-25 15:31:05 +08:00
fish 45554cd5b5 Update Script.php 
修改了错误的title，添加插入course_groups_table的代码
 2020-05-25 13:43:00 +08:00
fish 454d3062c3 Update Script.php 
邀请前检查该student_id是否已存在
 2020-05-20 17:50:16 +08:00
fish 099d0e0445 Update Header.php 
添加jquery-ui.css和jquery-ui.js的1.12.1版本
 2020-05-20 13:49:46 +08:00
fish 47b5f09110 Update Script.php 
修改Script.php文件中的connection为本地root连接
 2020-05-20 13:46:35 +08:00
Software Project Management e8de77a243
Merge pull request #37 from lanlab-org/Hui-improve-README.md 
Fixing typos and grammatical errors
 2020-05-11 17:04:41 +08:00
TanakaMichelle dcef721576
Fixing typos and grammatical errors 
Fixed some tying errors as well as grammatical errors.

Tanaka Michelle Sandati (201732120134)
Yeboah Martha Asamoah (201732120135)
Tamene Robel (201732120170)
 2020-05-10 09:41:09 +08:00
Software Project Management faffd9ec6b
Merge pull request #35 from lanlab-org/TwizerePacifique-201925800174-ContributorList2 
README.md : Added my team information
 2020-04-27 16:43:58 +08:00
Will Concord ff37ea37cf Readme.md: Added my team information 2020-04-27 14:07:36 +08:00
Software Project Management 9f6cb780ec
Merge pull request #34 from lanlab-org/MaryAkussah-201925800173-Contributorlist2 
README.md: Mary and Kumson.
 2020-04-27 12:21:05 +08:00
Mary-Ak 3a56312521 README.md: Mary and Kumson. 2020-04-26 16:53:19 +08:00
Software Project Management ec80d4c6b0
Merge pull request #33 from lanlab-org/Hui-bugfix-65 
Hui bugfix 65 "Students unable to submit assignment after a recent change"
 2020-04-23 10:22:25 +08:00
Hui Lan a89b8f4e0d Script.php: why use the function trim? 2020-04-23 10:10:58 +08:00
Hui Lan b7d6ae1bcf Script.php: [bugfix] fix -- "Students unable to submit assignment after a recent change" 
This commit temporarily fixed the bug reported at http://118.25.96.118/bugzilla/show_bug.cgi?id=65

This bug was introduced after a recent functionality addition, i.e., allowing Lecturer to edit assignment information.
See the following pull request for details.
https://github.com/lanlab-org/LRR/pull/21

It seems that $group_id is not properly assigned after merging the above pull request.
Therefore, when someone tried to insert a record to the database table lab_report_submissions, he encountered a running error.

In this fix, I just set $group_id 0 to avoid the database insertion error.
This is OK when an assignment is of type Individual.
Of course, this fix is not ideal, as it cannot handle the situation where the assignment is of type Group.
In the future, $group_id must be properly initialized, depending on the assignment type.

-Hui
 2020-04-21 20:48:13 +08:00
Hui Lan 18f2e7023a Courses.php: change info_Updated to info_updated. PHP usually uses camelCase as its naming convention. In that case, there should be no underscore between info and Updated. 2020-04-20 20:11:40 +08:00