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

Sync with shellinabox/shellinabox #9

Open
marado opened this issue Apr 17, 2017 · 2 comments
Open

Sync with shellinabox/shellinabox #9

marado opened this issue Apr 17, 2017 · 2 comments

Comments

@marado
Copy link

marado commented Apr 17, 2017

As stated in README, and not done since Jan 2015, this fork should sync with https://github.com/shellinabox/shellinabox , or, alternatively, the changes made here should be transformed into pull requests to that project.

As they are right now, these two projects have different changes to the original shellinabox, which is a suboptimal scenario for users of one or the other.

@uudruid74
Copy link
Owner

Yeah, and I wanted to ditch the pre-processor cruft to simply things, and only modified the JS file, dumping the JSPP file, but @KLuka has maintained the JSPP file. So merging will be a pain. I'm going to look into it, but neither branch is much maintained anymore.

@uudruid74
Copy link
Owner

The sync is done. I'm going to use uudruid74/shellinabox as a "stable" tree to match upstream and this tree will be used for more radical changes should I ever get the time for them. As of right now, upstream (meaning shellinabox/shellinabox) had all the changes I did and did a better job with full 256 color support. Only thing I'm ahead on is the gesture hack and a redesigned menu.

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

No branches or pull requests

2 participants