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.

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

Aaronmgdr/about below #1194

Merged
merged 53 commits into from
Jan 4, 2020
Merged

Aaronmgdr/about below #1194

merged 53 commits into from
Jan 4, 2020

Conversation

aaronmgdr
Copy link
Member

@aaronmgdr aaronmgdr commented Oct 3, 2019

Description

Implements the below the fold portion of the new about page design

Tested

Screen Shot 2019-10-02 at 4 57 14 PM

Screen Shot 2019-10-02 at 4 57 27 PM

Other changes

Describe any minor or "drive-by" changes here.

Related issues

fixes #1052
fixes https://github.com/celo-org/celo-labs/issues/201
fixes #2112

* master: (35 commits)
  [Wallet] Network fee in transaction feed (#1145)
  New About Page Cover (#905)
  Upgrade to Node 10 (#1148)
  [faucet] Add custom metrics (#1143)
  Add IdentityMetadata to Contractkit (#1126)
  [Wallet] Local currency v1.1 (#1137)
  Add attestation-service deploy (#1128)
  [Wallet] A few docs and build cleanup (#1138)
  [CircleCI]Add comment on how to fix lint checks (#1134)
  2019-09-30 integration deployment (#1149)
  Update web3 provider to new integration url (#1151)
  [celotool]Add fast mode to celotool invite (#1135)
  Revert "Feature/909 proxy delegatecall" (#1146)
  Use contractkit in notification service (#1118)
  Feature/909 proxy delegatecall (#1003)
  integration deployment for 2019-09-29 (#1139)
  Add instructions for npm publication to tag commit (#1117)
  Client Logs Data Flow script update (#1055)
  Deploying latest proxy code in genesis (#1122)
  Enable floating promises check everywhere (fix issues) (#1115)
  ...

# Conflicts:
#	packages/web/src/about/About.tsx
#	packages/web/src/about/images/index.ts
#	packages/web/static/locales/en/about.json
@codecov
Copy link

codecov bot commented Oct 8, 2019

Codecov Report

Merging #1194 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           master    #1194    +/-   ##
========================================
  Coverage   74.55%   74.55%            
========================================
  Files         278      278            
  Lines        7777     7777            
  Branches      707      991   +284     
========================================
  Hits         5798     5798            
  Misses       1868     1868            
  Partials      111      111
Flag Coverage Δ
#mobile 74.55% <ø> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 38d519b...d4d0d34. Read the comment docs.

@aaronmgdr
Copy link
Member Author

waiting on text/copy from Vanesa

* master: (56 commits)
  Update yarn.lock commit for websocket package to fix transaction-metrics-exporter in docker containers (#1282)
  Fix fellowship form (#1254)
  [Wallet] UI improvements on iOS (safe area, keyboard, and more) (#1225)
  VM Testnets cleanup, get transaction-metrics-exporter working with VM testnets (#1278)
  Prevent celotool dockerfile yarn network trouble error (#1281)
  [celotool]Use user info from gcloud tool (#1259)
  Remove 'bonds' from cli help and fix validatorgroup:member cmd describe message (#1240)
  Fix typos in dev README (#1257)
  Combined Web UI Tweaks (#1193)
  Fix failing yarn builds when building docker images (#1280)
  [CircleCI]Test more npm packages (#1263)
  Docs with assumptions made by testnet terraform module (#848)
  RetryWithBackOff for nexmo sends (#1250)
  Wallet e2e on Circle Ci (#1221)
  fix cDollar in Gold tab bug (#1277)
  [Wallet] Add exchange tobin tax education view (#1199)
  [Wallet] Fix lint warnings from floating promises  (#1269)
  Prep for Wallet v.1.5.0 deployment (#1244)
  Fix incremental testing script (#1255)
  [CLI]Test npm install on local package (#1207)
  ...
* master: (37 commits)
  [Wallet] Add support for social wallet (Safeguards) import  (#1414)
  [Wallet] Implement new backup flows including social backup (#1399)
  Use validator set precompiles in Attestations (#1248)
  E2E Attestations test + various e2e improvements (#1417)
  Update Footer (#1331)
  [Wallet] New camera permission flow (#1398)
  [Wallet] Enable push notifications on iOS (#1389)
  [Wallet] Add Celo Lite toggle (UI only, zeroSync on/off in other PR) (#1369)
  Document npm inter-repo dependencies instructions (#1370)
  [wallet]Add more documentation on ZeroSync mode (#1367)
  [wallet]Add documentation for jndcrash (#1364)
  Point end-to-end tests back to master (#1372)
  Alfajores changes & comment on unlocking accounts (#1297)
  Reconfigure terraform local configuration during init to allow multiple envs (#773)
  Implement proof-of-stake changes (#1177)
  [Celotool] Update blockchain-api deploy script to automatically update faucet address (#1347)
  Allow most recently reporting oracle to report again (#1288)
  [wallet]Add documentation for ZeroSync mode (#1361)
  Fix Metadata registration during contract deploy (#1346)
  [Wallet] Enable firebase on iOS (#1344)
  ...
@aaronmgdr aaronmgdr marked this pull request as ready for review November 6, 2019 19:35
@aaronmgdr aaronmgdr added the automerge Have PR merge automatically when checks pass label Jan 3, 2020
@celo-ci-bot-user celo-ci-bot-user merged commit 184fa13 into master Jan 4, 2020
@celo-ci-bot-user celo-ci-bot-user deleted the aaronmgdr/about-below branch January 4, 2020 01:50
aaronmgdr added a commit that referenced this pull request Jan 6, 2020
* master:
  Add docs on how to generate sms retriever hash (#2356)
  Aaronmgdr/about below (#1194)
  Switch to using native pbkdf to fix hanging on older devices (#2354)

# Conflicts:
#	packages/web/src/community/connect/FullCircle.tsx
#	yarn.lock
aaronmgdr added a commit that referenced this pull request Jan 6, 2020
* master:
  Add docs on how to generate sms retriever hash (#2356)
  Aaronmgdr/about below (#1194)
  Switch to using native pbkdf to fix hanging on older devices (#2354)

# Conflicts:
#	packages/web/src/fonts/Fonts.tsx
lucasege pushed a commit that referenced this pull request Jan 7, 2020
aaronmgdr added a commit that referenced this pull request Jan 9, 2020
* master: (139 commits)
  Accelerate time based parameters (#2377)
  Fix circle not being started (#2380)
  Blockscout logs patch for json format (#2268)
  [Wallet] Fix slow activity feed tx confirmations (#2290)
  Aaronmgdr/about followup (#2376)
  Change "not syncing" to "not synced" (#2372)
  [Docs] Update Contributing guide with links to good first issues  (#2375)
  Optimize Bundles (#2352)
  Update blockscout for alfajores and pilot envs (#1954)
  Make the same hotfix proposal executable with unique salts (#2357)
  Fix Contribution Guildelines in the docs (#2370)
  Add Snapshot for each page on website (#2313)
  Turn on Emit (#2369)
  Update to latest blockchain with select issuers fix (#2362)
  Add docs on how to generate sms retriever hash (#2356)
  Aaronmgdr/about below (#1194)
  Switch to using native pbkdf to fix hanging on older devices (#2354)
  Adding a command to the docker script allowing to stop validating (#2295)
  Update prettier to 1.19.1 to support TypeScript 3.7 (optional chaining, nullish coalescing, etc) (#2358)
  Fixes needed to make slashing work (#2346)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Have PR merge automatically when checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add a in memory cache in express for airtable api
3 participants