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

Bump tar from 4.4.13 to 4.4.19 #16

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<p align="center">
<img src="img/icon.png" width="256">
<img src="img/icon.png" width="180">
</p>

<div align="center">
<h1>Chameleon</h1>
<h1>Oxygen</h1>
</div>

[![js-standard-style](https://cdn.rawgit.com/feross/standard/master/badge.svg)](https://github.com/feross/standard)

Chameleon is a browser designed to provide you with a seamless browsing experience by blending in with whatever site you are visiting. Built on top of `Electron`, it aims to be fast, private, beautiful, and functional all at the same time.
Oxygen is a browser designed to provide you with a seamless browsing experience by blending in with whatever site you are visiting. Built on top of `Electron`, it aims to be fast, private, beautiful, and functional all at the same time.


# Features

- **AdBlock** - Browse the web without any ads or trackers. Due to the simplicity of Chameleon, websites load faster and consume less memory compared to modern browsers such as Chrome.
- **AdBlock** - Browse the web without any ads or trackers. Due to the simplicity of Oxygen, websites load faster and consume less memory compared to modern browsers such as Chrome.
- **Beautiful and minimalistic UI** - The address bar is condensed into a single line to maximize the amount of content on the screen. Everything else, from the download manager to the settings to the history page is designed to do everything you expect, while remaining as simple as possible.
- **Cross-platform gestures** - Do you use Windows and wish you could navigate between pages with trackpad gestures like on Mac? Now you can!

Expand All @@ -25,30 +25,30 @@ Chameleon is a browser designed to provide you with a seamless browsing experien

![image](img/screenshots/dropbox.png)

# [Roadmap](https://github.com/Polunom/chameleon/projects/1)
# [Roadmap](https://github.com/Polunom/oxygen/projects/1)

# Installing

| [<img src="https://i.imgur.com/POJjnum.png" alt="Windows" width="24px" height="24px" />]()</br> Windows | [<img src="https://i.imgur.com/V0YkvU5.png" alt="Mac" width="24px" height="24px" />]()</br> Mac | [<img src="https://i.imgur.com/khCS5Ll.png" alt="Linux" width="24px" height="24px" />]()</br> Linux |
|:---------:|:---------------------:|:---------------------:|
| [Download](https://github.com/Polunom/chameleon/releases/download/1.0/Chameleon.Setup.exe) | [Download](https://github.com/Polunom/chameleon/releases/download/1.0/Chameleon.dmg) | [Download](https://github.com/Polunom/chameleon/releases/download/1.0/Chameleon-linux-x64.zip) |
| [Download](https://github.com/Polunom/oxygen/releases/download/1.0/Oxygen.Setup.exe) | [Download](https://github.com/Polunom/oxygen/releases/download/1.0/Oxygen.dmg) | [Download](https://github.com/Polunom/oxygen/releases/download/1.0/Oxygen-linux-x64.zip) |


Alternatively, you can skip to the section below to build Chameleon from source.
Alternatively, you can skip to the section below to build Oxygen from source.

### Installation on Linux
* To install the .deb file, use `sudo dpkg -i /path/to/Chameleon_amd64.deb`
* To install the .deb file, use `sudo dpkg -i /path/to/Oxygen_amd64.deb`

# Developing
* Install the latest version of [`Node.js`](https://nodejs.org/en/)
* Run `npm install` to install dependencies
* Start Chameleon by running `npm run start`
* Start Oxygen by running `npm run start`
* Make your changes
* Press `cmd+shift+r` or `ctrl+shift+r` to restart the browser

### Building binaries

To build Chameleon from source, follow the instructions above to get the app running, then execute the following commands to build binaries
To build Oxygen from source, follow the instructions above to get the app running, then execute the following commands to build binaries
* Build for all platforms: `npm run build`
* Build for macOS: `npm run build-mac`
* Build for Windows: `npm run build-win`
Expand All @@ -61,4 +61,4 @@ It might be difficult to build for all platforms on one platform. Depending on t

# Contributing

If you see any bugs with Chameleon or want to suggest a new feature, please feel free open an issue. Chameleon is an open-source project and is still in its early development stages - we have a lot of features planned and would appreciate any help we can get!
If you see any bugs with Oxygen or want to suggest a new feature, please feel free open an issue. Oxygen is an open-source project and is still in its early development stages - we have a lot of features planned and would appreciate any help we can get!
Binary file removed img/.DS_Store
Binary file not shown.
Binary file modified img/Icon.icns
Binary file not shown.
Binary file modified img/icon.ico
Binary file not shown.
Binary file modified img/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion js/chrome-tabs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const { remote } = window.require('electron')
const { webContents } = require('electron').remote
const $ = require('jquery')

const tabTemplate = `
Expand Down
4 changes: 3 additions & 1 deletion main.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ function createNewWindow(private) {
webPreferences: {
plugins: true,
nodeIntegration: true,
webviewTag: true },
webviewTag: true,
enableRemoteModule: true,
},
icon: win32 ? __dirname + '/img/icon.icns' : undefined
}

Expand Down
Loading