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

Merge newBase into develop #13

Merged
merged 25 commits into from
Jun 20, 2020
Merged

Merge newBase into develop #13

merged 25 commits into from
Jun 20, 2020

Conversation

shashaBot
Copy link
Member

Addresses issue #4
new core framework of h2

@shashaBot shashaBot requested a review from poush March 29, 2020 19:14
Copy link
Member

@poush poush left a comment

Choose a reason for hiding this comment

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

Let's wait for Travis to pass.

* removed linting errors

* removed linting errors

* removed linting errors

* removed linting errors

* remove one un-neccessary commit

* cleared the renderer file

Co-authored-by: Piyush Agrawal <[email protected]>
Copy link
Member

@poush poush left a comment

Choose a reason for hiding this comment

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

Might have to squash some commits. @shashaBot what do you think moving it to a new branch develop instead of master and keep master for releases.

@shashaBot
Copy link
Member Author

@poush Sounds good, we could do that

@poush poush changed the base branch from master to develop June 20, 2020 18:54
@poush poush changed the title Merge newBase into master Merge newBase into develop Jun 20, 2020
@poush poush merged commit 04096f2 into develop Jun 20, 2020
poush added a commit that referenced this pull request Jun 20, 2020
* tsc

* actions wip

* Refactored, added Config Singleton

* readme update

* Update README.md

* few changes on architecture

* remove deprecated files

* bumped license

* fix: keyCombinations

* bumped electron to 8.2.0, running basic version

* Added tsc and lint command to .travis.yml (#11)

Fixes #8

* Added tsc command

* Updated .travis.yml

* removed before_scripts from travis file

* Fix: existing linting errors (#15), build passes from here

* removed linting errors

* cleared the renderer file

Co-authored-by: Piyush Agrawal <[email protected]>

Co-authored-by: Piyush Agrawal <[email protected]>
Co-authored-by: Shashwat Gulyani <[email protected]>
Co-authored-by: Divija Palleti <[email protected]>
Co-authored-by: Muskan0510 <[email protected]>
poush added a commit that referenced this pull request Jun 20, 2020
* tsc

* actions wip

* Refactored, added Config Singleton

* readme update

* Update README.md

* few changes on architecture

* remove deprecated files

* bumped license

* fix: keyCombinations

* bumped electron to 8.2.0, running basic version

* Added tsc and lint command to .travis.yml (#11)

Fixes #8

* Added tsc command

* Updated .travis.yml

* removed before_scripts from travis file

* Fix: existing linting errors (#15), build passes from here

* removed linting errors

* cleared the renderer file

Co-authored-by: Piyush Agrawal <[email protected]>

Co-authored-by: Piyush Agrawal <[email protected]>
Co-authored-by: Divija Palleti <[email protected]>
Co-authored-by: Muskan0510 <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants