Compare commits

base: puc8kt9je:main

Branches Tags

puc8kt9je:main

puc8kt9je:dev

puc8kt9je:Gudongxue_branch

puc8kt9je:Liyingying_branch

puc8kt9je:Wangyanyixiang_branch

puc8kt9je:dev-clawer

puc8kt9je:Chuzhuoli_branch

..

compare: puc8kt9je:Wangyanyixiang_branch

Branches Tags

puc8kt9je:main

puc8kt9je:dev

puc8kt9je:Gudongxue_branch

puc8kt9je:Liyingying_branch

puc8kt9je:Wangyanyixiang_branch

puc8kt9je:dev-clawer

puc8kt9je:Chuzhuoli_branch

No commits in common. 'main' and 'Wangyanyixiang_branch' have entirely different histories.

main ... Wangyanyix

5798 changed files with 1 additions and 549222 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats

0

src/GenFlightRec/.classpath → .classpath

Unescape Escape View File

0

src/GenFlightRec/.idea/.gitignore → .idea/.gitignore vendored

Unescape Escape View File

0

src/GenFlightRec/.idea/misc.xml → .idea/misc.xml

Unescape Escape View File

0

src/GenFlightRec/.project → .project

Unescape Escape View File

0

src/GenFlightRec/.settings/.jsdtscope → .settings/.jsdtscope

Unescape Escape View File

0

src/GenFlightRec/.settings/org.eclipse.core.resources.prefs → .settings/org.eclipse.core.resources.prefs

Unescape Escape View File

0

src/GenFlightRec/.settings/org.eclipse.jdt.core.prefs → .settings/org.eclipse.jdt.core.prefs

Unescape Escape View File

0

src/GenFlightRec/.settings/org.eclipse.m2e.core.prefs → .settings/org.eclipse.m2e.core.prefs

Unescape Escape View File

0

src/GenFlightRec/.settings/org.eclipse.wst.common.component → .settings/org.eclipse.wst.common.component

Unescape Escape View File

0

src/GenFlightRec/.settings/org.eclipse.wst.common.project.facet.core.xml → .settings/org.eclipse.wst.common.project.facet.core.xml

Unescape Escape View File

0

src/GenFlightRec/.settings/org.eclipse.wst.jsdt.ui.superType.container → .settings/org.eclipse.wst.jsdt.ui.superType.container

Unescape Escape View File

0

src/GenFlightRec/.settings/org.eclipse.wst.jsdt.ui.superType.name → .settings/org.eclipse.wst.jsdt.ui.superType.name

Unescape Escape View File

0

src/GenFlightRec/.settings/org.eclipse.wst.ws.service.policy.prefs → .settings/org.eclipse.wst.ws.service.policy.prefs

Unescape Escape View File

0

src/GenFlightRec/WebContent/META-INF/MANIFEST.MF → WebContent/META-INF/MANIFEST.MF

Unescape Escape View File

0

src/GenFlightRec/WebContent/WEB-INF/lib/commons-fileupload-1.4.jar → WebContent/WEB-INF/lib/commons-fileupload-1.4.jar

Unescape Escape View File

0

src/GenFlightRec/WebContent/WEB-INF/lib/commons-io-2.6.jar → WebContent/WEB-INF/lib/commons-io-2.6.jar

Unescape Escape View File

0

src/GenFlightRec/WebContent/WEB-INF/lib/json-20240303.jar → WebContent/WEB-INF/lib/json-20240303.jar

Unescape Escape View File

0

src/GenFlightRec/WebContent/WEB-INF/lib/mysql-connector-java-8.0.16.jar → WebContent/WEB-INF/lib/mysql-connector-java-8.0.16.jar

Unescape Escape View File

0

src/GenFlightRec/WebContent/WEB-INF/web.xml → WebContent/WEB-INF/web.xml

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/asset/css/bootstrap.min.css → WebContent/admin/asset/css/bootstrap.min.css vendored

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/asset/css/plugins/animate.min.css → WebContent/admin/asset/css/plugins/animate.min.css vendored

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/asset/css/plugins/font-awesome.min.css → WebContent/admin/asset/css/plugins/font-awesome.min.css vendored

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/asset/css/style.css → WebContent/admin/asset/css/style.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/asset/fonts/fontawesome-webfont.ttf → WebContent/admin/asset/fonts/fontawesome-webfont.ttf

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/asset/fonts/fontawesome-webfont.woff → WebContent/admin/asset/fonts/fontawesome-webfont.woff

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/asset/fonts/fontawesome-webfont.woff2 → WebContent/admin/asset/fonts/fontawesome-webfont.woff2

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/asset/js/bootstrap.min.js → WebContent/admin/asset/js/bootstrap.min.js vendored

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/asset/js/jquery.min.js → WebContent/admin/asset/js/jquery.min.js vendored

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/asset/js/main.js → WebContent/admin/asset/js/main.js

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/asset/js/plugins/jquery.nicescroll.js → WebContent/admin/asset/js/plugins/jquery.nicescroll.js

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/css/page.css → WebContent/admin/css/page.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/flight_add.jsp → WebContent/admin/flight_add.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/flight_list.jsp → WebContent/admin/flight_list.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/frame.jsp → WebContent/admin/frame.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/images/background.jpg → WebContent/admin/images/background.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 178 KiB After Width:  |  Height:  |  Size: 178 KiB

0

src/GenFlightRec/WebContent/admin/images/mylogo.jpg → WebContent/admin/images/mylogo.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 171 KiB After Width:  |  Height:  |  Size: 171 KiB

0

src/GenFlightRec/WebContent/admin/index.jsp → WebContent/admin/index.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/js/index.js → WebContent/admin/js/index.js

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/js/jquery.min.js → WebContent/admin/js/jquery.min.js vendored

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/js/nav_scroll.js → WebContent/admin/js/nav_scroll.js

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/logout.jsp → WebContent/admin/logout.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/order_list.jsp → WebContent/admin/order_list.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/ticket_add.jsp → WebContent/admin/ticket_add.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/ticket_information.jsp → WebContent/admin/ticket_information.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/user_list.jsp → WebContent/admin/user_list.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/verify_login.jsp → WebContent/admin/verify_login.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/admin/welcome.jsp → WebContent/admin/welcome.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/citychangeDemo.html → WebContent/default/citychangeDemo.html

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/css/bootstrap.min.css → WebContent/default/css/bootstrap.min.css vendored

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/css/common.css → WebContent/default/css/common.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/css/corptravel.css → WebContent/default/css/corptravel.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/css/enterprise.css → WebContent/default/css/enterprise.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/css/iconfont.css → WebContent/default/css/iconfont.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/css/semantic.css → WebContent/default/css/semantic.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/css/style.css → WebContent/default/css/style.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/error.jsp → WebContent/default/error.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/error_login.jsp → WebContent/default/error_login.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/fonts/iconfont.ttf → WebContent/default/fonts/iconfont.ttf

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/fonts/iconfont.woff → WebContent/default/fonts/iconfont.woff

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/images/a.png → WebContent/default/images/a.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 959 B After Width:  |  Height:  |  Size: 959 B

0

src/GenFlightRec/WebContent/default/images/airplane.ico → WebContent/default/images/airplane.ico

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 66 KiB After Width:  |  Height:  |  Size: 66 KiB

0

src/GenFlightRec/WebContent/default/images/b.png → WebContent/default/images/b.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 1.0 KiB

0

src/GenFlightRec/WebContent/default/images/c.png → WebContent/default/images/c.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 1.0 KiB

0

src/GenFlightRec/WebContent/default/images/mylogo.jpg → WebContent/default/images/mylogo.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 171 KiB After Width:  |  Height:  |  Size: 171 KiB

0

src/GenFlightRec/WebContent/default/images/newlogo.png → WebContent/default/images/newlogo.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 434 KiB After Width:  |  Height:  |  Size: 434 KiB

0

src/GenFlightRec/WebContent/default/images/newlogo11.png → WebContent/default/images/newlogo11.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 227 KiB After Width:  |  Height:  |  Size: 227 KiB

0

src/GenFlightRec/WebContent/default/index.html → WebContent/default/index.html

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/index.jsp → WebContent/default/index.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/js/address.js → WebContent/default/js/address.js

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/js/bootstrap.min.js → WebContent/default/js/bootstrap.min.js vendored

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/js/fixdiv.js → WebContent/default/js/fixdiv.js

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/js/jquery-1.9.1.min.js → WebContent/default/js/jquery-1.9.1.min.js vendored

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/js/script.js → WebContent/default/js/script.js

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/logout.jsp → WebContent/default/logout.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/order.jsp → WebContent/default/order.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/order_list.jsp → WebContent/default/order_list.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/search.jsp → WebContent/default/search.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/default/verify_login.jsp → WebContent/default/verify_login.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/index.jsp → WebContent/index.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/css/core.css → WebContent/index/css/core.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/css/font-awesome.min.css → WebContent/index/css/font-awesome.min.css vendored

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/css/home.css → WebContent/index/css/home.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/css/icon.css → WebContent/index/css/icon.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/css/inputEffect.css → WebContent/index/css/inputEffect.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/css/login.css → WebContent/index/css/login.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/css/normalize.css → WebContent/index/css/normalize.css vendored

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/css/sign-up-login.css → WebContent/index/css/sign-up-login.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/css/spop.min.css → WebContent/index/css/spop.min.css vendored

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/css/tooltips.css → WebContent/index/css/tooltips.css

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/edit_info.jsp → WebContent/index/edit_info.jsp

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/fonts/FontAwesome.otf → WebContent/index/fonts/FontAwesome.otf

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/fonts/fontawesome-webfont.eot → WebContent/index/fonts/fontawesome-webfont.eot

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/fonts/fontawesome-webfont.svg → WebContent/index/fonts/fontawesome-webfont.svg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 434 KiB After Width:  |  Height:  |  Size: 434 KiB

0

src/GenFlightRec/WebContent/index/fonts/fontawesome-webfont.ttf → WebContent/index/fonts/fontawesome-webfont.ttf

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/fonts/fontawesome-webfont.woff → WebContent/index/fonts/fontawesome-webfont.woff

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/fonts/fontawesome-webfont.woff2 → WebContent/index/fonts/fontawesome-webfont.woff2

Unescape Escape View File

0

src/GenFlightRec/WebContent/index/images/loginpassword.png → WebContent/index/images/loginpassword.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 512 B After Width:  |  Height:  |  Size: 512 B

0

src/GenFlightRec/WebContent/index/images/loginuser.png → WebContent/index/images/loginuser.png

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 502 B After Width:  |  Height:  |  Size: 502 B

0

src/GenFlightRec/WebContent/index/images/mylogo.jpg → WebContent/index/images/mylogo.jpg

Unescape Escape View File

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 171 KiB After Width:  |  Height:  |  Size: 171 KiB

0

src/GenFlightRec/WebContent/index/js/jquery.min.js → WebContent/index/js/jquery.min.js vendored

Unescape Escape View File

Some files were not shown because too many files have changed in this diff Show More

Write Preview

Loading…

Cancel

Save