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

OAuth, removed mock server, latest releases, many fixes and more #32

Merged
merged 60 commits into from Jan 10, 2018
Merged

OAuth, removed mock server, latest releases, many fixes and more #32

merged 60 commits into from Jan 10, 2018

Conversation

eitanfr
Copy link
Contributor

@eitanfr eitanfr commented Sep 17, 2017

  • updated packages to their latest versions
  • fixed linting
  • fixed types
  • used offline-js as a package instead of using files directly in the project
  • put together the Authorization token with lazy initialized GraphQL Subscription
  • Moved Chat and Channels services to ChatView Component
  • Removed mock server
  • Moved scroll logic to ScrollerService
  • Used the same avatar placeholders as in Rocket.Chat app
  • Fixed reversed sorting
  • Implemented translation for server's messages like (User joined the channel)
  • Implemented # and @ prefix in channels name
  • Implemented a change of direct channel input in GraphQL queries and mutations
  • Implemented js-accounts
  • Implemented OAuth integration

@kamilkisiela @tomermoshe

kamilkisiela and others added 30 commits July 19, 2017 14:04
@kamilkisiela
WIP
06c419a
@kamilkisiela
Can login
de56380
@eitanfr
default avatar
84a14a7
@eitanfr
default avatar
40b06fa
@eitanfr
update accounts client
cfcf940
@eitanfr
check if channel name exists
008f88d
@kamilkisiela
WIP
817fab6
Merge branch 'PWA' into feat/default-avatar
fcaf595 
# Conflicts:
#	src/app/shared/shared.module.ts
fix:
6f52144 
1.unsubscribe Subscription query
2. send message to empty channel
unwanted
2b8cf1a
direct channels working
f3a6ee7
restore old infinite scroll
72955eb
removed redundant code
efbb268
@tomermoshe
Merge pull request #1 from kamilkisiela/feat/default-avatar
1799b80 
add default avatar
@tomermoshe
Merge pull request #4 from kamilkisiela/fix-direct-channel
202d125 
Fixed direct channel
Merge branch 'PWA' into fix/initnital-chat-messages
7bf5247 
# Conflicts:
#	src/app/chat/chat-view/chat-view.component.ts
#	src/app/chat/services/chat/chat.service.ts
@eitanfr
Merge pull request #2 from kamilkisiela/fix/initnital-chat-messages
ea0b023 
Fix/initnital chat messages
Merge branch 'PWA' into fix/to-infinite-scroll
5ec2c28 
# Conflicts:
#	src/app/chat/chat-view/chat-view.component.ts
after merge
2b6b100
@eitanfr
Merge pull request #3 from kamilkisiela/fix/to-infinite-scroll
b3f69b9 
Fix/to infinite scroll
@kamilkisiela
Fix linting
8822edb
@kamilkisiela
Implement directTo param
adf9e05
@kamilkisiela
Use # and @ depending on channel's type
c52d735
@kamilkisiela
Introduce TranslateServer pipe for server-generated messages
fc25231
@kamilkisiela
Add trackBy to ChatView
2837d22
@kamilkisiela
Update types to latest
4328d4b
@kamilkisiela
Fix reversed sorting
1693a5d
@kamilkisiela
Fix missing id in User object
540b7c9
@kamilkisiela
Fix reseting an input in message submit form
1628c4a
@kamilkisiela
Use the same avatar placeholders as in RocketChat app
67ee1ec
kamilkisiela and others added 23 commits September 7, 2017 18:52
@kamilkisiela
Move Chat and Channels services to ChatView
cc34baa
@kamilkisiela
Bring back lite-server and fix scripts
f72c60c
@kamilkisiela
Stick to proper releases
57e58df
@kamilkisiela
Fix mutation that does not run
311d67b
@kamilkisiela
Make GQL Subscription lazy and put the Authorization token in connect…
7defa99 
…ionParams
@kamilkisiela
Use esnext.AsyncIterable
e348b24
@kamilkisiela
Use offline-js with Angular CLI
43a0af2
@kamilkisiela
Fix types - gql-gen changed the structure of types
c954043
@kamilkisiela
Fix linting (add app- prefix, remove few tests)
3af62a1
@kamilkisiela
Fix missing dash -prod instead of --prod
9aa9670
@kamilkisiela
Add lock file
0d5ffc5
@kamilkisiela
Update deps to latest
fea869e
@kamilkisiela
Fix XHR issue (zone.js)
abc4228
@kamilkisiela
Remove offline-js files that were included in the project
38fb1ba
@kamilkisiela
Remove tests
e97b09a
@kamilkisiela
Rearrange npm scripts (prod)
ef71c91
@kamilkisiela
Add travis
aa919c9
@kamilkisiela
Update lock file
6ecef99
@kamilkisiela
Allow CI to run on all branches
8e327a1
@kamilkisiela
Merge pull request #5 from kamilkisiela/latest
99b32fc 
Update to latest
@kamilkisiela
Update to latest changes in Rocket.Chat
cda4039
@eitanfr
Merge pull request #25 from kamilkisiela/PWA
b7ac122 
OAuth, removed mock server, latest releases, many fixes and more
@eitanfr
Update README.md
a0164ca
@CLAassistant
Copy link

CLAassistant commented Sep 17, 2017 •
edited

CLA assistant check
All committers have signed the CLA.

@Urigo Urigo mentioned this pull request Sep 17, 2017
Open
@kamilkisiela
Copy link
Contributor

Related GraphQL server implementation RocketChat/Rocket.Chat#8158

This was referenced Jan 10, 2018
Merged
Merged
@karlprieb karlprieb merged commit a0164ca into RocketChat:develop Jan 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@karlprieb karlprieb karlprieb approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@eitanfr @CLAassistant @kamilkisiela @karlprieb @tomermoshe