[CS2103T-W10-3] ComputingConnection#107

Open

timothywongej wants to merge 397 commits into

nus-cs2103-AY2122S1:masterfrom

AY2122S1-CS2103T-W10-3:master

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 24, 2021

Commits on Oct 25, 2021

Commits on Oct 26, 2021

Commits on Oct 27, 2021

Commits on Oct 28, 2021

Merge pull request #83 from timothywongej/branch-v1.3-documentation
timothywongej
authored
Merge pull request #85 from timothywongej/branch-append-command
timothywongej
authored
Merge pull request #86 from timothywongej/branch-remove-command
timothywongej
authored
organisation-commands
djiangel
committed
Merge branch 'master' into branch-v1.3-documentation
timothywongej
committed
feat: Add organisation command

Shivlock221b
authored and
Shivlock221b
committed
Changes in testing

Shivlock221b
authored and
Shivlock221b
committed
Stub changes in testing

Shivlock221b
authored and
Shivlock221b
committed
Json file changes

Shivlock221b
authored and
Shivlock221b
committed
Json checks

Shivlock221b
authored and
Shivlock221b
committed
Merge pull request #88 from Shivlock221b/branch-AddOrgCommand
Shivlock221b
authored
Merge branch 'master' into organisation-commands
Shivlock221b
authored
Updated roles and responsibilities
timothywongej
committed
Reformat UserGuide.md and update features
timothywongej
committed
Update 'add' and 'edit' commands for minor bugs
timothywongej
committed
Update Model.java
djiangel
authored
Update ModelManager.java
djiangel
authored
Update Organisation.java
djiangel
authored
Update AddressBookParser.java
djiangel
authored
Update UniqueOrganisationList.java
djiangel
authored
Update AddCommandTest.java
djiangel
authored
Updated UG to reflect view and find command correctly
kdeasymoneysniper
committed
Merge pull request #89 from timothywongej/branch-v1.3-documentation
kdeasymoneysniper
authored
Merge pull request #90 from kdeasymoneysniper/branch-update-UG
kdeasymoneysniper
authored
Merge pull request #87 from djiangel/organisation-commands
Shivlock221b
authored
fix: bug that clears interaction on append
noobmaster19
committed
Merge branch 'AY2122S1-CS2103T-W10-3:master' into master
noobmaster19
authored
fix: linting issue
noobmaster19
committed
Merge branch 'master' of https://github.com/noobmaster19/tp
noobmaster19
committed
Testing for filter

Shivlock221b
authored and
Shivlock221b
committed
Testing bugs fixed

Shivlock221b
authored and
Shivlock221b
committed
Merge pull request #91 from noobmaster19/master
timothywongej
authored
Merge pull request #92 from Shivlock221b/branch-FilterTest
Shivlock221b
authored
Displays the last viewed contact on the right side at all times
kdeasymoneysniper
committed
GUI: organisation GUI enhancement

Shivlock221b
authored and
Shivlock221b
committed
Update vertical flex and height in MainWindow.fxml
timothywongej
committed
Update GUI for PersonCard
timothywongej
committed
Merge pull request #95 from kdeasymoneysniper/branch-v1.3b
timothywongej
authored
organisation-changes
djiangel
committed
s
noobmaster19
committed
Merge pull request #96 from Shivlock221b/branch-GUI-Organisation
djiangel
authored
Merge pull request #98 from timothywongej/branch-v1.3-gui
djiangel
authored
s
noobmaster19
committed
Merge pull request #99 from djiangel/organisation-changes
timothywongej
authored
GUI: Person view in organisation

Shivlock221b
authored and
Shivlock221b
committed
Merge branch 'AY2122S1-CS2103T-W10-3:master' into branch-GUI-Organisation
Shivlock221b
authored
ug-changes
djiangel
committed
Merge pull request #101 from Shivlock221b/branch-GUI-Organisation
djiangel
authored
Merge pull request #102 from djiangel/ug-changes
Shivlock221b
authored
s
noobmaster19
committed
init
noobmaster19
committed
gui-changes
djiangel
committed
Fixed cases when last viewed person disappears
kdeasymoneysniper
committed
Merge pull request #104 from kdeasymoneysniper/master
djiangel
authored
Add column headers to GUI
timothywongej
committed
Merge pull request #100 from noobmaster19/master
djiangel
authored
fix: test
noobmaster19
committed
Merge pull request #103 from djiangel/gui-changes
kdeasymoneysniper
authored
Merge pull request #2 from noobmaster19/test-feat
noobmaster19
authored
Merge pull request #105 from noobmaster19/master
kdeasymoneysniper
authored
docs
noobmaster19
committed
Merge branch 'AY2122S1-CS2103T-W10-3:master' into master
noobmaster19
authored
safety check
noobmaster19
committed
Merge branch 'master' of https://github.com/noobmaster19/tp
noobmaster19
committed
Added GUI for compatibility field
kdeasymoneysniper
committed
fix: bug where only compat is selected
noobmaster19
committed
Merge pull request #106 from timothywongej/branch-v1.3-gui
djiangel
authored
Fixed checkstyle issue
kdeasymoneysniper
committed
UG update final

Shivlock221b
authored and
Shivlock221b
committed
Merge pull request #107 from noobmaster19/master
djiangel
authored
Merge pull request #108 from kdeasymoneysniper/master
djiangel
authored
Fixed Optional bug for GUI
kdeasymoneysniper
committed
Merge pull request #110 from kdeasymoneysniper/master
djiangel
authored
Update UG

Shivlock221b
authored and
Shivlock221b
committed
Merge pull request #109 from Shivlock221b/branch-UG-Update
kdeasymoneysniper
authored
UG update

Shivlock221b
authored and
Shivlock221b
committed
Merge branch 'master' into branch-v1.3-documentation
timothywongej
committed
Merge pull request #111 from Shivlock221b/branch-UG-Update
djiangel
authored
Format UserGuide.md for v1.3
timothywongej
committed
Merge branch 'master' into branch-v1.3-documentation
timothywongej
authored
Merge pull request #112 from timothywongej/branch-v1.3-documentation
djiangel
authored
Final Update

Shivlock221b
authored and
Shivlock221b
committed
final update 2

Shivlock221b
authored and
Shivlock221b
committed
Minor change in UG

Shivlock221b
authored and
Shivlock221b
committed
Merge pull request #113 from Shivlock221b/branch-FinalUpdate
timothywongej
authored
Update index.md with latest Ui.png
timothywongej
committed
Merge branch 'branch-v1.3-documentation' of https://github.com/timothywongej/tp into branch-v1.3-documentation
timothywongej
committed

Commits on Nov 2, 2021

Commits on Nov 3, 2021

Commits on Nov 4, 2021

Commits on Nov 5, 2021

Commits on Nov 7, 2021

Update PPP in timothywong.md
timothywongej
committed
Update UserGuide.md to fix conflicts in earlier PR
timothywongej
committed
Fix 'remove' command bug due to accidental deletion
timothywongej
committed
Refactor 'append' command to improve code quality
timothywongej
committed
Merge pull request #187 from timothywongej/branch-v1.4-bugs
Shivlock221b
authored
DG changes and PPP Update

Shivlock221b
authored and
Shivlock221b
committed
Bug fixed

Shivlock221b
authored and
Shivlock221b
committed

Commits on Nov 8, 2021