-
Notifications
You must be signed in to change notification settings - Fork 40
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
benisnowhere - 13513018 - Steven Andianto #15
Open
levanjipm
wants to merge
53
commits into
if-itb:master
Choose a base branch
from
benisnowhere:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dalam belajar wbd sekaligus eksplorasi bagaimana cara slide show
Hanya sekedar tampilan (sama dengan html), belum terhubung ke database
Hanya tampilan (html), belum terhubung ke database
Hanya tampilan (html), belum terhubung ke database
css for Page1.jsp, Page2.jsp, and Page3.jsp
database for simple stack exchange
Conflicts: StackExchange Client/build/web/WEB-INF/jax-ws-catalog.xml StackExchange Client/build/web/WEB-INF/web.xml StackExchange Client/catalog.xml StackExchange Client/nbproject/jax-ws.xml StackExchange Client/nbproject/jaxws-build.xml StackExchange Client/nbproject/private/private.xml StackExchange Client/web/WEB-INF/jax-ws-catalog.xml StackExchange Client/web/WEB-INF/web.xml StackExchange WS/dist/StackExchangeWS.war StackExchange WS/nbproject/private/private.xml
Conflicts: StackExchange Client/build/web/WEB-INF/jax-ws-catalog.xml StackExchange Client/build/web/WEB-INF/web.xml StackExchange Client/catalog.xml StackExchange Client/nbproject/jax-ws.xml StackExchange Client/nbproject/jaxws-build.xml StackExchange Client/nbproject/private/private.xml StackExchange Client/web/WEB-INF/jax-ws-catalog.xml StackExchange Client/web/WEB-INF/web.xml StackExchange WS/build/web/WEB-INF/classes/QuestionModel/QuestionWS.class StackExchange WS/dist/StackExchangeWS.war StackExchange WS/nbproject/private/private.xml StackExchange WS/src/java/QuestionModel/QuestionWS.java
This reverts commit 0b6d253.
Conflicts: StackExchange Client/build/web/WEB-INF/jax-ws-catalog.xml StackExchange Client/build/web/WEB-INF/web.xml StackExchange Client/catalog.xml StackExchange Client/nbproject/jax-ws.xml StackExchange Client/nbproject/jaxws-build.xml StackExchange Client/nbproject/private/private.xml StackExchange Client/web/WEB-INF/jax-ws-catalog.xml StackExchange Client/web/WEB-INF/web.xml StackExchange WS/build/web/WEB-INF/classes/QuestionModel/QuestionWS.class StackExchange WS/dist/StackExchangeWS.war StackExchange WS/nbproject/private/private.xml StackExchange WS/src/java/QuestionModel/QuestionWS.java
Insert Answer, Update Question, Delete Question, Vote Up, Vote Down
…e kasih token dan update token ke database, timestamp error
Conflicts: StackExchange Client/build/generated-sources/jax-ws/AnswerWS/AnswerWS.java StackExchange Client/build/generated-sources/jax-ws/AnswerWS/AnswerWS_Service.java StackExchange Client/build/generated-sources/jax-ws/AnswerWS/GetAnswerByQID.java StackExchange Client/build/generated-sources/jax-ws/AnswerWS/GetAnswerByQIDResponse.java StackExchange Client/build/generated-sources/jax-ws/AnswerWS/ObjectFactory.java StackExchange Client/build/generated-sources/jax-ws/AnswerWS/package-info.java StackExchange Client/build/generated-sources/jax-ws/QuestionWS/GetQuestion.java StackExchange Client/build/generated-sources/jax-ws/QuestionWS/GetQuestionResponse.java StackExchange Client/build/generated-sources/jax-ws/QuestionWS/ObjectFactory.java StackExchange Client/build/generated-sources/jax-ws/QuestionWS/Question.java StackExchange Client/build/generated-sources/jax-ws/QuestionWS/QuestionWS.java StackExchange Client/build/generated-sources/jax-ws/QuestionWS/QuestionWS_Service.java StackExchange Client/build/generated-sources/jax-ws/QuestionWS/package-info.java StackExchange Client/build/generated/jax-wsCache/AnswerWS/AnswerWS/AnswerWS.java StackExchange Client/build/generated/jax-wsCache/AnswerWS/AnswerWS/AnswerWS_Service.java StackExchange Client/build/generated/jax-wsCache/AnswerWS/AnswerWS/GetAnswerByQID.java StackExchange Client/build/generated/jax-wsCache/AnswerWS/AnswerWS/GetAnswerByQIDResponse.java StackExchange Client/build/generated/jax-wsCache/AnswerWS/AnswerWS/ObjectFactory.java StackExchange Client/build/generated/jax-wsCache/AnswerWS/AnswerWS/package-info.java StackExchange Client/build/generated/jax-wsCache/QuestionWS/QuestionWS/GetQuestion.java StackExchange Client/build/generated/jax-wsCache/QuestionWS/QuestionWS/GetQuestionResponse.java StackExchange Client/build/generated/jax-wsCache/QuestionWS/QuestionWS/ObjectFactory.java StackExchange Client/build/generated/jax-wsCache/QuestionWS/QuestionWS/Question.java StackExchange Client/build/generated/jax-wsCache/QuestionWS/QuestionWS/QuestionWS.java StackExchange Client/build/generated/jax-wsCache/QuestionWS/QuestionWS/QuestionWS_Service.java StackExchange Client/build/generated/jax-wsCache/QuestionWS/QuestionWS/package-info.java StackExchange Client/build/web/META-INF/MANIFEST.MF StackExchange Client/build/web/WEB-INF/classes/AnswerWS/AnswerWS.class StackExchange Client/build/web/WEB-INF/classes/AnswerWS/AnswerWS_Service.class StackExchange Client/build/web/WEB-INF/classes/AnswerWS/GetAnswerByQID.class StackExchange Client/build/web/WEB-INF/classes/AnswerWS/GetAnswerByQIDResponse.class StackExchange Client/build/web/WEB-INF/classes/AnswerWS/ObjectFactory.class StackExchange Client/build/web/WEB-INF/classes/AnswerWS/package-info.class StackExchange Client/build/web/WEB-INF/classes/QuestionWS/GetQuestion.class StackExchange Client/build/web/WEB-INF/classes/QuestionWS/GetQuestionResponse.class StackExchange Client/build/web/WEB-INF/classes/QuestionWS/ObjectFactory.class StackExchange Client/build/web/WEB-INF/classes/QuestionWS/Question.class StackExchange Client/build/web/WEB-INF/classes/QuestionWS/QuestionWS.class StackExchange Client/build/web/WEB-INF/classes/QuestionWS/QuestionWS_Service.class StackExchange Client/build/web/WEB-INF/classes/QuestionWS/package-info.class StackExchange Client/build/web/WEB-INF/wsdl/AnswerWS.wsdl StackExchange Client/build/web/WEB-INF/wsdl/localhost_8080/StackExchangeWS/AnswerWS.wsdl StackExchange Client/build/web/WEB-INF/wsdl/localhost_8080/StackExchangeWS/QuestionWS.wsdl StackExchange Client/build/web/WEB-INF/wsdl/localhost_8080/StackExchangeWS/QuestionWS.xsd_1.xsd StackExchange Client/build/web/index.html StackExchange Client/nbproject/ant-deploy.xml StackExchange Client/nbproject/private/private.properties StackExchange Client/nbproject/project.properties StackExchange Client/nbproject/project.xml StackExchange Client/src/conf/MANIFEST.MF StackExchange Client/src/conf/xml-resources/web-service-references/AnswerWS/wsdl/localhost_8080/StackExchangeWS/AnswerWS.wsdl StackExchange Client/src/conf/xml-resources/web-service-references/QuestionWS/wsdl/localhost_8080/StackExchangeWS/QuestionWS.wsdl StackExchange Client/src/conf/xml-resources/web-service-references/QuestionWS/wsdl/localhost_8080/StackExchangeWS/QuestionWS.xsd_1.xsd StackExchange Client/web/WEB-INF/wsdl/localhost_8080/StackExchangeWS/QuestionWS.wsdl StackExchange Client/web/WEB-INF/wsdl/localhost_8080/StackExchangeWS/QuestionWS.xsd_1.xsd StackExchange Client/web/index.html StackExchange WS/build.xml StackExchange WS/build/generated-sources/jax-ws/AnswerWS/Answer.java StackExchange WS/build/generated/jax-wsCache/AnswerWS/AnswerWS/Answer.java StackExchange WS/build/web/WEB-INF/classes/Answer/Test.class StackExchange WS/build/web/WEB-INF/classes/AnswerModel/Answer.class StackExchange WS/build/web/WEB-INF/classes/AnswerWS/Answer.class StackExchange WS/build/web/WEB-INF/classes/Question/Test.class StackExchange WS/build/web/WEB-INF/classes/QuestionModel/Question.class StackExchange WS/build/web/WEB-INF/glassfish-web.xml StackExchange WS/build/web/WEB-INF/jax-ws-catalog.xml StackExchange WS/build/web/WEB-INF/web.xml StackExchange WS/build/web/WEB-INF/wsdl/localhost_8080/StackExchangeWS/AnswerWS.xsd_1.xsd StackExchange WS/build/web/gfv3ee6.dpf StackExchange WS/catalog.xml StackExchange WS/nbproject/build-impl.xml StackExchange WS/nbproject/genfiles.properties StackExchange WS/nbproject/jax-ws.xml StackExchange WS/nbproject/jaxws-build.xml StackExchange WS/src/conf/xml-resources/web-service-references/AnswerWS/wsdl/localhost_8080/StackExchangeWS/AnswerWS.xsd_1.xsd StackExchange WS/src/java/Answer/Test.java StackExchange WS/src/java/AnswerModel/Answer.java StackExchange WS/src/java/DatabaseWS/DB.java StackExchange WS/src/java/Question/Test.java StackExchange WS/src/java/QuestionModel/Question.java StackExchange WS/web/WEB-INF/glassfish-web.xml StackExchange WS/web/WEB-INF/jax-ws-catalog.xml StackExchange WS/web/WEB-INF/web.xml StackExchange WS/web/WEB-INF/wsdl/localhost_8080/StackExchangeWS/AnswerWS.xsd_1.xsd StackExchange/build.xml StackExchange/build/web/META-INF/MANIFEST.MF StackExchange/build/web/WEB-INF/glassfish-web.xml StackExchange/nbproject/ant-deploy.xml StackExchange/nbproject/build-impl.xml StackExchange/nbproject/genfiles.properties StackExchange/nbproject/project.properties StackExchange/nbproject/project.xml StackExchange/src/conf/MANIFEST.MF WBD_IS/build.xml WBD_IS/build/web/META-INF/MANIFEST.MF WBD_IS/build/web/WEB-INF/glassfish-web.xml WBD_IS/nbproject/ant-deploy.xml WBD_IS/nbproject/build-impl.xml WBD_IS/nbproject/genfiles.properties WBD_IS/nbproject/project.properties WBD_IS/nbproject/project.xml WBD_IS/src/conf/MANIFEST.MF
…h login jalan, bisa replace data lama di table jika login kembali
- File jsp sudah terhubung dengan soap (masih belom semua fungsi dijalankan) - File jsp belom dihubungkan dengan token
- NetBeans Project for Front End (jsp sudah connect ke WS, tapi belum connect ke IS)
Conflicts: StackExchange Client/nbproject/private/private.xml StackExchange WS/build/web/WEB-INF/classes/AnswerModel/AnswerWS.class StackExchange WS/build/web/WEB-INF/classes/QuestionModel/QuestionWS.class StackExchange WS/build/web/WEB-INF/classes/UserModel/User.class StackExchange WS/build/web/WEB-INF/classes/UserModel/UserWS.class StackExchange WS/dist/StackExchangeWS.war StackExchange WS/nbproject/private/private.xml StackExchange WS/src/java/UserModel/User.java StackExchange WS/src/java/UserModel/UserWS.java
+ added registration.jsp + jsp got token from IS + jsp could pass token and id to another jsp - belum menjalankan query insert, update, delete dari soap
This reverts commit 6ea9afe.
(Contributor : Steven Andianto)
- IS sudah bisa mengeluarkan expired time - front end sudah terhubung dengan soap dan IS - IS dan soap sudah terhubung - semua function sudah bisa diimplementasi, kecuali vote (masih dalam tahap perbaikan)
-Semua berjalan dengan baik (kecuali vote)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.