Skip to content

Commit

Permalink
Merge ac71783 into 60a5a0c
Browse files Browse the repository at this point in the history
  • Loading branch information
Jacob Wenger committed Aug 24, 2014
2 parents 60a5a0c + ac71783 commit ef2bfbd
Show file tree
Hide file tree
Showing 18 changed files with 68 additions and 1,496 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
dist/
node_modules/
bower_components/
tests/coverage/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ install:
- npm install
- bower install
script:
- npm test
- npm run travis
after_script:
- cat ./tests/coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
46 changes: 0 additions & 46 deletions CHANGELOG.md

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# GeoFire for JavaScript — Realtime location queries with Firebase

[![Build Status](https://travis-ci.org/firebase/geofire-js.svg)](https://travis-ci.org/firebase/geofire-js)
[![Coverage Status](https://img.shields.io/coveralls/firebase/geofire-js.svg)](https://coveralls.io/r/firebase/geofire-js)
[![Build Status](https://travis-ci.org/firebase/geofire-js.svg?branch=master)](https://travis-ci.org/firebase/geofire-js)
[![Coverage Status](https://img.shields.io/coveralls/firebase/geofire-js.svg?branch=master)](https://coveralls.io/r/firebase/geofire-js)
[![Version](https://badge.fury.io/gh/firebase%2Fgeofire-js.svg)](http://badge.fury.io/gh/firebase%2Fgeofire-js)

GeoFire is an open-source library that allows you to store and query a set of keys based on their
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "geofire",
"description": "Location-based querying and filtering using Firebase",
"version": "3.0.0",
"version": "0.0.0",
"authors": [
"Firebase <support@firebase.com> (https://www.firebase.com/)"
],
Expand Down Expand Up @@ -30,7 +30,7 @@
"firebase.json",
"package.json",
"gulpfile.js",
"release.sh"
"changelog.txt"
],
"dependencies": {
"firebase": "1.0.x",
Expand Down
14 changes: 8 additions & 6 deletions build/header
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
/*! GeoFire is a JavaScript library that allows you to store and query a set
* of keys based on their geographic location. GeoFire uses Firebase for data
* storage, allowing query results to be updated in realtime as they change.
/*! GeoFire is an open-source library that allows you to store and query a set
* of keys based on their geographic location. At its heart, GeoFire simply
* stores locations with string keys. Its main benefit, however, is the
* possibility of retrieving only those keys within a given geographic area -
* all in realtime.
*
* GeoFire 3.0.0
* https://github.com/firebase/geofire/
* License: MIT
* GeoFire 0.0.0
* https://github.com/firebase/geofire-js/
* License: MIT
*/

// Include RSVP if this is being run in node
Expand Down
Empty file added changelog.txt
Empty file.
Loading

0 comments on commit ef2bfbd

Please sign in to comment.