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.

Sign up for GitHub

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

Jump to bottom

changes on text #78

Merged
merged 8 commits into from
Sep 9, 2024
Merged

changes on text #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a2a90df
Modified some changes at the AdminController.java
WEBeginner Aug 30, 2024
b34243b
Add text file for testbranching
WEBeginner Aug 30, 2024
b8826e6
Merge pull request #1 from WEBeginner/feature/add-user-authentication
WEBeginner Aug 30, 2024
1c2a737
modifyTextFiles
CTohQH Aug 30, 2024
30f4d51
modifyTextFile
CTohQH Aug 30, 2024
b817ee0
Merge pull request #2 from CTohQH/modifyTextfile
WEBeginner Aug 30, 2024
0c77c2f
Change Files
CTohQH Aug 30, 2024
45be5e8
Merge pull request #3 from CTohQH/modifyTextfile
WEBeginner Aug 30, 2024
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
11 changes: 6 additions & 5 deletions JtProject/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="module" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
Expand All @@ -31,26 +32,26 @@
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="optional" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="test" value="true"/>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
Expand Down
6 changes: 6 additions & 0 deletions JtProject/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,16 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
<filteredResources>
<filter>
Expand Down
2 changes: 1 addition & 1 deletion JtProject/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spring.jpa.properties.hibernate.enable_lazy_load_no_trans=true
db.driver= com.mysql.cj.jdbc.Driver
db.url= jdbc:mysql://localhost:3306/ecommjava?createDatabaseIfNotExist=true
db.username= root
db.password= pass
db.password=
entitymanager.packagesToScan= com

#spring.datasource.url=jdbc:mysql://localhost:3306/ecommjava?createDatabaseIfNotExist=true
Expand Down
1 change: 1 addition & 0 deletions TestBranching
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Test for adding branch
1 change: 1 addition & 0 deletions Testtxt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
make changes by your See Toh Qhuan Hern
1 change: 1 addition & 0 deletions Text.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
hello sir
Loading