Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev#1 #100

Open
wants to merge 51 commits into
base: master
Choose a base branch
from
Open

Dev#1 #100

Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
5ce38df
Modified to Eclipse env
SiowYenChong Aug 11, 2023
08b1bdd
Adapted to Eclipse env
SiowYenChong Aug 11, 2023
d269cbc
# commit
AnoshaChohan Aug 17, 2023
509c5f7
implementing factorial feature
ayj69 Aug 20, 2023
dae8fe0
Revert "Adapted to Eclipse" commit
SiowYenChong Aug 20, 2023
285a447
test
ayj69 Aug 20, 2023
59075b9
test
ayj69 Aug 20, 2023
1148b7a
Revert "Revert "Adapted to Eclipse" commit"
ayj69 Aug 20, 2023
21a4657
implementing factorial
ayj69 Aug 20, 2023
6213418
Merge pull request #3 from SiowYenChong/dev#1
ayj69 Aug 20, 2023
96bc7d6
Corrected error: UI.java
SiowYenChong Aug 21, 2023
50a21db
commit changes
SiowYenChong Aug 21, 2023
70ab38c
Done testing factorial & Debug error sin,cos,tan
SiowYenChong Aug 21, 2023
653ed6e
Updated testing factorial & Debug error sin,cos,tan
SiowYenChong Aug 21, 2023
55bf69e
Merge pull request #4 from SiowYenChong/Tester
SiowYenChong Aug 21, 2023
df52390
Added Mod function
AnoshaChohan Aug 21, 2023
d8c0f3d
Saved changes
SiowYenChong Aug 30, 2023
7d4fccb
Saved changes
SiowYenChong Aug 30, 2023
781c4f5
Merged tester
SiowYenChong Aug 30, 2023
8abc836
Merge branch 'master' of https://github.com/SiowYenChong/Simple-Java-…
SiowYenChong Aug 30, 2023
ba72cec
Tester alterations
SiowYenChong Aug 30, 2023
2047f38
Added mod function
Aug 30, 2023
f6caeb1
commit
Aug 30, 2023
5bf3982
Updated mod
Aug 30, 2023
383e8e7
bfor pulling
SiowYenChong Aug 30, 2023
42ab587
bfor pulling
SiowYenChong Aug 30, 2023
f742438
Checked Mod Function
SiowYenChong Aug 30, 2023
c16828c
fixed conflicts
SiowYenChong Aug 30, 2023
1224a8d
Merge pull request #5 from SiowYenChong/dev#2
SiowYenChong Aug 30, 2023
ee30542
bfor switch to DevOps
SiowYenChong Sep 2, 2023
8394f31
Added jenkinfile
SiowYenChong Sep 2, 2023
3602dab
resolve conflict
SiowYenChong Sep 2, 2023
a511b49
resolve conflict
SiowYenChong Sep 2, 2023
0db4a21
lowercase repo
SiowYenChong Sep 2, 2023
1a3b317
Merge branch 'DevOps'
SiowYenChong Sep 2, 2023
e451699
Resolved conflicts
SiowYenChong Sep 2, 2023
633e733
Create eslint.yml
ayj69 Sep 4, 2023
279cf10
edit the factiruo button description
ayj69 Sep 4, 2023
e3f163d
Create pmd.yml
ayj69 Sep 4, 2023
5d373a1
Create codeql.yml
ayj69 Sep 4, 2023
70e156a
Delete .github/workflows/codeql.yml
ayj69 Sep 4, 2023
d3e8cdf
Merge pull request #9 from SiowYenChong/dev#1
ayj69 Sep 4, 2023
2a34b7c
Delete .github/workflows/eslint.yml
ayj69 Sep 4, 2023
0a8468b
Delete .github/workflows/pmd.yml
ayj69 Sep 4, 2023
c34c4d1
Create devskim.yml
ayj69 Sep 4, 2023
44297d7
edit the factorial button again
ayj69 Sep 4, 2023
9ef1844
Merge pull request #10 from SiowYenChong/dev#1
ayj69 Sep 4, 2023
5aa88b1
regenerate the build file so it can build
ayj69 Sep 5, 2023
b97748d
Merge branch 'master' into dev#1
ayj69 Sep 5, 2023
bd2ec7a
Merge pull request #11 from SiowYenChong/dev#1
ayj69 Sep 5, 2023
387d6cd
export, rebuild ant
SiowYenChong Sep 5, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
edit the factiruo button description
  • Loading branch information
ayj69 committed Sep 4, 2023
commit 279cf10f6ab9a307c95723e1b1c90042a9a5361f
2 changes: 1 addition & 1 deletion src/simplejavacalculator/UI.java
Original file line number Diff line number Diff line change
@@ -97,7 +97,7 @@ public UI() throws IOException {
butDivide = new JButton("/");
butEqual = new JButton("=");
butSquareRoot = new JButton("sqrt");
butFactorial = new JButton("!");
butFactorial = new JButton("Factorial!");
butSquare = new JButton("x*x");
butOneDividedBy = new JButton("1/x");
butCos = new JButton("Cos");