Skip to content

J feature #33

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

Open
wants to merge 53 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
9f2f064
one more
Aug 25, 2021
48040bb
test classes added
TatianaDeAngelo Aug 25, 2021
79f4e95
Merge pull request #1 from Chatter-Box/feat/tati
TatianaDeAngelo Aug 25, 2021
af881a1
classes
Aug 25, 2021
8e85396
Merge pull request #2 from Chatter-Box/dev
TatianaDeAngelo Aug 25, 2021
5a26a8f
Merge pull request #3 from Chatter-Box/feat/lau
LauraB90 Aug 25, 2021
a19f2e3
Merge pull request #4 from Chatter-Box/dev
LauraB90 Aug 25, 2021
bca788b
Added basic skeleton to profile
ZachKitto Aug 26, 2021
0b4de53
Added tests for profile
ZachKitto Aug 26, 2021
6ebb728
Added channel properties
JeremySabina Aug 26, 2021
e6855cf
Merge pull request #5 from Chatter-Box/JFeature
JeremySabina Aug 26, 2021
430c938
Merge pull request #6 from Chatter-Box/JFeature
JeremySabina Aug 26, 2021
1a37323
Channels are almost complete
JeremySabina Aug 26, 2021
5a211a2
Merge pull request #7 from Chatter-Box/JFeature
JeremySabina Aug 26, 2021
24fdd50
Added profile services
ZachKitto Aug 26, 2021
09441c5
message
Aug 26, 2021
1b39e22
messagel
Aug 26, 2021
1d88fd0
Merge pull request #8 from Chatter-Box/feat/lau
LauraB90 Aug 26, 2021
36fc884
Comment added
JeremySabina Aug 26, 2021
694a0d8
Merge branch 'dev' into JFeature
JeremySabina Aug 26, 2021
7fd4bb9
Merge pull request #10 from Chatter-Box/JFeature
JeremySabina Aug 26, 2021
b1b4cb3
fixed
JeremySabina Aug 26, 2021
660f7a5
Added tests for profile service
ZachKitto Aug 27, 2021
ed5269b
fixed merge conflicts
ZachKitto Aug 27, 2021
3c0fd5b
Merge pull request #12 from Chatter-Box/testbranch
ZachKitto Aug 27, 2021
b2bccbb
Added relations to entity columns
ZachKitto Aug 27, 2021
6af07dd
added messages iterable
JeremySabina Aug 27, 2021
ab81bcc
changed password encryption
ZachKitto Aug 27, 2021
87eb20b
Merge pull request #13 from Chatter-Box/feature/password
ZachKitto Aug 27, 2021
0a3fd60
Added Web Socket Configuration
JeremySabina Aug 27, 2021
75c3939
Merge pull request #14 from Chatter-Box/JFeature
JeremySabina Aug 27, 2021
3e43f56
Working on Postmen connections
JeremySabina Aug 28, 2021
88903e0
Merge pull request #15 from Chatter-Box/JFeature
JeremySabina Aug 28, 2021
a990e7d
WebSockets confirmed
JeremySabina Aug 28, 2021
5ce5e61
Merge pull request #16 from Chatter-Box/JFeature
JeremySabina Aug 28, 2021
cfec706
deleted javaProject?
JeremySabina Sep 2, 2021
ef279c0
Merge pull request #17 from Chatter-Box/JFeature
JeremySabina Sep 2, 2021
c3f3e37
added jwt authorization with spring security
ZachKitto Sep 6, 2021
01cd0b0
updated profile service tests
ZachKitto Sep 6, 2021
6441c61
websockenconfig
JeremySabina Sep 8, 2021
d8ebbe9
Merge pull request #18 from Chatter-Box/JFeature
JeremySabina Sep 8, 2021
7efc515
changed profile relations
ZachKitto Sep 8, 2021
16f4618
Merge branch 'dev' into feature/profile-controller-test
ZachKitto Sep 8, 2021
2e8318b
Merge pull request #19 from Chatter-Box/feature/profile-controller-test
ZachKitto Sep 8, 2021
93edbb3
changed message fields & added services to channel + message
ZachKitto Sep 9, 2021
690d174
Create .gitignore
JeremySabina Sep 10, 2021
e7643e9
Create .gitignore
JeremySabina Sep 10, 2021
51182ca
git ignore
JeremySabina Sep 10, 2021
4e88f59
Merge branch 'JFeature' of https://github.com/Chatter-Box/FullStack.M…
JeremySabina Sep 10, 2021
57de0e4
l
JeremySabina Sep 10, 2021
3259bc0
changed entity fields
ZachKitto Sep 10, 2021
0caa41a
Merge pull request #20 from Chatter-Box/feature/profile-controller-test
ZachKitto Sep 10, 2021
bade0d1
final commit?
JeremySabina Sep 10, 2021
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
Binary file added .DS_Store
Binary file not shown.
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/jpa-buddy.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__antlr_antlr_2_7_7.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__ch_qos_logback_logback_classic_1_2_5.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__ch_qos_logback_logback_core_1_2_5.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_datastax_oss_native_protocol_1_5_0.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_fasterxml_classmate_1_5_1.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_github_jnr_jffi_1_3_1.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_github_jnr_jffi_native_1_3_1.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_github_jnr_jnr_a64asm_1_0_0.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_github_jnr_jnr_constants_0_10_1.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_github_jnr_jnr_ffi_2_2_2.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__com_github_jnr_jnr_posix_3_1_5.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading