Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
f465caf
allow multiple highlight per plugin
yann300 May 4, 2020
3373887
Added line class to hightlighter
ioedeveloper May 6, 2020
6b5dd74
Editor scroll
ioedeveloper May 7, 2020
bff67fd
Fixed linting error
ioedeveloper May 7, 2020
68e94cf
add more tests
yann300 May 11, 2020
4d12181
remove uneeded fn
yann300 May 11, 2020
c585030
remove uneeded commands
yann300 May 11, 2020
4801433
Merge pull request #2815 from ethereum/fix#2793
yann300 May 11, 2020
3a52847
added categorie to watning message
LianaHus Apr 30, 2020
b37afb9
warning list UI changes. added more info and fixed warning position h…
LianaHus May 6, 2020
6296675
test correction for waring
LianaHus May 11, 2020
6a9632e
fixed overwriteing of location for warnings
LianaHus May 11, 2020
1f6267d
highlight the scope
LianaHus May 11, 2020
1dc53ec
changed the opacity of highlight color
LianaHus May 12, 2020
8a86478
standart
LianaHus May 12, 2020
e18d330
using source highlighter /disabled now/
LianaHus May 13, 2020
4b20818
fixed typo
LianaHus May 13, 2020
ffca4fc
tyle fixed
LianaHus May 14, 2020
0f2eedb
Initial commit
ioedeveloper May 16, 2020
82fb03d
Merge remote-tracking branch 'remix-ide/master'
ioedeveloper May 16, 2020
d9392d2
Moved remix-ide to subdirectory
ioedeveloper May 16, 2020
38fa645
Setup new workspace
ioedeveloper May 16, 2020
bae18b3
Resolved merge conflict
ioedeveloper May 16, 2020
389499a
Update lint
ioedeveloper May 16, 2020
8b4ea4a
Setup eslint for remix-ide and master changes and branches
ioedeveloper May 17, 2020
6638369
Added config.yml
ioedeveloper May 17, 2020
94f5d7d
Disable eslint for path
ioedeveloper May 17, 2020
a287c62
Set relative path for test
ioedeveloper May 17, 2020
bf1cf78
Debug ci
ioedeveloper May 17, 2020
d23b434
Changed path in browser.sh
ioedeveloper May 17, 2020
d861628
Debug ci
ioedeveloper May 17, 2020
026efc5
Debug ci
ioedeveloper May 17, 2020
f869588
Changed test spliting dir
ioedeveloper May 17, 2020
840ffa6
Debug ci
ioedeveloper May 17, 2020
c615880
Debug ci
ioedeveloper May 17, 2020
0d75f46
Make changes to test
ioedeveloper May 17, 2020
769e005
Change from sendKeys to keys
ioedeveloper May 18, 2020
e308df8
Changed shared dir
ioedeveloper May 18, 2020
c2febcf
Changed shared dir
ioedeveloper May 18, 2020
a6f30ef
List dir content
ioedeveloper May 18, 2020
20a2483
List dir content
ioedeveloper May 18, 2020
bd6bae0
Debug ci
ioedeveloper May 18, 2020
d72566c
Debug ci
ioedeveloper May 18, 2020
102bf9d
Changed has for javascriptVM deploy
ioedeveloper May 18, 2020
2801337
Modified fileExplorer test to make use of custom rename
ioedeveloper May 18, 2020
9d55645
set json element for firefox
ioedeveloper May 18, 2020
2189e9d
Removed click for uninteractable element
ioedeveloper May 18, 2020
bbed9d9
Disabled syntax highlighting tests
ioedeveloper May 18, 2020
81109c2
Re-enabled syntax highlighting tests
ioedeveloper May 19, 2020
5fd69f9
Removed async/await
ioedeveloper May 19, 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
6 changes: 0 additions & 6 deletions .babelrc

This file was deleted.

16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
environment:
- COMMIT_AUTHOR_EMAIL: "[email protected]"
- COMMIT_AUTHOR: "Circle CI"
- FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
- FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
working_directory: ~/remix-project

parallelism: 20
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
environment:
- COMMIT_AUTHOR_EMAIL: "[email protected]"
- COMMIT_AUTHOR: "Circle CI"
- FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
- FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
working_directory: ~/remix-project

parallelism: 20
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
environment:
- COMMIT_AUTHOR_EMAIL: "[email protected]"
- COMMIT_AUTHOR: "Circle CI"
- FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
- FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
working_directory: ~/remix-project

steps:
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
environment:
- COMMIT_AUTHOR_EMAIL: "[email protected]"
- COMMIT_AUTHOR: "Circle CI"
- FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
- FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
working_directory: ~/remix-project

steps:
Expand All @@ -134,7 +134,7 @@ jobs:
name: Deploy
command: |
if [ "${CIRCLE_BRANCH}" == "remix_live" ]; then
./ci/deploy_from_travis_remix-live.sh;
./apps/remix-ide/ci/deploy_from_travis_remix-live.sh;
fi
- store_artifacts:
path: ./apps/remix-ide/reports/screenshots
Expand All @@ -152,7 +152,7 @@ jobs:
environment:
- COMMIT_AUTHOR_EMAIL: "[email protected]"
- COMMIT_AUTHOR: "Circle CI"
- FILES_TO_PACKAGE: "assets background.js build icon.png index.html manifest.json README.md soljson.js package.json"
- FILES_TO_PACKAGE: "apps/remix-ide/assets apps/remix-ide/background.js apps/remix-ide/build apps/remix-ide/icon.png apps/remix-ide/index.html apps/remix-ide/manifest.json apps/remix-ide/README.md apps/remix-ide/soljson.js apps/remix-ide/package.json"
working_directory: ~/remix-project

steps:
Expand All @@ -163,10 +163,10 @@ jobs:
name: Deploy
command: |
if [ "${CIRCLE_BRANCH}" == "master" ]; then
./ci/deploy_from_travis_remix-alpha.sh;
./apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh;
fi
- store_artifacts:
path: ./apps/reports/screenshots
path: ./apps/remix-ide/reports/screenshots

workflows:
version: 2
Expand Down
1 change: 0 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
NODE_OPTIONS=--max-old-space-size=3072
gist_token = <token>
account_passphrase = <passphrase>
account_password = <password>
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
Expand Down Expand Up @@ -36,4 +37,4 @@ testem.log

# System Files
.DS_Store
Thumbs.db
Thumbs.db
Loading