Merge pull request #17 from gmemstr/master

Merged last master changes to permission branch
This commit is contained in:
Gabriel Simmer 2017-11-29 13:06:29 -08:00 committed by GitHub
commit f3c011510d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 10187 deletions

View file

@ -1,4 +1,4 @@
<img src="https://cdn.rawgit.com/gmemstr/pogo/users/assets/web/static/logo-sm.png" alt="Pogo logo" align="right">
<img src="https://cdn.rawgit.com/gmemstr/pogo/ddc9ff3a/assets/web/static/logo-sm.png" alt="Pogo logo" align="right">
## Pogo
@ -25,6 +25,8 @@ There are a couple options for getting Pogo up and running.
## Running
[![asciicast](https://asciinema.org/a/8tU0nNmjjQPgf8UdcPnCaZcI0.png)](https://asciinema.org/a/8tU0nNmjjQPgf8UdcPnCaZcI0)
1. [Download the latest release](https://github.com/gmemstr/pogo/releases/latest)
2. Unzip somewhere safe
3. [Edit the config](https://github.com/gmemstr/pogo/wiki/Configuration)
@ -65,4 +67,4 @@ Pogo depends on several other open source projects to function.
- [gorilla/mux](http://github.com/gorilla/mux)
- [gorilla/feeds](http://github.com/gorilla/feeds)
- [fsnotify/fsnotify](http://github.com/fsnotify/fsnotify)
- [mattn/go-sqlite3](http://github.com/mattn/go-sqlite3)
- [mattn/go-sqlite3](http://github.com/mattn/go-sqlite3)

View file

@ -18,7 +18,7 @@
<footer>
<p>Pogo licensed under the GPLv3</p>
</footer>
<script src="/assets/vue.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.5.8/vue.min.js"></script>
<script src="https://unpkg.com/vue-router@2.7.0/dist/vue-router.js"></script>
<script src="/assets/app.js"></script>
</body>

File diff suppressed because it is too large Load diff

View file

@ -120,8 +120,8 @@ func GenerateRss() {
Created: date,
},
)
}
i = i + 1;
}
}
// Translate the feed to both RSS and JSON,