Skip to content
This repository has been archived by the owner on Nov 10, 2023. It is now read-only.

Rebase master into development #647

Merged
merged 25 commits into from
Mar 9, 2020
Merged

Rebase master into development #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8f0f28b
v1.7.3 (#611)
mmv08 Feb 26, 2020
94539ec
Update package.json (#612)
mmv08 Feb 26, 2020
72268f7
Add public url to prod webpack config (#615)
mmv08 Feb 27, 2020
549febe
cherry pick new travis yml merge commit (#620)
mmv08 Feb 27, 2020
4707c2d
V1.7.5 release (#641)
mmv08 Mar 6, 2020
d3bac2f
BUG: App index.html cached on production (#642)
mmv08 Mar 9, 2020
37a8a01
Fix #596: Notification when safe is already updated (#599)
Agupane Feb 26, 2020
4c38ffd
Bug: #482 - Address book Custom transactions Recipient validation (#577)
Agupane Feb 26, 2020
1a32fe1
(feature) Adding origin for Apps Transactions (#576)
nicosampler Feb 27, 2020
fd70625
(Feature) Add checks into CI (#594)
fernandomg Feb 27, 2020
ab6a5f1
Repare new dev and staging enviroments to deploy (#618)
mmv08 Feb 27, 2020
9322a96
(fix) sidebar contents' scrolling (#622)
gabitoesmiapodo Feb 28, 2020
88c9bf9
(add) linter sorting rules (#614)
gabitoesmiapodo Feb 28, 2020
f4c1b69
(feature): [Safe Apps] App Transaction List Details (#601)
nicosampler Feb 28, 2020
3498d02
Bug: Accounts/Network are not updated in production build (#625)
mmv08 Feb 28, 2020
879bb3b
Adding Apps info to toast notification (#621)
nicosampler Mar 2, 2020
b8b41c2
update Apps list info (#629)
nicosampler Mar 3, 2020
0b9223d
Feature: replace web3connect with onboardjs (#456)
mmv08 Mar 4, 2020
8277df3
Passing ethBalance to Apps component (#636)
nicosampler Mar 5, 2020
bc19959
(Fix) Update safe modal verbiage (#633)
francovenica Mar 5, 2020
9725b43
Bump dependencies (#639)
mmv08 Mar 6, 2020
1f3a966
Use hash history (#638)
mmv08 Mar 6, 2020
a08bf96
- Updates how the transactions are ordered, now orders by nonce and t…
Agupane Mar 9, 2020
0a97ae6
(Fix) Lowercased safes address in URL (#631)
fernandomg Mar 9, 2020
280ea4c
Merge branch 'development' into rebase-master-into-development
fernandomg Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion config/travis/deploy_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@ then
REVIEW_RELEASE_FOLDER="$REPO_NAME_ALPHANUMERIC/$TRAVIS_TAG_ALPHANUMERIC"

# Deploy safe-team release project
aws s3 sync build_webpack s3://${REVIEW_BUCKET_NAME}/${REVIEW_RELEASE_FOLDER}/app --delete
aws s3 sync build_webpack s3://${REVIEW_BUCKET_NAME}/${REVIEW_RELEASE_FOLDER}/app --delete --exclude "*.html" --exclude "/page-data" --cache-control max-age=31536000,public

aws s3 sync build_webpack s3://${REVIEW_BUCKET_NAME}/${REVIEW_RELEASE_FOLDER}/app --delete --exclude "*" --include "*.html" --cache-control max-age=0,no-cache,no-store,must-revalidate --content-type text/html
fi
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "safe-react",
"version": "1.7.3",
"version": "1.7.6",
"description": "Allowing crypto users manage funds in a safer way",
"homepage": "https://github.com/gnosis/safe-react#readme",
"bugs": {
Expand Down