-
Notifications
You must be signed in to change notification settings - Fork 0
Merge to main #13
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
eemdeeks
wants to merge
27
commits into
main
Choose a base branch
from
develop
base: main
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.
Open
Merge to main #13
Changes from all commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
a5fd817
chore : cloud init
JaeUngJang a3384f4
feat : synchronize database
JaeUngJang 314e8b3
chore : edit notification view
musclefrog 721dc98
chore : add lists to check database in real time
JaeUngJang cf1da1d
feat : add description modal view
musclefrog 2550ceb
Merge pull request #8 from MC2-Team7/feature/UI
musclefrog 84e9af2
Merge branch 'develop' into feature/cloud
eemdeeks 749c2c9
Merge pull request #9 from MC2-Team7/feature/cloud
eemdeeks 5a6fa5d
chore : fix date sorting error
musclefrog 67726d6
fix : fix some build error
eemdeeks a9e38a8
chore : edit description modal view
musclefrog 74e3b90
feat : add push notification from baby to parents
eemdeeks b10cb05
chore : delete peripheral files
eemdeeks 5243e6d
feat : add app launch screen
musclefrog da3a71c
Merge pull request #10 from MC2-Team7/feature/UI
yerimee82 6bf5f86
chore : add alert after pressing send button
eemdeeks 725ff4e
Merge branch 'develop' into feature/notiFromBaby
JaeUngJang beab14e
fix : fix some error
JaeUngJang 1831f2f
Merge pull request #11 from MC2-Team7/feature/notiFromBaby
JaeUngJang e913f8f
chore : delete heart button
JaeUngJang 64f578e
chore : edit description modal view
musclefrog 16cc527
Merge pull request #12 from MC2-Team7/feature/deleteHeart
JaeUngJang 5b1bbbd
chore : add button reset function
eemdeeks 3252eb0
feat : check network connection
eemdeeks 72c06de
Merge pull request #14 from MC2-Team7/feature/ddan
eemdeeks c94f5f6
chore : fix alert
eemdeeks 4675256
Merge pull request #15 from MC2-Team7/feature/last
eemdeeks File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "appIcon.png", | ||
| "idiom" : "universal", | ||
| "platform" : "ios", | ||
| "size" : "1024x1024" | ||
|
|
||
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
CookCookMom/Assets.xcassets/LaunchScreenImage.imageset/Contents.json
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "LaunchScreenImage.png", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+168 KB
CookCookMom/Assets.xcassets/LaunchScreenImage.imageset/LaunchScreenImage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions
21
CookCookMom/Assets.xcassets/clickCarrot.imageset/Contents.json
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "clickCarrot.svg", | ||
| "idiom" : "universal", | ||
| "scale" : "1x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "2x" | ||
| }, | ||
| { | ||
| "idiom" : "universal", | ||
| "scale" : "3x" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
bundle identifier를 클라우드킷 콘솔 컨테이너 이름이랑 같게 써야해요.