Commit Graph

4852 Commits

Author SHA1 Message Date
Iuri Matias 0cca992fca Merge branch 'linting_fixes' of github.com:embark-framework/embark into linting_fixes
Please enter a commit message to explain why this merge is necessary,
2018-10-29 21:37:03 +01:00
Andre Medeiros 31deca4729 Defaults dont belong in environment variables 2018-10-29 19:15:01 +01:00
Iuri Matias 5362b804c4 tmp fix for when contract is missing in sol tests 2018-10-29 18:37:07 +01:00
Andre Medeiros 6494bfb858 fixes 2018-10-29 17:55:17 +01:00
Iuri Matias ae346c9f44 update tests 2018-10-29 17:28:49 +01:00
Iuri Matias 21d329eb6e update test script 2018-10-29 17:12:43 +01:00
Iuri Matias 1f5029c9a8 fix tests 2018-10-29 17:07:51 +01:00
Iuri Matias 10fd5af9a6 add workaround for env issue in the tests 2018-10-29 16:36:27 +01:00
Iuri Matias edc0a7cd43 revert some changes made to contract 2018-10-29 15:44:55 +01:00
Iuri Matias 71380be0ca fix linting issues 2018-10-29 15:33:12 +01:00
Iuri Matias 99d618c2e3 lint fixes 2018-10-29 14:15:48 +01:00
Jonathan Rainville c6902efb2f fix Transactions constant 2018-10-29 12:32:24 +01:00
Jonathan Rainville f1d113a431 put aside under when on a small screen 2018-10-29 12:29:43 +01:00
Jonathan Rainville e0ce61f112 resolve conflict with Logger name 2018-10-29 12:29:20 +01:00
Jonathan Rainville 01dc5f0bef resolve conflict in toolbar 2018-10-29 12:26:03 +01:00
Jonathan Rainville 207c1319b1 fix overflow of the aside 2018-10-29 12:23:47 +01:00
Jonathan Rainville 2af3ac439b for aside style 2018-10-29 12:23:47 +01:00
Jonathan Rainville 8b1f970f74 conflict in editor 2018-10-29 12:23:47 +01:00
Jonathan Rainville 19ad229dbb refactor AsideContainer to remove duplication 2018-10-29 12:23:46 +01:00
Iuri Matias f483230650
Merge pull request #178 from status-im/fix/change-contract-folder-icon
Change contract folder icon
2018-10-29 12:11:16 +01:00
Iuri Matias 6a9c067167
Merge pull request #177 from status-im/feature/deployment-header-improvement
Fix contract deployment headers
2018-10-29 12:07:22 +01:00
Iuri Matias 896debefbd
Merge pull request #176 from status-im/packaging_improvements
Packaging improvements
2018-10-29 12:05:52 +01:00
Iuri Matias c10185c0f9
Merge pull request #181 from status-im/fix/editor-tool-bar-tabs
fix(cockpit/TextEditorToolbar): set active state on selected tabs
2018-10-29 11:59:49 +01:00
Iuri Matias 1dd5ae7831
Merge pull request #182 from status-im/bugfix/better-error-message
Display better error message
2018-10-29 11:54:14 +01:00
Anthony Laibe 360df5f6ef Display better error message 2018-10-28 17:10:38 +01:00
Pascal Precht 2e4e6a3381
fix(cockpit/TextEditorToolbar): set active state on selected tabs
This commit ensures that the `activeTab` state for the Editor toolbar tabs
is properly passed down to `TextEditorToolbar` component, so it can be used
to set the active state accordingly.
2018-10-28 16:07:41 +01:00
Michael Bradley, Jr 7207108aaa give templates a common dot.gitignore
if a template (built-in, downloaded or otherwise) doesn't supply its own
dot.gitignore file then templates/dot.gitignore will be used

also, update dot.gitignore to ignore chains.json by default
2018-10-28 15:36:05 +01:00
Andre Medeiros aa136b470d Change contract folder icon
CHange it to something that indicates text files
2018-10-28 14:41:14 +01:00
Andre Medeiros dafd81ecbf Fix contract deployment headers
This will make the only linkable section of the title be the contract
name.
2018-10-28 13:43:29 +01:00
Michael Bradley, Jr dfd741ee8a don't gen source maps for production builds of embark-ui
don't include .env files in the pkg tarball
2018-10-28 13:16:20 +01:00
Michael Bradley, Jr 6999a37487 rm old lib/modules/webserver/backend
replaced by embark-ui
2018-10-28 13:16:20 +01:00
Michael Bradley, Jr 67d8c675c7 rm codeclimate, nycrc 2018-10-28 13:16:20 +01:00
Michael Bradley, Jr 59326e6500 embark-ui pkg lock -- http:// -> https:// 2018-10-28 13:16:20 +01:00
Michael Bradley, Jr 3ba00c488b bump shrinkwrap re: web3@1.0.0-beta.34 2018-10-28 13:16:20 +01:00
Michael Bradley, Jr 7b241743aa rev embark-ui .npmignore 2018-10-28 13:16:20 +01:00
Michael Bradley, Jr 8b98a79468 rev .npmignore 2018-10-28 13:16:20 +01:00
Michael Bradley, Jr eeeb74602b cleanup, consolidate .gitignore files 2018-10-28 13:16:20 +01:00
Iuri Matias 1576db38d5 Merge branch 'develop_51' of github.com:status-im/embark-area-51 into develop_51 2018-10-28 12:10:28 +01:00
Iuri Matias d1d5450747 decrease file size in 'show hidden files' text 2018-10-28 12:10:15 +01:00
Iuri Matias 6f626179ac
Merge pull request #173 from status-im/chores/linter
Add linter to embark-ui
2018-10-28 11:31:20 +01:00
Iuri Matias 3c93151750
Merge pull request #174 from status-im/feature/tabs-colored
Color tabs for text editor
2018-10-28 11:29:38 +01:00
Iuri Matias 1a60f0f718
Merge pull request #175 from status-im/bugfix/close-content-when-no-file
Reset content if empty
2018-10-28 11:28:42 +01:00
Anthony Laibe d1170d3cef Reset content if empty 2018-10-28 11:21:05 +01:00
Anthony Laibe f1e1c4a143 Color tabs for text editor 2018-10-28 10:39:40 +01:00
Anthony Laibe 5c19dcf672 Add linter to embark-ui 2018-10-28 10:13:09 +01:00
Iuri Matias eb8759083c
Merge pull request #172 from status-im/minor_style_improvements
fix button text colors and table background colors in the dark theme
2018-10-28 09:42:45 +01:00
Iuri Matias b20b872256 fix button text colors and table background colors in the dark theme 2018-10-28 09:34:04 +01:00
Iuri Matias 3007c109e7
Merge pull request #170 from status-im/bugfix/send-gas-with-function
bug: send gas when calling a function via API
2018-10-27 21:38:13 +02:00
Iuri Matias 3487265100
Merge pull request #169 from status-im/feature/do-not-close-expanded-folder
Do not close expanded node
2018-10-27 21:36:04 +02:00
Iuri Matias 9f6f7af3f7
Merge pull request #171 from status-im/global_vars
display globals in the debugger; display vars found in failing line
2018-10-27 21:33:00 +02:00