Permalink
Browse files

Merge pull request #66 from LolaShare/referment

referment
  • Loading branch information...
ahdinosaur committed Sep 29, 2017
2 parents 7194c8e + b5ac138 commit 6e0e434114cd4cc652a03f6dcc6ddcec007b0058
View
315 README.md

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -150,9 +150,9 @@ module.exports = function (client, config, edit) {
h('footer', [
h('div.info', [
h('strong', 'Tip: '),
`Wait for the 🍻 status `, h('em', `before`), ` closing LolaShare to `,
`Wait for the 🍻 status `, h('em', `before`), ` closing Ferment to `,
h('a', {
href: 'https://github.com/LolaShare/LolaShare/#publishing-audio'
href: 'https://github.com/mmckegg/ferment#publishing-audio'
}, `make sure other people get your file`), `.`
]),
when(publishing,
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
Binary file not shown.
View
@@ -79,13 +79,13 @@ function openMainWindow () {
width: 1024,
height: 768,
titleBarStyle: 'hidden-inset',
title: 'LolaShare',
title: 'Ferment',
show: true,
backgroundColor: '#444',
webPreferences: {
experimentalFeatures: true
},
icon: './lolashare-logo.png'
icon: './ferment-logo.png'
})
windows.main.setSheetOffset(40)
View
@@ -6,9 +6,9 @@ var ref = require('ssb-ref')
var markdown = require('./lib/markdown')
var info = `
## By default, **LolaShare** will only see other users that are on the same local area network as you.
## By default, **Ferment** will only see other users that are on the same local area network as you.
In order to share with users on the internet, you need to be [invited to a pub server](https://github.com/LolaShare/LolaShare#joining-pub-server).
In order to share with users on the internet, you need to be [invited to a pub server](https://github.com/mmckegg/ferment#joining-pub-server).
`.trim()
module.exports = function (client, config, data) {
View
@@ -11,10 +11,6 @@ if (process.platform === 'linux' && process.arch === 'x64') {
ffmpeg = Path.join(__dirname, '..', 'bin', 'ffmpeg-linux-x64')
}
if (process.platform === 'win32' && process.arch === 'x64') {
ffmpeg = Path.join(__dirname, '..', 'bin', 'ffmpeg.exe')
}
console.log('using ', ffmpeg)
var childProcess = require('child_process')
View
@@ -9,9 +9,9 @@ module.exports = function () {
var version = packageInfo.version
https.get({
host: 'api.github.com',
path: '/repos/LolaShare/LolaShare/releases/latest',
path: '/repos/mmckegg/ferment/releases/latest',
headers: {
'user-agent': `LolaShare v${version}`
'user-agent': `Ferment v${version}`
}
}, function (res) {
if (res.statusCode === 200) {
View
@@ -24,7 +24,7 @@ module.exports = function Window (context, path, opts) {
var config = ${JSON.stringify(context.config)}
var data = ${JSON.stringify(opts.data)}
var title = ${JSON.stringify(opts.title || 'LolaShare')}
var title = ${JSON.stringify(opts.title || 'Ferment')}
document.documentElement.querySelector('head').appendChild(
h('title', title)
View
Binary file not shown.
View
@@ -142,7 +142,7 @@ module.exports = function (client, config) {
classList: [ computed(currentView, (x) => x[0] === 'followingFeed' ? '-selected' : null) ]
}, 'Following')
]),
h('span.appTitle', ['LolaShare']),
h('span.appTitle', ['Ferment']),
h('span', [
h('a', {
'ev-click': send(actions.viewProfile, api.id),
@@ -155,8 +155,8 @@ module.exports = function (client, config) {
]),
when(latestUpdate,
h('div.info', [
h('a.message -update', { href: 'https://github.com/LolaShare/LolaShare/releases' }, [
h('strong', ['🎉 LolaShare ', latestUpdate, ' has been released.']), ' Click here for more info!'
h('a.message -update', { href: 'https://github.com/mmckegg/ferment/releases' }, [
h('strong', ['🎉 Ferment ', latestUpdate, ' has been released.']), ' Click here for more info!'
])
])
),
View
@@ -32,9 +32,9 @@
"author": "Matt McKegg",
"license": "GPL-3.0",
"bugs": {
"url": "https://github.com/LolaShare/LolaShare/issues"
"url": "https://github.com/mmckegg/ferment/issues"
},
"homepage": "https://github.com/LolaShare/LolaShare#readme",
"homepage": "https://github.com/mmckegg/ferment#readme",
"dependencies": {
"@mmckegg/mutant": "~3.7.2",
"atomic-file": "^0.1.0",
View
@@ -36,7 +36,7 @@ function DiscoveryFeed (context) {
` to really get things going! 🍻`
]),
h('img', {
src: `file://${Path.join(__dirname, '..', 'lolashare-logo.png')}`,
src: `file://${Path.join(__dirname, '..', 'ferment-logo.png')}`,
style: {
display: 'block',
width: 200,

0 comments on commit 6e0e434

Please sign in to comment.