aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-08-17Remove debugging console.logtma1007-discover-moments-video-watermarkMichael
2021-08-17Build and test watermarking. Fix small logic issue.Michael
2021-08-17Small spacing.Michael
2021-08-17Resolve more merge conflicts.Michael
2021-08-17Merge with new develop and resolve merge conflicts in EditMedia.tsxMichael
2021-08-17Merge branch 'develop' of https://github.com/TaggiD-Inc/Frontend into developMichael
2021-08-17Update the image functions to also incorporate the videos. Resolve merge conf...Michael
2021-08-17Reposition uri within function.Michael
2021-08-17Merge remote-tracking branch 'upstream/develop' into tma1007-discover-moments...Michael
2021-08-17Merge pull request #552 from IvanIFChen/tma1046-bugfix-badge-modal-not-showingIvan Chen
2021-08-17Merge pull request #553 from IvanIFChen/tma1003-handle-deep-linksIvan Chen
2021-08-16Merge pull request #543 from sotech117/tma1006-discover-moments-image-watermarkIvan Chen
2021-08-16LintIvan Chen
2021-08-16Comment out test codeIvan Chen
2021-08-16Fix navigation by adding screen typeIvan Chen
2021-08-13Build app.Michael
2021-08-13Fix yarn.lockMichael
2021-08-13Add newline to lock files.Michael
2021-08-13Rebase yarn.lock.Michael
2021-08-13Rebase podfile.lockMichael
2021-08-13Update podfile by running pod installMichael
2021-08-13Run yarn to reinstall packages.Michael
2021-08-13Remove random 9 lul.Michael
2021-08-13Remove yarn.lock for reformatting.Michael
2021-08-13Merge remote-tracking branch 'upstream/develop' into tma1006-discover-moments...Michael
2021-08-13Merge branch 'develop' of https://github.com/TaggiD-Inc/Frontend into developMichael
2021-08-13Run pod install to clean Podfile.lock.Michael
2021-08-13Discard xcode workspace changes.Michael
2021-08-13Update plist.Michael
2021-08-13Add undefined type and null coalesing for error handling.Michael
2021-08-13Discard ip address for dev.Michael
2021-08-13Remove video library.Michael
2021-08-13Remove package-lock.jsonMichael
2021-08-13LintIvan Chen
2021-08-13Merge pull request #554 from IvanIFChen/develop-sync-with-masterIvan Chen
2021-08-13Merge branch 'master' into develop-sync-with-masterIvan Chen
2021-08-13Update lock ifleIvan Chen
2021-08-13Allow single moment to be displayed in loginIvan Chen
2021-08-13Add default values to ScreenType enumIvan Chen
2021-08-13Add deeplink listeners and navigationIvan Chen
2021-08-13Fix image scalingMichael
2021-08-13Merge branch 'master' into tma1007-discover-moments-video-watermarkMichael
2021-08-13Remove ffmpeg library.Michael
2021-08-13Add fast library to do video watermarking. Add logic to choose between video ...Michael
2021-08-13Fix scaling.Michael
2021-08-13Merge branch 'master' into tma1006-discover-moments-image-watermarkMichael
2021-08-13Merge branch 'master' of https://github.com/TaggiD-Inc/FrontendHEADmasterMichael
2021-08-13Added username, higher res asset, and fixed some scaling/styling issues.Michael
2021-08-13Try other commands for ffmpeg.Michael
2021-08-12Add single moment screen, Add callback listener in DM screenIvan Chen