Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getmoro/moro
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.1.1
Choose a base ref
...
head repository: getmoro/moro
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.0.0
Choose a head ref
  • 8 commits
  • 7 files changed
  • 2 contributors

Commits on Jul 14, 2018

  1. chore: migrate to cli-table3

    @DanielRuf
    DanielRuf committed Jul 14, 2018
    Copy the full SHA
    dfe86bc View commit details

Commits on May 30, 2019

  1. Merge pull request #197 from DanielRuf/chore/migrate-to-cli-table3 

    chore: migrate to cli-table3
    @albacoretuna
    albacoretuna authored May 30, 2019
    Copy the full SHA
    addf578 View commit details

Commits on Jun 6, 2019

  1. Update README.md

    @albacoretuna
    albacoretuna authored Jun 6, 2019
    Copy the full SHA
    5570ada View commit details

  2. Update README.md

    @albacoretuna
    albacoretuna authored Jun 6, 2019
    Copy the full SHA
    ba4c58d View commit details

Commits on Dec 25, 2019

  1. update sqlite3 and other packages min node is 10 (#250) 

    * chore: npm audit fix to upgrade modules

* Set minimum node version to 10

* Update sqlite3 to support node 13
    @albacoretuna
    albacoretuna authored Dec 25, 2019
    Copy the full SHA
    bd17875 View commit details

Commits on Dec 27, 2019

  1. update knex (#252) 

    * update knex

* Update all-contributers-cli and lint-staged
    @albacoretuna
    albacoretuna authored Dec 27, 2019
    Copy the full SHA
    0d3d4b4 View commit details

  2. Update knex syntax

    @albacoretuna
    albacoretuna committed Dec 27, 2019
    Copy the full SHA
    3e7de34 View commit details

  3. 5.0.0

    @albacoretuna
    albacoretuna committed Dec 27, 2019
    Copy the full SHA
    b8508b0 View commit details
Showing with 2,166 additions and 2,321 deletions.
  1. +1 −1 .travis.yml
  2. +4 −10 README.md
  3. +1 −1 lib/db.js
  4. +1 −1 lib/utils/helpers.js
  5. +2,148 −2,297 package-lock.json
  6. +9 −9 package.json
  7. +2 −2 tests/db-tests.js
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: node_js

node_js:
- "6"
- "10"
- "node"

notifications:
14 changes: 4 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

A command line tool for tracking work hours, as simple as it can get.

[![Backers on Open Collective](https://opencollective.com/moro/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/moro/sponsors/badge.svg)](#sponsors) [![Build Status](https://travis-ci.org/omidfi/moro.svg?branch=master)](https://travis-ci.org/omidfi/moro) [![Downloads](https://img.shields.io/npm/dt/moro.svg)](https://npmjs.org/moro)
[![Greenkeeper badge](https://badges.greenkeeper.io/omidfi/moro.svg)](https://greenkeeper.io/) [![Sponsored](https://img.shields.io/badge/chilicorn-sponsored-brightgreen.svg?logo=data%3Aimage%2Fpng%3Bbase64%2CiVBORw0KGgoAAAANSUhEUgAAAA4AAAAPCAMAAADjyg5GAAABqlBMVEUAAAAzmTM3pEn%2FSTGhVSY4ZD43STdOXk5lSGAyhz41iz8xkz2HUCWFFhTFFRUzZDvbIB00Zzoyfj9zlHY0ZzmMfY0ydT0zjj92l3qjeR3dNSkoZp4ykEAzjT8ylUBlgj0yiT0ymECkwKjWqAyjuqcghpUykD%2BUQCKoQyAHb%2BgylkAyl0EynkEzmkA0mUA3mj86oUg7oUo8n0k%2FS%2Bw%2Fo0xBnE5BpU9Br0ZKo1ZLmFZOjEhesGljuzllqW50tH14aS14qm17mX9%2Bx4GAgUCEx02JySqOvpSXvI%2BYvp2orqmpzeGrQh%2Bsr6yssa2ttK6v0bKxMBy01bm4zLu5yry7yb29x77BzMPCxsLEzMXFxsXGx8fI3PLJ08vKysrKy8rL2s3MzczOH8LR0dHW19bX19fZ2dna2trc3Nzd3d3d3t3f39%2FgtZTg4ODi4uLj4%2BPlGxLl5eXm5ubnRzPn5%2Bfo6Ojp6enqfmzq6urr6%2Bvt7e3t7u3uDwvugwbu7u7v6Obv8fDz8%2FP09PT2igP29vb4%2BPj6y376%2Bu%2F7%2Bfv9%2Ff39%2Fv3%2BkAH%2FAwf%2FtwD%2F9wCyh1KfAAAAKXRSTlMABQ4VGykqLjVCTVNgdXuHj5Kaq62vt77ExNPX2%2Bju8vX6%2Bvr7%2FP7%2B%2FiiUMfUAAADTSURBVAjXBcFRTsIwHAfgX%2FtvOyjdYDUsRkFjTIwkPvjiOTyX9%2FAIJt7BF570BopEdHOOstHS%2BX0s439RGwnfuB5gSFOZAgDqjQOBivtGkCc7j%2B2e8XNzefWSu%2BsZUD1QfoTq0y6mZsUSvIkRoGYnHu6Yc63pDCjiSNE2kYLdCUAWVmK4zsxzO%2BQQFxNs5b479NHXopkbWX9U3PAwWAVSY%2FpZf1udQ7rfUpQ1CzurDPpwo16Ff2cMWjuFHX9qCV0Y0Ok4Jvh63IABUNnktl%2B6sgP%2BARIxSrT%2FMhLlAAAAAElFTkSuQmCC)](http://spiceprogram.org/oss-sponsorship)
[![Backers on Open Collective](https://opencollective.com/moro/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/moro/sponsors/badge.svg)](#sponsors) [![Downloads](https://img.shields.io/npm/dt/moro.svg)](https://npmjs.org/moro)
[![Greenkeeper badge](https://badges.greenkeeper.io/omidfi/moro.svg)](https://greenkeeper.io/)
[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors)

## Demo
@@ -19,7 +19,7 @@ npm install -g moro
# yarn works too
yarn global add moro
```
You need node version 6 or higher (we haven't tested lower versions)
You need node version 10 or higher (we haven't tested lower versions)

### No node on your machine?

@@ -87,19 +87,13 @@ npm test
Code is important but people are more important. If you like to contribute to Moro please read and follow our code of conduct found in this file: CODE_OF_CONDUCT.md



## Supporters
I thank Futurice ([link](https://github.com/futurice/)) my employer for sponsoring this project trough its Spice program

[![Supported by the Spice Program](https://github.com/futurice/spiceprogram/raw/gh-pages/assets/img/logo/chilicorn_with_text-180.png)](https://spiceprogram.org)

## Contributors

Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds/all-contributors#emoji-key)):

<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore -->
| [<img src="https://avatars2.githubusercontent.com/u/7697632?v=3" width="100px;"/><br /><sub><b>Omid Hezaveh</b></sub>](http://omid.fi)<br />[💬](#question-omidfi "Answering Questions") [🐛](https://github.com/omidfi/moro/issues?q=author%3Aomidfi "Bug reports") [💻](https://github.com/omidfi/moro/commits?author=omidfi "Code") [📖](https://github.com/omidfi/moro/commits?author=omidfi "Documentation") [👀](#review-omidfi "Reviewed Pull Requests") [⚠️](https://github.com/omidfi/moro/commits?author=omidfi "Tests") | [<img src="https://avatars2.githubusercontent.com/u/4089975?v=3" width="100px;"/><br /><sub><b>Mario</b></sub>](https://github.com/mario-s)<br />[💻](https://github.com/omidfi/moro/commits?author=mario-s "Code") [📖](https://github.com/omidfi/moro/commits?author=mario-s "Documentation") [⚠️](https://github.com/omidfi/moro/commits?author=mario-s "Tests") | [<img src="https://avatars2.githubusercontent.com/u/2211050?v=3" width="100px;"/><br /><sub><b>Karl Fleischmann</b></sub>](https://twitter.com/fleischie28)<br />[💻](https://github.com/omidfi/moro/commits?author=fleischie "Code") [📖](https://github.com/omidfi/moro/commits?author=fleischie "Documentation") [⚠️](https://github.com/omidfi/moro/commits?author=fleischie "Tests") | [<img src="https://avatars0.githubusercontent.com/u/12087554?v=3" width="100px;"/><br /><sub><b>Niloofar Motamed</b></sub>](https://niloofarmotamed.com)<br />[📖](https://github.com/omidfi/moro/commits?author=niloomotita "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/5592940?v=3" width="100px;"/><br /><sub><b>Wolf-Rost</b></sub>](https://github.com/Wolf-Rost)<br />[📖](https://github.com/omidfi/moro/commits?author=Wolf-Rost "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/2776719?v=3" width="100px;"/><br /><sub><b>Henri Koski</b></sub>](https://github.com/heppu)<br />[📖](https://github.com/omidfi/moro/commits?author=heppu "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/6113341?v=3" width="100px;"/><br /><sub><b>Olavi Haapala</b></sub>](https://twitter.com/0lpeh)<br />[📖](https://github.com/omidfi/moro/commits?author=olpeh "Documentation") [🐛](https://github.com/omidfi/moro/issues?q=author%3Aolpeh "Bug reports") |
| [<img src="https://avatars2.githubusercontent.com/u/7697632?v=3" width="100px;"/><br /><sub><b>Nick Okapi</b></sub>](http://omid.fi)<br />[💬](#question-omidfi "Answering Questions") [🐛](https://github.com/omidfi/moro/issues?q=author%3Aomidfi "Bug reports") [💻](https://github.com/omidfi/moro/commits?author=omidfi "Code") [📖](https://github.com/omidfi/moro/commits?author=omidfi "Documentation") [👀](#review-omidfi "Reviewed Pull Requests") [⚠️](https://github.com/omidfi/moro/commits?author=omidfi "Tests") | [<img src="https://avatars2.githubusercontent.com/u/4089975?v=3" width="100px;"/><br /><sub><b>Mario</b></sub>](https://github.com/mario-s)<br />[💻](https://github.com/omidfi/moro/commits?author=mario-s "Code") [📖](https://github.com/omidfi/moro/commits?author=mario-s "Documentation") [⚠️](https://github.com/omidfi/moro/commits?author=mario-s "Tests") | [<img src="https://avatars2.githubusercontent.com/u/2211050?v=3" width="100px;"/><br /><sub><b>Karl Fleischmann</b></sub>](https://twitter.com/fleischie28)<br />[💻](https://github.com/omidfi/moro/commits?author=fleischie "Code") [📖](https://github.com/omidfi/moro/commits?author=fleischie "Documentation") [⚠️](https://github.com/omidfi/moro/commits?author=fleischie "Tests") | [<img src="https://avatars0.githubusercontent.com/u/12087554?v=3" width="100px;"/><br /><sub><b>Niloofar Motamed</b></sub>](https://niloofarmotamed.com)<br />[📖](https://github.com/omidfi/moro/commits?author=niloomotita "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/5592940?v=3" width="100px;"/><br /><sub><b>Wolf-Rost</b></sub>](https://github.com/Wolf-Rost)<br />[📖](https://github.com/omidfi/moro/commits?author=Wolf-Rost "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/2776719?v=3" width="100px;"/><br /><sub><b>Henri Koski</b></sub>](https://github.com/heppu)<br />[📖](https://github.com/omidfi/moro/commits?author=heppu "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/6113341?v=3" width="100px;"/><br /><sub><b>Olavi Haapala</b></sub>](https://twitter.com/0lpeh)<br />[📖](https://github.com/omidfi/moro/commits?author=olpeh "Documentation") [🐛](https://github.com/omidfi/moro/issues?q=author%3Aolpeh "Bug reports") |
| :---: | :---: | :---: | :---: | :---: | :---: | :---: |
| [<img src="https://avatars1.githubusercontent.com/u/15911342?v=4" width="100px;"/><br /><sub><b>Walid Mani</b></sub>](https://github.com/Flouss)<br />[💻](https://github.com/omidfi/moro/commits?author=Flouss "Code") |
<!-- ALL-CONTRIBUTORS-LIST:END -->
2 changes: 1 addition & 1 deletion lib/db.js
View file
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ const configManager = require('./utils/configManager.js')
const dbFile = configManager.getDBFilePath()

const knex = require('knex')({
dialect: 'sqlite3',
client: 'sqlite3',
connection: {
filename: dbFile
},
2 changes: 1 addition & 1 deletion lib/utils/helpers.js
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
const fs = require('fs')
const path = require('path')
const moment = require('moment')
const Table = require('cli-table2')
const Table = require('cli-table3')
const expandHomeDir = require('expand-home-dir')

// ours
Loading