Skip to content

Version 4.0 #1311

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

Merged
merged 111 commits into from
May 24, 2018
Merged

Version 4.0 #1311

merged 111 commits into from
May 24, 2018

Conversation

samtstern
Copy link
Contributor

No description provided.

samtstern and others added 30 commits February 20, 2018 17:22
Change-Id: I9890f5c629ce972624a5cf0fcd5276e83f48d1e5
Change-Id: I4c640d09a0c585f046df32b76b00bd48db94aacb
Change-Id: Id78e7ceee80b670424de4c93a5be2e819aac6fbb
Change-Id: I278fe22606f979011409b37938092763358b4dac
Change-Id: I3b4970fc36dfbbae6045e796577d67e10f015fde
Change-Id: I4102d360594aeb75183f0ac8f1d300826de3b47f
Change-Id: I2264ada2d13cf9c667680f3a278f7b5e2edf0cb0
Change-Id: I75cd769dd3f9cd4c6d6cc1de13d411646827430c
Change-Id: I2be8141c859ba84994b4d9eeb624d2893aa02c3a
Change-Id: Ifc3ab274dcd2df184901452b26e1fe1cbe68f581
Change-Id: I7b7a7da48530817dfad36afd428af7f553e12cd0
Change-Id: Ia8711bfb5b4f8dde11d4ef4630fabf70b945d45e
Change-Id: I5935b36ea30207d0e4b2a8091a258d108bad9d5a
Change-Id: Ic50dfc07ddd51bf318d655df6fae20ab0af28dcc
Signed-off-by: Alex Saveau <[email protected]>
Signed-off-by: Alex Saveau <[email protected]>
…-sign-in

# Conflicts:
#	app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java
Signed-off-by: Alex Saveau <[email protected]>
Signed-off-by: Alex Saveau <[email protected]>
Change-Id: I863d67d604b1ef768a591d2456e71a7f94730a53
Change-Id: I5da44eeb96a9acf4adf76e0ade70b9ae43a4308e
Change-Id: Idaa7d98c4c4712354ff6a4ed10883f8dc78fa898
Signed-off-by: Alex Saveau <[email protected]>
Signed-off-by: Alex Saveau <[email protected]>
Signed-off-by: Alex Saveau <[email protected]>
Signed-off-by: Alex Saveau <[email protected]>
samtstern and others added 13 commits May 14, 2018 07:55
Change-Id: I6d6429742bf3d4293c611a7ac741dac2654e2ec0
Change-Id: I7a60cd497bc00b6b9e6f92b44df1527725d96daa
Change-Id: Id976c22c8a9a820377940a953265484bf6e1dfae
Change-Id: I65272097018400f1f9df498d757151985650d747
Change-Id: I540fca91aa8e33f79cc364a5ed267a4fb76e6cf4
Change-Id: I49ba7416bbeecaf21ada7c24f42cb4cbd82a8b54
Change-Id: I3ae0d88949d4e22e403044458aa5b9c2083d482b
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored or co-authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@samtstern
Copy link
Contributor Author

Looks like some of my "squash and merge" attempts didn't take. So this release is going to have an unfortunately messy commit history.

Oh well!

@samtstern
Copy link
Contributor Author

cc @SUPERCILEX @lsirac

@SUPERCILEX
Copy link
Collaborator

We should also remove the unused resources... I could do that later tonight if needed. 😊

@samtstern
Copy link
Contributor Author

@SUPERCILEX ah good call, I can do that.

samtstern added 2 commits May 22, 2018 14:48
Change-Id: I24ddc8d1b9044ebea0cb6e5b2505e41ee698f0f9
samtstern added 6 commits May 23, 2018 15:08
Change-Id: I4f294892ec3fcac175a567b5fecf6cf7715930a0
Change-Id: I5b5495b15e1a9928eee12b9c05f3fb655b753802
Change-Id: I5f0bc8c15ea12086e5005965018cd61154e8e661
Change-Id: I4b4c8aa0c26738bdaa74dac846194c59744ca73a
Change-Id: I721967bd557c8322328e1ada17f8a7d43e3851e1
@samtstern
Copy link
Contributor Author

samtstern commented May 24, 2018

I am going to get rid of some of these shitty commits


Edit: apparently no, I am not.

@samtstern samtstern merged commit 7d7a1fc into master May 24, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants