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.

Sign up for GitHub

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

Jump to bottom

Added line that selects the "More modules..." after adding a step. #713

Merged
merged 3 commits into from
Feb 1, 2019
Merged

Added line that selects the "More modules..." after adding a step. #713

merged 3 commits into from
Feb 1, 2019

Conversation

gfting
Copy link

@gfting gfting commented Jan 24, 2019 •
edited
Loading

Fixes #697

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with npm test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • ask @publiclab/reviewers and @publiclab/is-reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

View #706 for the previous version in which I inadvertently messed up the merge with upstream.

@gfting
Copy link
Author

gfting commented Jan 24, 2019

@harshkhandeparkar Here's the rewrite! Thanks again for the help. When I tried to undo the commits previously, it failed.

@harshkhandeparkar
Copy link
Member

@gfting awesome but please create a new branch next time. It can save your time by letting you fallback easily.

harshkhandeparkar
harshkhandeparkar approved these changes Jan 24, 2019
View reviewed changes
Copy link
Member

@harshkhandeparkar harshkhandeparkar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✔️

@harshkhandeparkar
Copy link
Member

@jywarren this is ready for a final review.

@gfting
Copy link
Author

gfting commented Jan 24, 2019

You're correct, that's a much better method. This is an excellent lesson for me!

@harshkhandeparkar
Copy link
Member

You're correct, that's a much better method. This is an excellent lesson for me!

Haha 🤣

@harshkhandeparkar
Copy link
Member

Thanks for your efforts 🎉

@gfting
Copy link
Author

gfting commented Jan 24, 2019

@harshkhandeparkar you too, I could have done nothing without your continued help!

@gfting
Copy link
Author

gfting commented Jan 24, 2019

@harshkhandeparkar wait a second, I just realized I committed package-lock.json; is that fine?

@harshkhandeparkar
Copy link
Member

I don't think so but I also don't know why it should change. You can revert that if you want to or just let @jywarren look at it.

@gfting
Copy link
Author

gfting commented Jan 28, 2019

@jywarren was this fine?

jywarren
jywarren approved these changes Jan 31, 2019
View reviewed changes
Copy link
Member

@jywarren jywarren left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks super great. Thanks to @gfting for your great work!

We just merged some other big changes, so this needs a final rebase and build. @gfting would you like to give it a try, or perhaps @harshkhandeparkar can help get it ready to merge now?

@harshkhandeparkar
Copy link
Member

harshkhandeparkar commented Jan 31, 2019 •
edited
Loading

Hello @gfting . Thanks for your efforts. One last thing. Some new PRs have been merged so you will have to merge those as well with git merge upstream/main. Please do that and your PR will be ready to merge. Thanks!

@gfting
Copy link
Author

gfting commented Feb 1, 2019

@harshkhandeparkar great, just fixed it

@harshkhandeparkar
Copy link
Member

@gfting awesome!!

@jywarren jywarren merged commit 3081dcc into publiclab:main Feb 1, 2019
@jywarren
Copy link
Member

jywarren commented Feb 1, 2019

Perfect, great work!!!!

@welcome
Copy link

welcome bot commented Feb 1, 2019

Congrats on merging your first pull request! 🙌🎉⚡️
Your code will likely be published to https://sequencer.publiclab.org in the next few days.
In the meantime, can you tell us your Twitter handle so we can thank you properly?
Now that you've completed this, you can help someone else take their first step!
See: Public Lab's coding community!

@harshkhandeparkar
Copy link
Member

Congratulations@gfting. Thanks! We would definitely like to have your help on other issues as well 🎉

@jywarren jywarren mentioned this pull request Feb 9, 2019
Merged
4 tasks
jywarren pushed a commit that referenced this pull request Mar 4, 2019
@harshkhandeparkar @jywarren
Map types to html types (#754)
1e08d7c 
* fix insert step button

* add dist

* add new function

* remove console logs

* refactor

* Setup UI testing (#720)

* default sequencer ui test

* default step ui test suite

* intermediate step ui test

* preview ui test suite

* url methods test suite

* add set url params method test suite

* argument call tests

* test directory refactor

* travis fix

* CLI code refactor (#665)

* CLI refactor

* es6 rollback

* Travis fix

* syntax fix

* clustered require statements

* travis debug

* travis debug

* Added line that selects the "More modules..." after adding a step. (#713)

* Added line making module selection correct after adding a step

* Added line with appropriate module selection

* Add: Module tests (#748)

* WIP

* module testing harness

* adjustments

* Update package-lock.json

* Bump jsqr from 1.1.1 to 1.2.0 (#749)

Bumps [jsqr](https://github.com/cozmo/jsQR) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/cozmo/jsQR/releases)
- [Commits](https://github.com/cozmo/jsQR/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* refactor without spread syntax
jywarren pushed a commit that referenced this pull request Mar 17, 2019
@harshkhandeparkar @jywarren
Complete Edge Detect Module (#771)
c645732 
* update dist

Signed-off-by: tech4GT <varun.gupta1798@gmail.com>

dist update

Revert "dist update"

This reverts commit 9ee2a98.

* fix insert step button

* add icon

* add dist

* use normal functions

* use normal functions

* add new function

* add dist

* remove console logs

* changes

* refactor

* add dist

* Bump looks-same from 5.0.2 to 6.0.0 (#729)

Bumps [looks-same](https://github.com/gemini-testing/looks-same) from 5.0.2 to 6.0.0.
- [Release notes](https://github.com/gemini-testing/looks-same/releases)
- [Changelog](https://github.com/gemini-testing/looks-same/blob/master/CHANGELOG.md)
- [Commits](gemini-testing/looks-same@v5.0.2...v6.0.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Setup UI testing (#720)

* default sequencer ui test

* default step ui test suite

* intermediate step ui test

* preview ui test suite

* url methods test suite

* add set url params method test suite

* argument call tests

* test directory refactor

* travis fix

* CLI code refactor (#665)

* CLI refactor

* es6 rollback

* Travis fix

* syntax fix

* clustered require statements

* travis debug

* travis debug

* Added line that selects the "More modules..." after adding a step. (#713)

* Added line making module selection correct after adding a step

* Added line with appropriate module selection

* Add: Module tests (#748)

* WIP

* module testing harness

* adjustments

* Fix choose file option and insert step functionality (#712)

* Fix choose file option

* changes

* Parse info.json to set module defaults (#650)

* changes

* changes

* changes

* changes

* changes

* changes

* Update package-lock.json

* Bump jsqr from 1.1.1 to 1.2.0 (#749)

Bumps [jsqr](https://github.com/cozmo/jsQR) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/cozmo/jsQR/releases)
- [Commits](https://github.com/cozmo/jsQR/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Bump jsqr from 1.1.1 to 1.2.0 (#749)

Bumps [jsqr](https://github.com/cozmo/jsQR) from 1.1.1 to 1.2.0.
- [Release notes](https://github.com/cozmo/jsQR/releases)
- [Commits](https://github.com/cozmo/jsQR/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* dist

* changes

* working

* final touches

* revert mapTypes

* proper revert

* Fix arctangent

* working hysteresis

* hysteresis optional
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@harshkhandeparkar harshkhandeparkar harshkhandeparkar approved these changes

@jywarren jywarren jywarren approved these changes

Assignees
No one assigned
Labels
ready-to-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@gfting @harshkhandeparkar @jywarren