Permalink
Browse files

Revert "Remove "Ferment" wording throughout the program, as well as r…

…eplace the former logo."

This reverts commit 38c1fdc.
  • Loading branch information...
ahdinosaur committed Sep 29, 2017
1 parent b453b4e commit 35f6bb6f74c3af928cfb71d446a9e659fc8e3390
Showing with 15 additions and 15 deletions.
  1. +2 −2 add-audio-window.js
  2. +2 −2 index.js
  3. +2 −2 join-pub-window.js
  4. +2 −2 lib/latest-update.js
  5. +1 −1 lib/window.js
  6. BIN lolashare-logo.png
  7. +3 −3 main-window.js
  8. +2 −2 package.json
  9. +1 −1 views/discovery-feed.js
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
@@ -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
@@ -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 35f6bb6

Please sign in to comment.