Skip to content

Commit

Permalink
Force more line endings
Browse files Browse the repository at this point in the history
  • Loading branch information
Eeems committed Apr 18, 2017
1 parent 84f30cc commit 6b1672d
Show file tree
Hide file tree
Showing 14 changed files with 841 additions and 834 deletions.
9 changes: 8 additions & 1 deletion .gitattributes
Expand Up @@ -7,4 +7,11 @@ LICENSE text eol=lf
*.html text eol=lf
*.js text eol=lf
*.json text eol=lf
*.css text eol=lf
*.css text eol=lf
*.jsx text eol=lf
.gitignore text eol=lf
.gitattributes text eol=lf
.gitmodules text eol=lf
.jshintrc text eol=lf
*.md text eol=lf
*.rst text eol=lf
72 changes: 36 additions & 36 deletions .gitignore
@@ -1,36 +1,36 @@
# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# Deployed apps should consider commenting this line out:
# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
node_modules

.DS_Store

vendor/bower_components

.idea

# Generated chrome extension
public/
web-ext-artifacts/
.web-extension-id
# Logs
logs
*.log

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# Deployed apps should consider commenting this line out:
# see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
node_modules

.DS_Store

vendor/bower_components

.idea

# Generated chrome extension
public/
web-ext-artifacts/
.web-extension-id
20 changes: 10 additions & 10 deletions .jshintrc
@@ -1,10 +1,10 @@
{
"node": true,
"curly": true,
"latedef": true,
"quotmark": true,
"undef": true,
"unused": true,
"trailing": true,
"predef": [ "chrome" ]
}
{
"node": true,
"curly": true,
"latedef": true,
"quotmark": true,
"undef": true,
"unused": true,
"trailing": true,
"predef": [ "chrome" ]
}
48 changes: 24 additions & 24 deletions HISTORY.rst
@@ -1,24 +1,24 @@

History
-------


1.0.2 (2016-06-30)
++++++++++++++++++

- Fix bug preventing options from saving. #42


1.0.1 (2016-06-29)
++++++++++++++++++

- Fix blacklist setting.
- Misc bug fixes related to icon popup.
- Send plugin name and version with heartbeat data. #41


1.0.0 (2016-06-29)
++++++++++++++++++

- Birth


History
-------


1.0.2 (2016-06-30)
++++++++++++++++++

- Fix bug preventing options from saving. #42


1.0.1 (2016-06-29)
++++++++++++++++++

- Fix blacklist setting.
- Misc bug fixes related to icon popup.
- Send plugin name and version with heartbeat data. #41


1.0.0 (2016-06-29)
++++++++++++++++++

- Birth

154 changes: 77 additions & 77 deletions README.md
@@ -1,77 +1,77 @@
chrome-wakatime
===============

Automatic time tracking for stats about your website debugging, research, documentation, etc.

Note: Activity from this Chrome extension will not display on leaderboards, so installing this extension may lower your rank.


## Installation

1. Install the extension:

[![Chrome Web Store](https://wakatime.com/static/img/chrome-web-store.png)](https://chrome.google.com/webstore/detail/wakatime/jnbbnacmeggbgdjgaoojpmhdlkkpblgi)

2. Login to [WakaTime](https://wakatime.com/).

3. Use Chrome like you normally do and your time will be tracked for you automatically.

4. Visit https://wakatime.com to see your logged time.

5. Use in conjunction with [other WakaTime plugins](https://wakatime.com/plugins).


## Screenshots

![SC open](./screenshots/sc_6-green.png)

![SC open](./screenshots/sc_6-open.png)

![Options SC](./screenshots/sc_8-options.png)


## Development instructions

> For development purposes only.
To get started, install NPM and Bower dependencies, and do an initial build with Gulp:
```
npm start
```

To build the extension once:

```
npm run gulp
```

To monitor changes:

```
npm run watch
```

Run tests:

```
npm test
```

Lint code *(Both JS and JSX)*:

```
jsxhint --jsx-only .
```

### Automatic code linting

There is a precommit hook that lints the code before commiting the changes.


### Load unpacked in Chrome

1. Clone repository to disk
2. Go to `Settings``Extensions`
3. Enable `Developer mode`
4. Click `Load unpacked extension...`
5. Select repository directory
chrome-wakatime
===============

Automatic time tracking for stats about your website debugging, research, documentation, etc.

Note: Activity from this Chrome extension will not display on leaderboards, so installing this extension may lower your rank.


## Installation

1. Install the extension:

[![Chrome Web Store](https://wakatime.com/static/img/chrome-web-store.png)](https://chrome.google.com/webstore/detail/wakatime/jnbbnacmeggbgdjgaoojpmhdlkkpblgi)

2. Login to [WakaTime](https://wakatime.com/).

3. Use Chrome like you normally do and your time will be tracked for you automatically.

4. Visit https://wakatime.com to see your logged time.

5. Use in conjunction with [other WakaTime plugins](https://wakatime.com/plugins).


## Screenshots

![SC open](./screenshots/sc_6-green.png)

![SC open](./screenshots/sc_6-open.png)

![Options SC](./screenshots/sc_8-options.png)


## Development instructions

> For development purposes only.
To get started, install NPM and Bower dependencies, and do an initial build with Gulp:
```
npm start
```

To build the extension once:

```
npm run gulp
```

To monitor changes:

```
npm run watch
```

Run tests:

```
npm test
```

Lint code *(Both JS and JSX)*:

```
jsxhint --jsx-only .
```

### Automatic code linting

There is a precommit hook that lints the code before commiting the changes.


### Load unpacked in Chrome

1. Clone repository to disk
2. Go to `Settings``Extensions`
3. Enable `Developer mode`
4. Click `Load unpacked extension...`
5. Select repository directory
30 changes: 15 additions & 15 deletions assets/js/app.jsx
@@ -1,15 +1,15 @@

/* This is a fix for Bootstrap requiring jQuery */
global.jQuery = require('jquery');
require('bootstrap');

var React = require('react');
var ReactDOM = require('react-dom');

// React components
var WakaTime = require('./components/WakaTime.jsx');

ReactDOM.render(
<WakaTime />,
document.getElementById('wakatime')
);

/* This is a fix for Bootstrap requiring jQuery */
global.jQuery = require('jquery');
require('bootstrap');

var React = require('react');
var ReactDOM = require('react-dom');

// React components
var WakaTime = require('./components/WakaTime.jsx');

ReactDOM.render(
<WakaTime />,
document.getElementById('wakatime')
);
38 changes: 19 additions & 19 deletions assets/js/components/Alert.jsx
@@ -1,19 +1,19 @@
var React = require('react');
var classNames = require('classnames');

var Alert = React.createClass({

propTypes: {
type: React.PropTypes.string.isRequired,
text: React.PropTypes.string.isRequired
},

render: function() {
return(
<div className={classNames('alert', 'alert-' + this.props.type)}>{this.props.text}</div>
);
}

});

module.exports = Alert;
var React = require('react');
var classNames = require('classnames');

var Alert = React.createClass({

propTypes: {
type: React.PropTypes.string.isRequired,
text: React.PropTypes.string.isRequired
},

render: function() {
return(
<div className={classNames('alert', 'alert-' + this.props.type)}>{this.props.text}</div>
);
}

});

module.exports = Alert;

0 comments on commit 6b1672d

Please sign in to comment.