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

Rollup merge #185

Merged
merged 54 commits into from
May 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
d3d732d
- dynamic address circles
anonymoussprocket Mar 28, 2019
046618a
1: modified the columnsDisplay,
developer0623 Apr 26, 2019
e295c01
refactored the filter
developer0623 Apr 26, 2019
a822e65
fixed the disableAddFilter
developer0623 Apr 26, 2019
fcd5fb8
using first operator as default
developer0623 Apr 26, 2019
8307779
1: renamed the some variables.
developer0623 Apr 29, 2019
bbbc282
imported ConseilOperator from conseiljs
developer0623 Apr 30, 2019
7226eb6
fixed some issues
developer0623 Apr 30, 2019
648e6a4
Merge pull request #157 from Cryptonomic/feat/refactor-store
umurb Apr 30, 2019
d11f1b9
implemented the design for no results
developer0623 Apr 30, 2019
69707b0
changed the some function names
developer0623 May 1, 2019
6e86ca1
Replaced TezosIcons with Arronax Icons
developer0623 May 1, 2019
03fc0c4
Merge pull request #164 from Cryptonomic/feat/113-no-result
umurb May 1, 2019
ae70871
Merge pull request #165 from Cryptonomic/feat/159-replace-arronax-icon
umurb May 1, 2019
2dbf283
created the new toolbar
developer0623 May 2, 2019
43b41fb
Merge pull request #168 from Cryptonomic/feat/160-new-toolbar
umurb May 2, 2019
5ba36f3
implemented the Export CSV
developer0623 May 3, 2019
5703db5
implemented the whole query when export to csv
developer0623 May 3, 2019
1626140
changed the file name
developer0623 May 3, 2019
6fba947
Improved the UX with Column selection
developer0623 May 6, 2019
a5053d3
Merge pull request #170 from Cryptonomic/feat/161-export-csv
umurb May 6, 2019
04d79af
fixed some issues
developer0623 May 7, 2019
26666b4
Merge branch 'develop' into feat/132-column-selection
developer0623 May 7, 2019
74ad026
Merge pull request #172 from Cryptonomic/feat/132-column-selection
anonymoussprocket May 7, 2019
fdf6f38
implemented the clipboard
developer0623 May 7, 2019
c3f1ab2
Merge branch 'develop' into feature/133-colors
developer0623 May 7, 2019
240179a
Hide search box pending singleton view implementation
anonymoussprocket May 7, 2019
6193d42
Merge pull request #139 from Cryptonomic/feature/133-colors
anonymoussprocket May 7, 2019
4b30f53
- page title
anonymoussprocket May 7, 2019
39d9d34
- remove search box pending singleton views
anonymoussprocket May 7, 2019
4dd2d05
Merge branch 'develop' into feat/173-copy-hash
developer0623 May 8, 2019
4b1b208
correct color source
anonymoussprocket May 8, 2019
259978f
Merge pull request #176 from Cryptonomic/feat/173-copy-hash
anonymoussprocket May 8, 2019
cfdde42
implemented limit tooltip
developer0623 May 8, 2019
7a80603
wording
anonymoussprocket May 8, 2019
dd3d885
added `export csv ` feature
developer0623 May 9, 2019
a68ee3b
Merge branch 'feat/162-limit-tooltip' of https://github.com/Cryptonom…
developer0623 May 9, 2019
987e9be
implemented formatValueForDisplay
developer0623 May 9, 2019
c3d6505
using dataType
developer0623 May 9, 2019
2975a2b
fixed some issues
developer0623 May 9, 2019
e2c0a95
#174
anonymoussprocket May 9, 2019
b28c1a2
Merge pull request #186 from Cryptonomic/feat/162-limit-tooltip
vishakh May 9, 2019
49383ef
Merge branch 'develop' into feat/175-display-transform
developer0623 May 9, 2019
16f178b
declared the attribute type
developer0623 May 9, 2019
28ce8f2
Merge pull request #187 from Cryptonomic/feat/175-display-transform
anonymoussprocket May 10, 2019
a8a92b8
implemented the entity view modal
developer0623 May 10, 2019
bc6c8ca
fixed some issues
developer0623 May 10, 2019
b40053b
fixed some issue
developer0623 May 10, 2019
2cec5ea
used format instead of parse
developer0623 May 10, 2019
dffd32e
added type
developer0623 May 10, 2019
c29e0d2
- more manual entity links
May 10, 2019
c5c3dd0
- fix entity links
May 10, 2019
eab6e60
- boolean format
May 10, 2019
ac06721
Merge pull request #188 from Cryptonomic/feat/136-modal-entity-view
anonymoussprocket May 10, 2019
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
528 changes: 413 additions & 115 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,18 @@
"dependencies": {
"@material-ui/core": "^3.8.3",
"@material-ui/icons": "^3.0.1",
"conseiljs": "^0.2.1",
"conseiljs": "git+https://github.com/Cryptonomic/ConseilJS.git#a39441ce0fbb7a3458e4271f75557ffb94892a2d",
"moment": "^2.23.0",
"moment-timezone": "^0.5.25",
"rc-tooltip": "^3.7.3",
"react": "^16.8.5",
"react-clipboard.js": "^2.0.7",
"react-dom": "^16.8.5",
"react-moment": "^0.9.2",
"react-redux": "^5.0.7",
"react-router-dom": "^4.2.2",
"react-router-redux": "^4.0.8",
"react-swipeable-views": "^0.13.1",
"redux": "^4.0.0",
"redux-devtools-extension": "^2.13.7",
"redux-thunk": "^2.3.0",
Expand Down
Binary file added resources/fonts/ArronaxIcons/arronax.eot
Binary file not shown.
28 changes: 28 additions & 0 deletions resources/fonts/ArronaxIcons/arronax.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/fonts/ArronaxIcons/arronax.ttf
Binary file not shown.
Binary file added resources/fonts/ArronaxIcons/arronax.woff
Binary file not shown.
Binary file removed resources/fonts/TezosIcons/Tezos-icons.eot
Binary file not shown.
Loading